diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs index 2a3a79ca..f79a5958 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs @@ -14,6 +14,11 @@ public partial class ToolMoldMaintainRule : BaseEntity { id = SnowflakeIdHelper.NextId(); } + + /// + /// 名称 + /// + public string name { get; set; } /// /// 保养方式 /// diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs index 639fcd84..05d9e15e 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs @@ -18,6 +18,11 @@ public partial class ToolMolds : BaseEntity /// 模具编号 /// public string? mold_code { get; set; } + + /// + /// 组织id + /// + public string org_id {get;set; } /// /// 模具名称 @@ -55,7 +60,7 @@ public partial class ToolMolds : BaseEntity public string? mold_status { get; set; } /// - /// 日定额 + /// 班定额 /// public decimal? daily_rate { get; set; } @@ -65,7 +70,7 @@ public partial class ToolMolds : BaseEntity public decimal? hour_norm { get; set; } /// - /// 成长周期 + /// 成长周期 秒 /// public decimal? growth_cycle { get; set; } @@ -75,7 +80,7 @@ public partial class ToolMolds : BaseEntity public int? cavity_qty { get; set; } /// - /// 模具寿命 + /// 模具寿命 模 /// public int? mold_life { get; set; } @@ -125,9 +130,14 @@ public partial class ToolMolds : BaseEntity public string? extras { get; set; } /// - /// 模穴数 + /// 有效模穴数 /// public int? mold_cavity { get; set; } + + /// + /// 出厂模穴数 + /// + public int? ex_factory_mold_cavity { get; set; } /// /// 模具型号 @@ -139,5 +149,38 @@ public partial class ToolMolds : BaseEntity public string item_json { get; set; } public string qrcode { get; set; } - + + /// + /// 供应商id + /// + public string supplier_id { get; set; } + + /// + /// 验收时间 + /// + public DateTime? check_time { get; set; } + /// + /// 质保期开始 + /// + public DateTime? warranty_period_start_time { get; set; } + /// + /// 质保期结束 + /// + public DateTime? warranty_period_end_time { get; set; } + /// + /// 开模时间 + /// + public DateTime? open_time { get; set; } + /// + /// 模具地点 + /// + public string address { get; set; } + /// + /// 模具规格 + /// + public string mold_specification {get;set; } + /// + /// 图纸图号 + /// + public string url { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs index 7aec0ca1..0553ac77 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs @@ -179,15 +179,17 @@ namespace Tnb.WarehouseMgr ["fbuysellflag"] = 1, ["fproductclass"] = 1, ["naccumchecknum"] = 0, - ["nastnum"] = item.purchase_arriveqty, + // ["nastnum"] = item.purchase_arriveqty, ["nnum"] = item.purchase_arriveqty, // ["nplanastnum"] = 0, - // ["nplannum"] = item.purchase_qty, + ["nplannum"] = item.purchase_qty, ["apfinanceorg"] = erpOrg.pk_org, ["pk_apfinanceorg_v"] = erpOrg.pk_org_v, ["pk_arriveorder"] = "", ["pk_arriveorder_b"] = "", ["pk_group"] = "", + ["csourcebid"] = wmsPurchaseOrderDs.erp_line_pk, + ["csourceid"] = wmsPurchaseOrderH?.erp_pk ?? "", ["pk_material"] = erpExtendFields.Find(x=>x.table_id==item.material_id)?.cmaterialoid ?? "", ["pk_order"] = wmsPurchaseOrderH?.erp_pk ?? "", ["pk_order_b"] = wmsPurchaseOrderDs.erp_line_pk,