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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs

@@ -11,7 +11,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
         /// <summary>
         /// 单号
         /// </summary>
-        public string? outsource_order { get; set; }
+        public string? transfer_order { get; set; }
 
         /// <summary>
         /// 联系人
@@ -23,6 +23,16 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
         /// </summary>
         public string? tel { get; set; }
 
+        /// <summary>
+        /// 部门编码
+        /// </summary>
+        public string? dept_code { get; set; }
+
+        /// <summary>
+        /// 业务员编码
+        /// </summary>
+        public string? biller { get; set; }
+
         /// <summary>
         /// 出库组织编号
         /// </summary>

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockH.cs

@@ -109,4 +109,14 @@ public partial class WmsRawmatTransferinstockH : BaseEntity<string>
     /// </summary>
     public string? erp_bill_code { get; set; }
 
+    /// <summary>
+    /// 部门编码
+    /// </summary>
+    public string? dept_code { get; set; }
+
+    /// <summary>
+    /// 业务员编码
+    /// </summary>
+    public string? biller { get; set; }
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs

@@ -9,6 +9,6 @@
         KIVA = 2,
         AGV = 3,
         电梯 = 4,
-        输送线 = 5,
+        电梯载两托货 = 5,
     }
 }