Merge remote-tracking branch 'origin/dev' into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs

@@ -18,6 +18,15 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         /// <summary>
         /// 载具ID
         /// </summary>
-        public string carryId { get; set; } 
+        public string carryId { get; set; }
+
+        public string new_carry_code { get; set; }
+
+        /// <summary>
+        /// 任务执行条码表
+        /// </summary>
+        public List<WmsDistaskCode> distaskCodes { get; set; }
     }
+
+    
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/WareHouseUpInput.cs

@@ -35,5 +35,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto
 
 
 
+
     }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs

@@ -331,6 +331,8 @@ namespace Tnb.WarehouseMgr
                     {
 
                     }
+
+                    //更新执行任务已签收
                 }
             }
             catch (Exception ex)