erp仓库映射关系、erp同步完善、库存报表添加箱号 批次号查询；载具库存报表添加箱号 批次号查询

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

@@ -1,92 +1,93 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Transactions;
-
-namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
-{
-    public class TransferOrderInput
-    {
-        /// <summary>
-        /// 单号
-        /// </summary>
-        public string? transfer_order { get; set; }
-
-        /// <summary>
-        /// 部门编码
-        /// </summary>
-        public string? dept_code { get; set; }
-
-        /// <summary>
-        /// 业务员编码
-        /// </summary>
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Transactions;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
+{
+    public class TransferOrderInput
+    {
+        /// <summary>
+        /// 单号
+        /// </summary>
+        public string? transfer_order { get; set; }
+
+        /// <summary>
+        /// 部门编码
+        /// </summary>
+        public string? dept_code { get; set; }
+
+        /// <summary>
+        /// 业务员编码
+        /// </summary>
         public string? biller { get; set; }
 
-        /// <summary>
-        /// 出库仓库
-        /// </summary>
+        /// <summary>
+        /// 出库仓库
+        /// </summary>
         public string? warehouse_outstock { get; set; }
 
-        /// <summary>
-        /// 入库组织编号
-        /// </summary>
-        public string? instockorg_code { get; set; }
-
-        /// <summary>
-        /// 供货日期
-        /// </summary>
+        /// <summary>
+        /// 入库组织编号
+        /// </summary>
+        public string? instockorg_code { get; set; }
+
+        /// <summary>
+        /// 供货日期
+        /// </summary>
         public DateTime? ship_date { get; set; }
-
-        /// <summary>
-        /// 主表pk
-        /// </summary>
+
+        /// <summary>
+        /// 主表pk
+        /// </summary>
         public string? erp_pk { get; set; }
-
-        /// <summary>
-        /// 交易类型
-        /// </summary>
+
+        /// <summary>
+        /// 交易类型
+        /// </summary>
         public string? transaction_type { get; set; }
-        
 
-        public List<TransferOrderInputDetail> details { get; set; }
-    }
-    public class TransferOrderInputDetail
-    {
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public string? lineno { get; set; }
+        /// <summary>
         /// erp仓库类型
-        /// <summary>
-        /// 物品代码
-        /// </summary>
-        public string? material_code { get; set; }
-
-        /// <summary>
-        /// 单位代码
-        /// </summary>
-        public string? unit_code { get; set; }
-
-        /// <summary>
-        /// 采购数量
-        /// </summary>
+        /// </summary>
+        public string erp_wh_type { get; set; }
+
+        public List<TransferOrderInputDetail> details { get; set; }
+    }
+    public class TransferOrderInputDetail
+    {
+        /// <summary>
+        /// 行号
+        /// </summary>
+        public string? lineno { get; set; }
+
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string? material_code { get; set; }
+
+        /// <summary>
+        /// 单位代码
+        /// </summary>
+        public string? unit_code { get; set; }
+
         /// <summary>
-
-        /// <summary>
-        /// 批次
-        /// </summary>
-        public string? code_batch { get; set; }
-
-        /// <summary>
-        /// 交货日期
-        /// </summary>
-        public DateTime? delivery_date { get; set; }
-
-        /// <summary>
-        /// 子表主键
-        /// </summary>
-        public string erp_line_pk { get; set; }
-    }
-}
+        /// 采购数量
+        /// </summary>
+        public decimal? qty { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string? code_batch { get; set; }
+
+        /// <summary>
+        /// 交货日期
+        /// </summary>
+        public DateTime? delivery_date { get; set; }
+
+        /// <summary>
+        /// 子表主键
+        /// </summary>