Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.Module.Core/Constants/TaskFlowDataNameConst.cs

@@ -37,6 +37,12 @@ namespace DS.Module.Core
         /// <remarks>类型：DS.WMS.Core.TaskPlat.Entity.TaskBCCTNInfo</remarks>
         public const string TaskBCCtnList = "TaskBCCtnList";
 
+        /// <summary>
+        /// BC对比订单后是否存在差异
+        /// </summary>
+        /// <remarks>类型：<see cref="bool" /></remarks>
+        public const string BcCompareBcWithSeaExportIsExistsDiff = "BcCompareBcWithSeaExportIsExistsDiff";
+
         /// <summary>
         /// BC文件
         /// </summary>

ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs

@@ -823,10 +823,10 @@ namespace DS.WMS.Core.Op.Method
                 throw new ArgumentNullException($"缺少参数:{TaskFlowDataNameConst.TaskManageOrderMessageInfo}");
             }
 
-            var taskBcId = dataContext.Get<long?>(TaskFlowDataNameConst.TaskBCId);
-            if (taskBcId == null)
+            var taskBcInfo = dataContext.Get<TaskBCInfo>(TaskFlowDataNameConst.TaskBCInfo);
+            if (taskBcInfo == null)
             {
-                Logger.Log(NLog.LogLevel.Info, $"执行ApiReceiveTask时，未获取到{TaskFlowDataNameConst.TaskBCId}");
+                Logger.Log(NLog.LogLevel.Info, $"执行ApiReceiveTask时，未获取到{TaskFlowDataNameConst.TaskBCInfo}");
             }
 
             DynameFileInfo bcFileInfo = null;
@@ -935,10 +935,10 @@ namespace DS.WMS.Core.Op.Method
             var rlt = await InnerApiReceive(slotModel, bcFileInfo, bcNoticeFileInfo);
 
             // 回写舱位主键到BC任务
-            if (rlt.Succeeded && rlt.Data != null && taskBcId != null)
+            if (rlt.Succeeded && rlt.Data != null && taskBcInfo != null)
             {
                 var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
-                var taskBcInfo = await tenantDb.Queryable<TaskBCInfo>().Where(x => x.Id == taskBcId).FirstAsync();
+                //var taskBcInfo = await tenantDb.Queryable<TaskBCInfo>().Where(x => x.Id == taskBcId).FirstAsync();
                 if (taskBcInfo != null)
                 {
                     if(taskBcInfo.BOOKING_SLOT_ID == null)

ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs

@@ -1158,7 +1158,10 @@ namespace DS.WMS.Core.TaskPlat.Method
                 SeaExport = seaExport,
                 OpCtnList = seaExportCtnList
             };
-            var result = await CompareBcWithSeaExport(compareDto);
+            (bool isExistsDiff, List<CompareResultDetailInfo>) result = await CompareBcWithSeaExport(compareDto);
+
+            dataContext.Set(TaskFlowDataNameConst.BcCompareBcWithSeaExportIsExistsDiff, result.isExistsDiff);
+
             return DataResult<(bool isExistsDiff, List<CompareResultDetailInfo>)>.Success(result);
         }
 

ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs

@@ -953,7 +953,8 @@ namespace DS.WMS.Core.TaskPlat.Method
                         (TaskFlowDataNameConst.TaskManageOrderMessageInfo, info),
                         (TaskFlowDataNameConst.BCFile, file),
                         (TaskFlowDataNameConst.AmendmentFile, modifyFile),
-                        (TaskFlowDataNameConst.TaskBCId, bcInfo.Id),
+                        (TaskFlowDataNameConst.TaskBaseId, taskInfo.Id),
+                        //(TaskFlowDataNameConst.TaskBCId, bcInfo.Id),
                         (TaskFlowDataNameConst.TaskBCInfo, bcInfo),
                         (TaskFlowDataNameConst.TaskBCCtnList, ctnList)
                     );