修改下货纸比对

Myshipping.Application/Entity/BookingOrder.cs

@@ -858,19 +858,22 @@ namespace Myshipping.Application.Entity
         public string LineManageID { get; set; }
 
         /// <summary>
-        /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有异常;NO_YARD-无场站数据;EXPT-异常
+        /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常
         /// </summary>
         public string LstShipOrderCompareRlt { get; set; }
 
         /// <summary>
         /// 最后下货纸比对时间
         /// </summary>
-        public string LstShipOrderCompareDate { get; set; }
+        public Nullable<DateTime> LstShipOrderCompareDate { get; set; }
 
         /// <summary>
         /// 最后下货纸比对批次号
         /// </summary>
         public string LstShipOrderCompareId { get; set; }
-
+        /// <summary>
+        /// 最后下货纸比对状态 NO_DIFF-无异常;DIFF-有差异;NO_YARD-无场站数据;EXPT-异常
+        /// </summary>
+        public string LstShipOrderCompareRltName { get; set; }
     }
 }

Myshipping.Application/Service/BookingTruck/Dtos/BookingTruckShowDto.cs

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application.Service.BookingTruck.Dtos
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class BookingTruckShowDto
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public long Id { get; set; }
+        /// <summary>
+        /// 车队ID
+        /// </summary>
+        public Nullable<long> TruckId { get; set; }
+        /// <summary>
+        /// 车队代码
+        /// </summary>
+        public string TruckCode { get; set; }
+        /// <summary>
+        /// 车队代码
+        /// </summary>
+        public string TruckName { get; set; }
+        /// <summary>
+        /// TO
+        /// </summary>
+        public string ToName { get; set; }
+        /// <summary>
+        /// ATTN
+        /// </summary>
+        public string Attn { get; set; }
+        /// <summary>
+        /// ATTN电话
+        /// </summary>
+        public string AttnTel { get; set; }
+        /// <summary>
+        /// ATTN邮箱
+        /// </summary>
+        public string AttnMail { get; set; }
+        /// <summary>
+        /// FROM
+        /// </summary>
+        public string FromName { get; set; }
+        /// <summary>
+        /// FROM电话
+        /// </summary>
+        public string FromTel { get; set; }
+        /// <summary>
+        /// FROM邮箱
+        /// </summary>
+        public string FromMail { get; set; }
+        /// <summary>
+        /// 吨数
+        /// </summary>
+        public Nullable<decimal> KGS { get; set; }
+        /// <summary>
+        /// 陆运费
+        /// </summary>
+        public Nullable<decimal> Fee { get; set; }
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public string PayMethod { get; set; }
+        /// <summary>
+        /// 支付方式名称
+        /// </summary>
+        public string PayMethodName { get; set; }
+        /// <summary>
+        /// 派车日期
+        /// </summary>
+        public Nullable<DateTime> TruckTime { get; set; }
+        /// <summary>
+        /// 提箱场站ID
+        /// </summary>
+        public string YARDID { get; set; }
+        /// <summary>
+        /// 提箱场站
+        /// </summary>
+        public string YARD { get; set; }
+        /// <summary>
+        /// 场站联系人
+        /// </summary>
+        public string YARDCONTRACT { get; set; }
+        /// <summary>
+        /// 场站联系人电话
+        /// </summary>
+        public string YARDCONTRACTTEL { get; set; }
+        /// <summary>
+        /// 工厂ID
+        /// </summary>
+        public string FactoryId { get; set; }
+        /// <summary>
+        /// 工厂代码
+        /// </summary>
+        public string FactoryCode { get; set; }
+        /// <summary>
+        /// 工厂名称
+        /// </summary>
+        public string FactoryName { get; set; }
+        /// <summary>
+        /// 工厂联系人
+        /// </summary>
+        public string FactoryContact { get; set; }
+        /// <summary>
+        /// 工厂联系电话
+        /// </summary>
+        public string FactoryTel { get; set; }
+        /// <summary>
+        /// 返场时间
+        /// </summary>
+        public Nullable<DateTime> ReturnTime { get; set; }
+        /// <summary>
+        /// 入货场站ID
+        /// </summary>
+        public string InYardID { get; set; }
+        /// <summary>
+        /// 入货场站
+        /// </summary>
+        public string InYard { get; set; }
+        /// <summary>
+        /// 入货联系人
+        /// </summary>
+        public string InYardContact { get; set; }
+        /// <summary>
+        /// 入货联系人电话
+        /// </summary>
+        public string InYardContractTel { get; set; }
+        /// <summary>
+        /// 要求到达时间
+        /// </summary>
+        public Nullable<DateTime> NeedArriveTime { get; set; }
+        /// <summary>
+        /// 截港日期
+        /// </summary>
+        public Nullable<DateTime> ClosingTime { get; set; }
+        /// <summary>
+        /// 提货日期
+        /// </summary>
+        public Nullable<DateTime> PickUpTime { get; set; }
+        /// <summary>
+        /// 是否挂机
+        /// </summary>
+        public bool IsGuaJi { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string Status { get; set; }
+        /// <summary>
+        /// 注意事项
+        /// </summary>
+        public string Attention { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// 调度ID
+        /// </summary>
+        public string DispatcherId { get; set; }
+        /// <summary>
+        /// 调度名称
+        /// </summary>
+        public string DispatcherName { get; set; }
+        /// <summary>
+        /// 集装箱列表
+        /// </summary>
+        public List<BookingTruckCtnDto> ContaList { get; set; }
+    }
+}

Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageExcuteResultDto.cs

@@ -54,6 +54,11 @@ namespace Myshipping.Application
         /// </summary>
         public string OrigPKId { get; set; }
 
+        /// <summary>
+        /// 比对ID
+        /// </summary>
+        public string TaskCompareId { get; set; }
+
         /// <summary>
         /// 原数据主单号
         /// </summary>

Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs

@@ -130,6 +130,43 @@ namespace Myshipping.Application
                 if (compareResult == null)
                     throw Oops.Oh($"订舱主键{bookingId}请求下货纸比对失败，返回为空");
 
+
+                var orderInfo = _bookingOrderRepository.AsQueryable().First(x => x.Id == long.Parse(bookingId));
+
+                if(orderInfo != null)
+                {
+                    if(compareResult.succ)
+                    {
+                        if (compareResult.extra.IsExistsDiff)
+                        {
+                            orderInfo.LstShipOrderCompareRlt = "DIFF";
+                            orderInfo.LstShipOrderCompareRltName = "有差异";
+                        }
+                        else
+                        {
+                            orderInfo.LstShipOrderCompareRlt = "NO_DIFF";
+                            orderInfo.LstShipOrderCompareRltName = "正常";
+                        }
+                        orderInfo.LstShipOrderCompareDate = bDate;
+                    }
+                    else
+                    {
+                        orderInfo.LstShipOrderCompareRlt = "NO_YARD";
+                        orderInfo.LstShipOrderCompareRltName = "无动态";
+                    }
+
+                    orderInfo.LstShipOrderCompareId = compareResult.extra.TaskCompareId;
+
+                    //更新
+                    await _bookingOrderRepository.AsUpdateable(orderInfo).UpdateColumns(it => new
+                    {
+                        it.LstShipOrderCompareId,
+                        it.LstShipOrderCompareDate,
+                        it.LstShipOrderCompareRlt,
+                    }).ExecuteCommandAsync();
+                }
+
+
                 result.succ = compareResult.succ;
                 result.msg = compareResult.msg;
                 result.extra = compareResult.extra;