From 6d5a9c1d441cdeb4a44e847d95772eef07905fbc Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Tue, 11 Jul 2023 16:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=94=9F=E4=BA=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93\=E5=87=BA=E5=BA=93=E8=BE=93=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/Inputs/MESCreateInstockInput.cs       | 120 +++++++++++++++++-
 .../Dto/Inputs/MESCreateOutstockInput.cs      |  73 ++++++++++-
 .../Entity/WmsInstockH.cs                     |  83 +++++++++++-
 3 files changed, 267 insertions(+), 9 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateInstockInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateInstockInput.cs
index 1b126500..c343784c 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateInstockInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateInstockInput.cs
@@ -14,14 +14,128 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         /// <summary>
         /// 生产入库主表
         /// </summary>
-        public WmsInstockH instock { get; set; }
+        public MESWmsInstockHInput instock { get; set; }
         /// <summary>
         /// 生产入库明细表
         /// </summary>
-        public List<WmsInstockD> instockds { get; set; }
+        public List<MESWmsInstockDInput> instockds { get; set; }
         /// <summary>
         /// 入库申请条码明细表
         /// </summary>
-        public List<WmsInstockCode> instockcodes  { get; set; }
+        public List<MESWmsInstockCodeInput> instockcodes { get; set; }
+    }
+
+    public class MESWmsInstockHInput
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 所属组织ID
+        /// </summary>
+        public string org_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 入库单创建日期
+        /// </summary>
+        public DateTime bill_date { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 单据类型： 
+        /// </summary>
+        public string bill_type { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 入库仓库ID
+        /// </summary>
+        public string warehouse_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 来源单据ID
+        /// </summary>
+        public string  source_id { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string create_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 载具编号
+        /// </summary>
+        public string  carry_code { get; set; }
+
+        /// <summary>
+        /// 库位编号
+        /// </summary>
+        public string  location_code { get; set; }
+
+        /// <summary>
+        /// 未检验：0，已检验：1
+        /// </summary>
+        public int  is_check { get; set; }
+    }
+    public class MESWmsInstockDInput 
+    {
+
+        /// <summary>
+        /// 物品ID
+        /// </summary>
+        public string material_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string material_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 单位ID
+        /// </summary>
+        public string unit_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 入库需求数量
+        /// </summary>
+        public decimal  pr_qty { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string  code_batch { get; set; }
+
+
+    }
+    public class MESWmsInstockCodeInput
+    {
+        /// <summary>
+        /// 物品ID
+        /// </summary>
+        public string material_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string material_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 单位ID
+        /// </summary>
+        public string unit_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 条码编号
+        /// </summary>
+        public string barcode { get; set; }
+
+        /// <summary>
+        /// 条码编号
+        /// </summary>
+        public int barcode_qty { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string  code_batch { get; set; }
     }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateOutstockInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateOutstockInput.cs
index ad5d3924..358ffbc5 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateOutstockInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCreateOutstockInput.cs
@@ -14,10 +14,79 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         /// <summary>
         /// 生产出库主表
         /// </summary>
-        public WmsOutstockH? outstock { get; set; }
+        public MESWmsOutstockHInput  outstock { get; set; }
         /// <summary>
         /// 生产出库明细表
         /// </summary>
-        public List<WmsOutstockD>? outstockDs { get; set; }
+        public List<MESWmsOutstockDInput>  outstockDs { get; set; }
     }
+    public class MESWmsOutstockHInput
+    {
+       
+        /// <summary>
+        /// 所属组织ID
+        /// </summary>
+        public string org_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 入库单创建日期
+        /// </summary>
+        public DateTime bill_date { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 单据类型： 
+        /// </summary>
+        public string bill_type { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 入库仓库ID
+        /// </summary>
+        public string warehouse_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string create_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 库位编号
+        /// </summary>
+        public string location_code { get; set; }
+
+   
+    }
+    public class MESWmsOutstockDInput
+    {
+
+        /// <summary>
+        /// 物品ID
+        /// </summary>
+        public string material_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string material_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 单位ID
+        /// </summary>
+        public string unit_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 出库需求数量
+        /// </summary>
+        public decimal pr_qty { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string code_batch { get; set; }
+
+        /// <summary>
+        /// 来源单据ID
+        /// </summary>
+        public string source_id { get; set; }
+    }
+  
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs
index cfb4ebe3..8562ce01 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs
@@ -17,12 +17,12 @@ public partial class WmsInstockH : BaseEntity<string>
     /// <summary>
     /// 租户ID
     /// </summary>
-    public string tenant_id { get; set; } = string.Empty;
+    public string? tenant_id { get; set; }
 
     /// <summary>
     /// 所属组织ID
     /// </summary>
-    public string org_id { get; set; } = string.Empty;
+    public string? org_id { get; set; }
 
     /// <summary>
     /// 入库单号
@@ -52,7 +52,7 @@ public partial class WmsInstockH : BaseEntity<string>
     /// <summary>
     /// 入库仓库ID
     /// </summary>
-    public string warehouse_id { get; set; } = string.Empty;
+    public string? warehouse_id { get; set; }
 
     /// <summary>
     /// 供应商ID
@@ -97,7 +97,7 @@ public partial class WmsInstockH : BaseEntity<string>
     /// <summary>
     /// 时间戳
     /// </summary>
-    public DateTime time_stamp { get; set; } = DateTime.Now;
+    public DateTime? time_stamp { get; set; }
 
     /// <summary>
     /// 创建用户
@@ -134,4 +134,79 @@ public partial class WmsInstockH : BaseEntity<string>
     /// </summary>
     public string? location_id { get; set; }
 
+    /// <summary>
+    /// 来源单据ID
+    /// </summary>
+    public string? source_id { get; set; }
+
+    /// <summary>
+    /// 来源单据代码
+    /// </summary>
+    public string? source_code { get; set; }
+
+    /// <summary>
+    /// 源单单据类型
+    /// </summary>
+    public int? source_type { get; set; }
+
+    /// <summary>
+    /// 来源单据行号
+    /// </summary>
+    public int? source_line { get; set; }
+
+    /// <summary>
+    /// 来源单据明细ID
+    /// </summary>
+    public string? source_detail_id { get; set; }
+
+    /// <summary>
+    /// 生产工单号
+    /// </summary>
+    public string? mo_code { get; set; }
+
+    /// <summary>
+    /// 生产工单行号
+    /// </summary>
+    public int? mo_line { get; set; }
+
+    /// <summary>
+    /// 生产工单BOM明细Id
+    /// </summary>
+    public string? mo_bom_detail_id { get; set; }
+
+    /// <summary>
+    /// 不含税单价
+    /// </summary>
+    public decimal? price { get; set; }
+
+    /// <summary>
+    /// 含税单价
+    /// </summary>
+    public decimal? tax_price { get; set; }
+
+    /// <summary>
+    /// 不含税金额
+    /// </summary>
+    public decimal? amount { get; set; }
+
+    /// <summary>
+    /// 含税金额
+    /// </summary>
+    public decimal? all_amount { get; set; }
+
+    /// <summary>
+    /// 未检验：0，已检验：1
+    /// </summary>
+    public int? is_check { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
 }