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 /// /// 生产入库主表 /// - public WmsInstockH instock { get; set; } + public MESWmsInstockHInput instock { get; set; } /// /// 生产入库明细表 /// - public List instockds { get; set; } + public List instockds { get; set; } /// /// 入库申请条码明细表 /// - public List instockcodes { get; set; } + public List instockcodes { get; set; } + } + + public class MESWmsInstockHInput + { + /// + /// 主键ID + /// + public string id { get; set; } + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 入库单创建日期 + /// + public DateTime bill_date { get; set; } = DateTime.Now; + + /// + /// 单据类型: + /// + public string bill_type { get; set; } = string.Empty; + + /// + /// 入库仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 来源单据ID + /// + public string source_id { get; set; } + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 载具编号 + /// + public string carry_code { get; set; } + + /// + /// 库位编号 + /// + public string location_code { get; set; } + + /// + /// 未检验:0,已检验:1 + /// + public int is_check { get; set; } + } + public class MESWmsInstockDInput + { + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 入库需求数量 + /// + public decimal pr_qty { get; set; } + + /// + /// 批次 + /// + public string code_batch { get; set; } + + + } + public class MESWmsInstockCodeInput + { + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 条码编号 + /// + public string barcode { get; set; } + + /// + /// 条码编号 + /// + public int barcode_qty { get; set; } + + /// + /// 批次 + /// + 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 /// /// 生产出库主表 /// - public WmsOutstockH? outstock { get; set; } + public MESWmsOutstockHInput outstock { get; set; } /// /// 生产出库明细表 /// - public List? outstockDs { get; set; } + public List outstockDs { get; set; } } + public class MESWmsOutstockHInput + { + + /// + /// 所属组织ID + /// + public string org_id { get; set; } = string.Empty; + + /// + /// 入库单创建日期 + /// + public DateTime bill_date { get; set; } = DateTime.Now; + + /// + /// 单据类型: + /// + public string bill_type { get; set; } = string.Empty; + + /// + /// 入库仓库ID + /// + public string warehouse_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + public string create_id { get; set; } = string.Empty; + + /// + /// 库位编号 + /// + public string location_code { get; set; } + + + } + public class MESWmsOutstockDInput + { + + /// + /// 物品ID + /// + public string material_id { get; set; } = string.Empty; + + /// + /// 物品代码 + /// + public string material_code { get; set; } = string.Empty; + + /// + /// 单位ID + /// + public string unit_id { get; set; } = string.Empty; + + /// + /// 出库需求数量 + /// + public decimal pr_qty { get; set; } + + /// + /// 批次 + /// + public string code_batch { get; set; } + + /// + /// 来源单据ID + /// + 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 /// /// 租户ID /// - public string tenant_id { get; set; } = string.Empty; + public string? tenant_id { get; set; } /// /// 所属组织ID /// - public string org_id { get; set; } = string.Empty; + public string? org_id { get; set; } /// /// 入库单号 @@ -52,7 +52,7 @@ public partial class WmsInstockH : BaseEntity /// /// 入库仓库ID /// - public string warehouse_id { get; set; } = string.Empty; + public string? warehouse_id { get; set; } /// /// 供应商ID @@ -97,7 +97,7 @@ public partial class WmsInstockH : BaseEntity /// /// 时间戳 /// - public DateTime time_stamp { get; set; } = DateTime.Now; + public DateTime? time_stamp { get; set; } /// /// 创建用户 @@ -134,4 +134,79 @@ public partial class WmsInstockH : BaseEntity /// public string? location_id { get; set; } + /// + /// 来源单据ID + /// + public string? source_id { get; set; } + + /// + /// 来源单据代码 + /// + public string? source_code { get; set; } + + /// + /// 源单单据类型 + /// + public int? source_type { get; set; } + + /// + /// 来源单据行号 + /// + public int? source_line { get; set; } + + /// + /// 来源单据明细ID + /// + public string? source_detail_id { get; set; } + + /// + /// 生产工单号 + /// + public string? mo_code { get; set; } + + /// + /// 生产工单行号 + /// + public int? mo_line { get; set; } + + /// + /// 生产工单BOM明细Id + /// + public string? mo_bom_detail_id { get; set; } + + /// + /// 不含税单价 + /// + public decimal? price { get; set; } + + /// + /// 含税单价 + /// + public decimal? tax_price { get; set; } + + /// + /// 不含税金额 + /// + public decimal? amount { get; set; } + + /// + /// 含税金额 + /// + public decimal? all_amount { get; set; } + + /// + /// 未检验:0,已检验:1 + /// + public int? is_check { get; set; } + + /// + /// 流程任务Id + /// + public string? f_flowtaskid { get; set; } + + /// + /// 流程引擎Id + /// + public string? f_flowid { get; set; } + }