Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs

@@ -972,5 +972,15 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
 
 
         public BookingExtendState ExtendState { get; set; }
+
+        /// <summary>
+        /// 最后格式单比对状态 NO_DIFF-无异常;DIFF-有差异;
+        /// </summary>
+        public string LstDraftCompareRlt { get; set; }
+
+        /// <summary>
+        /// 最后格式单比对时间
+        /// </summary>
+        public Nullable<DateTime> LstDraftCompareDate { get; set; }
     }
 }

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

@@ -170,4 +170,51 @@ namespace Myshipping.Application
         /// </summary>
         public bool IsPrimaryKey { get; set; }
     }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class TaskManageExcuteCommonResultDto
+    {
+        /// <summary>
+        /// 是否成功 true=成功 false=失败
+        /// </summary>
+        public bool succ { get; set; } = false;
+
+        /// <summary>
+        /// 状态 0-成功
+        /// </summary>
+        public int status { get; set; } = 0;
+
+        /// <summary>
+        /// 返回消息
+        /// </summary>
+        public string msg { get; set; }
+
+        /// <summary>
+        /// 总记录数
+        /// </summary>
+        public int total { get; set; }
+
+        /// <summary>
+        /// 当前页列表数据
+        /// </summary>
+        public object rows { get; set; }
+
+        /// <summary>
+        /// 扩展值
+        /// </summary>
+        public object extra { get; set; }
+
+        /// <summary>
+        /// 扩展值2
+        /// </summary>
+        public object extra2 { get; set; }
+
+        /// <summary>
+        /// 扩展值3
+        /// </summary>
+        public object extra3 { get; set; }
+    }
 }

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

@@ -261,6 +261,11 @@ namespace Myshipping.Application
         /// 尺码
         /// </summary>
         public Nullable<decimal> CBM { get; set; }
+
+        /// <summary>
+        /// 箱量
+        /// </summary>
+        public int CtnNum { get; set; }
     }
 
     /// <summary>

Myshipping.Application/Service/TaskManagePlat/TaskDraftCompareService.cs

@@ -149,7 +149,6 @@ namespace Myshipping.Application
                     billNo = readModel.MasterBlNo;
                 }
                 
-                
                 if(string.IsNullOrWhiteSpace(billNo))
                 {
                     _logger.LogInformation("批次={no} 请求Draft文件解析未获取到有效提单号", batchNo);
@@ -160,7 +159,7 @@ namespace Myshipping.Application
                 var bookingOrder = _bookingOrderRepository.AsQueryable().Filter(null, true)
                     .First(a => a.MBLNO.Equals(billNo));
 
-                if (model == null)
+                if (bookingOrder == null)
                 {
                     _logger.LogInformation("批次={no} 提单号{billNo}无法获取业务信息", batchNo, billNo);
 
@@ -206,6 +205,7 @@ namespace Myshipping.Application
                 }
 
                 msgModel.Main.BusinessInfo = mainInfo;
+                msgModel.Main.DraftInfo = readModel;
 
                 //推送Draft比对
                 DateTime bCompareDate = DateTime.Now;
@@ -285,10 +285,10 @@ namespace Myshipping.Application
         /// <param name="contentType">请求类型</param>
         /// <returns>返回回执</returns>
         [NonAction]
-        private async Task<TaskManageExcuteResultDto> ExcuteReadPDF(NameValueCollection nameValueCollection, dynamic fileInfo,
+        private async Task<TaskManageExcuteCommonResultDto> ExcuteReadPDF(NameValueCollection nameValueCollection, dynamic fileInfo,
             string contentType = "application/json")
         {
-            TaskManageExcuteResultDto model = null;
+            TaskManageExcuteCommonResultDto model = null;
             var result = string.Empty;
 
             using (var httpClient = new HttpClient())
@@ -332,7 +332,7 @@ namespace Myshipping.Application
                         var response = httpClient.PostAsync(App.Configuration["DraftReadUrl"], reduceAttach).Result;
                         result = response.Content.ReadAsStringAsync().Result;
 
-                        model = JSON.Deserialize<TaskManageExcuteResultDto>(result);
+                        model = JSON.Deserialize<TaskManageExcuteCommonResultDto>(result);
                     }
                 }
                 catch (Exception ex)

Myshipping.Application/Service/TaskManagePlat/TaskManageCompareMapper.cs

@@ -47,7 +47,8 @@ namespace Myshipping.Application
             .Map(dest => dest.TareWeight, src => src.TAREWEIGHT)
             .Map(dest => dest.PKGs, src => src.PKGS)
             .Map(dest => dest.KGs, src => src.KGS)
-            .Map(dest => dest.CBM, src => src.CBM);
+            .Map(dest => dest.CBM, src => src.CBM)
+            .Map(dest => dest.CtnNum, src => src.CTNNUM);
 
             config.ForType<BookingOrder, BusinessInfo>()
             .Map(dest => dest.BookingNo, src => src.BOOKINGNO)

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -4870,9 +4870,9 @@ namespace Myshipping.Application
                 if (taskInfo == null)
                     throw Oops.Oh($"任务不存在");
 
-                if(new string[] { TaskStatusEnum.Complete.ToString(), TaskStatusEnum.Pending.ToString(),TaskStatusEnum.Pending.ToString() }
+                if(new string[] { TaskStatusEnum.Pending.ToString(),TaskStatusEnum.Cancel.ToString() }
                 .Contains(taskInfo.STATUS))
-                    throw Oops.Oh($"任务状态是已完成/已挂起/已取消的不能撤销");
+                    throw Oops.Oh($"任务状态是已挂起/已取消的不能撤销");
 
                 var truckInfo = _taskTruckInfoRepository.AsQueryable().First(a => a.TASK_ID == taskInfo.PK_ID);