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

ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/TransPlanHasChange/TaskTransPlanHasChangeShowDto.cs

@@ -14,7 +14,7 @@ namespace DS.WMS.Core.TaskPlat.Dtos
         /// <summary>
         /// 主任务ID
         /// </summary>
-        public string TaskPkId { get; set; }
+        public long TaskPkId { get; set; }
 
         /// <summary>
         /// 业务主键

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

@@ -91,6 +91,19 @@ namespace DS.WMS.Core.TaskPlat.Method
             if (queryList.Count == 0)
                 throw new Exception(string.Format(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.TaskBaseInfoFromTaskIdNull)), taskPKId));
 
+            var planInfo = queryList.FirstOrDefault().Plan;
+
+            dto.BillNo = planInfo.MBL_NO;
+            dto.BookingNo = planInfo.BOOKING_NO;
+            dto.Carrier = planInfo.CARRIER;
+            dto.OrigBillNo = planInfo.ORIG_MBL_NO;
+            dto.TaskPkId = planInfo.TASK_ID;
+            dto.Id = planInfo.Id;
+            dto.BookingId = planInfo.BOOKING_ID;
+            dto.ChangeReasonNotes = planInfo.CHANGE_REASON;
+            dto.GroupBatchNo = planInfo.GROUP_BATCH_NO;
+            dto.IsLast = planInfo.IS_LAST == 1 ? true : false;
+
             var parentIdList = queryList.Select(a => a.Plan.Id).ToList();
 
             var detailList = await tenantDb.Queryable<TaskTransPlanHasChangeDetail>()