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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -474,7 +474,7 @@
         /// <summary>
         /// ERPId(天益4厂)
         /// </summary>
-        public const string ErpUserId = "34995305856535";
+        public const string ErpUserId = "14995305856535";
         /// <summary>
         /// 盘点任务计算状态-未结算
         /// </summary>

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

@@ -15,7 +15,7 @@
         public string create_id { get; set; }
 
         /// <summary>
-        /// 来源单据id(转库单主表)
+        /// 来源单据id(转库单子表)
         /// </summary>
         public string? source_id { get; set; }
 

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

@@ -0,0 +1,33 @@
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+    /// <summary>
+    /// 库房业务更新输入参数
+    /// </summary>
+    public class MaterialTransferDistributeSCWToZCCInput
+    {
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public string org_id { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string create_id { get; set; }
+
+        /// <summary>
+        /// 来源单据id(转库单子表)
+        /// </summary>
+        public string? source_id { get; set; }
+
+        /// <summary>
+        /// 载具条码
+        /// </summary>
+        public string? carry_code { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal qty { get; set; }
+
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockD.cs

@@ -119,4 +119,19 @@ public partial class WmsPackInstockD : BaseEntity<string>
     /// </summary>
     public DateTime? modify_time { get; set; }
 
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    public string? material_name { get; set; }
+
+    /// <summary>
+    /// erp_line_pk
+    /// </summary>
+    public string? erp_line_pk { get; set; }
+
+    /// <summary>
+    /// 行号
+    /// </summary>
+    public string? lineno { get; set; }
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPackInstockH.cs

@@ -89,4 +89,33 @@ public partial class WmsPackInstockH : BaseEntity<string>
     /// </summary>
     public string? incoming_ware { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? erp_pk { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? erp_bill_code { get; set; }
+
+    /// <summary>
+    /// erp仓库类型
+    /// </summary>
+    public string? erp_wh_type { get; set; }
+
+    /// <summary>
+    /// 出库组织id
+    /// </summary>
+    public string? outstockorg_id { get; set; }
+
+    /// <summary>
+    /// 出库组织编号
+    /// </summary>
+    public string? outstockorg_code { get; set; }
+
+    /// <summary>
+    /// 出库组织名称
+    /// </summary>
+    public string? outstockorg_name { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockD.cs

@@ -133,4 +133,10 @@ public partial class WmsRawmatTransferinstockD : BaseEntity<string>
     /// 已绑定数量
     /// </summary>
     public decimal? bind_qty { get; set; }
+
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    public string? matname { get; set; }
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs

@@ -118,5 +118,10 @@ public partial class WmsTransferInstockD : BaseEntity<string>
     /// 行号
     /// </summary>
     public string? lineno { get; set; }
+
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    public string? material_name { get; set; }
 }