模具相关修改

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRule.cs

@@ -14,6 +14,11 @@ public partial class ToolMoldMaintainRule : BaseEntity<string>
     {
         id = SnowflakeIdHelper.NextId();
     }
+    
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string name { get; set; }
     /// <summary>
     /// 保养方式
     /// </summary>

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs

@@ -18,6 +18,11 @@ public partial class ToolMolds : BaseEntity<string>
     /// 模具编号
     /// </summary>
     public string? mold_code { get; set; }
+    
+    /// <summary>
+    /// 组织id
+    /// </summary>
+    public string org_id {get;set; }
 
     /// <summary>
     /// 模具名称
@@ -55,7 +60,7 @@ public partial class ToolMolds : BaseEntity<string>
     public string? mold_status { get; set; }
 
     /// <summary>
-    /// 日定额
+    /// 班定额
     /// </summary>
     public decimal? daily_rate { get; set; }
 
@@ -65,7 +70,7 @@ public partial class ToolMolds : BaseEntity<string>
     public decimal? hour_norm { get; set; }
 
     /// <summary>
-    /// 成长周期
+    /// 成长周期 秒
     /// </summary>
     public decimal? growth_cycle { get; set; }
 
@@ -75,7 +80,7 @@ public partial class ToolMolds : BaseEntity<string>
     public int? cavity_qty { get; set; }
 
     /// <summary>
-    /// 模具寿命
+    /// 模具寿命 模
     /// </summary>
     public int? mold_life { get; set; }
 
@@ -125,9 +130,14 @@ public partial class ToolMolds : BaseEntity<string>
     public string? extras { get; set; }
 
     /// <summary>
-    /// 模穴数
+    /// 有效模穴数
     /// </summary>
     public int? mold_cavity { get; set; }
+    
+    /// <summary>
+    /// 出厂模穴数
+    /// </summary>
+    public int? ex_factory_mold_cavity { get; set; }
 
     /// <summary>
     /// 模具型号
@@ -139,5 +149,38 @@ public partial class ToolMolds : BaseEntity<string>
     public string item_json { get; set; }
 
     public string qrcode { get; set; }
-
+    
+    /// <summary>
+    /// 供应商id
+    /// </summary>
+    public string supplier_id { get; set; }
+    
+    /// <summary>
+    /// 验收时间
+    /// </summary>
+    public DateTime? check_time { get; set; }   
+    /// <summary>
+    /// 质保期开始
+    /// </summary>
+    public DateTime? warranty_period_start_time { get; set; }
+    /// <summary>
+    /// 质保期结束
+    /// </summary>
+    public DateTime? warranty_period_end_time { get; set; }
+    /// <summary>
+    /// 开模时间
+    /// </summary>
+    public DateTime? open_time { get; set; }
+    /// <summary>
+    /// 模具地点
+    /// </summary>
+    public string address { get; set; }
+    /// <summary>
+    /// 模具规格
+    /// </summary>
+    public string mold_specification {get;set; }
+    /// <summary>
+    /// 图纸图号
+    /// </summary>
+    public string url { get; set; }
 }

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,