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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsCarryConst.cs

@@ -12,5 +12,12 @@ namespace Tnb.WarehouseMgr.Entities.Consts
         /// 载具更换EnCode业务编码
         /// </summary>
         public const string WMS_CARRY_REPLACE_ENCODE = "WmsCarryReplace";
+        
+        /// <summary>
+        /// 物料签收编码
+        /// </summary>
+        public const string MATERIAL_RECEIPT_CODE = "MaterialReceipt";
+        	
+        
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs

@@ -24,6 +24,11 @@ public partial class WmsCarrybindH : BaseEntity<string>
     /// </summary>
     public string? org_id { get; set; }
 
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
     /// <summary>
     /// 载具编号
     /// </summary>

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryunbindH.cs

@@ -24,6 +24,11 @@ public partial class WmsCarryunbindH : BaseEntity<string>
     /// </summary>
     public string? org_id { get; set; }
 
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
     /// <summary>
     /// 载具编号
     /// </summary>