Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs

@@ -94,9 +94,16 @@ public class ModuleConsts
     /// </summary>
     public const string MODULE_WMSINSTOCK_ID = "26191326300453";
     /// <summary>
+    ///   模块标识-载具解绑
+    public const string MODULE_WMSCARRYUNBIND_ID = "26106270092325";
+    /// <summary>
+    ///   模块标识-载具绑定
+    /// </summary>
+    public const string MODULE_WMSCARRYBIND_ID = "26105163614501";
+    /// <summary>
     ///   模块标识-载具更换
     /// </summary>
-    public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
+    public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";//26188532491557
     /// <summary>
     ///   模块标识-齐套分拣
     /// </summary>

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

@@ -28,6 +28,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         /// 任务执行条码表
         /// </summary>
         public List<WmsDistaskCode> distaskCodes { get; set; }
+        /// <summary>
+        /// 载具
+        /// </summary>
+        public List<String> carryIds { get; set; }