diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs index bfdddfe1..33b25501 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs @@ -138,4 +138,11 @@ public partial class WmsPurchaseD : BaseEntity /// erp仓库类型 /// public string erp_wh_type { get; set; } + + //public string lineno { get; set; } + + public string erp_purchase_order_d_pk { get; set; } + + public string erp_purchase_order_d_lineno { get; set; } + } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs index d3aa5979..861de21d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs @@ -145,7 +145,7 @@ namespace Tnb.WarehouseMgr .ToListAsync(); WmsPurchaseOrderH wmsPurchaseOrderH = await _db.Queryable().SingleAsync(x=>x.id==purchase.erp_bill_code); //todo 先取采购订单第一条 - WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable().FirstAsync(x=>x.fk_wms_purchase_order_id==purchase.erp_bill_code); + //WmsPurchaseOrderD wmsPurchaseOrderDs = await _db.Queryable().FirstAsync(x=>x.fk_wms_purchase_order_id==purchase.erp_bill_code); List ids = new List(); ids.Add(_userManager.UserId); @@ -193,10 +193,10 @@ namespace Tnb.WarehouseMgr { ["castunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["cfirstbid"] = wmsPurchaseOrderH?.erp_pk ?? "", - ["cfirstid"] = wmsPurchaseOrderDs.erp_line_pk, + ["cfirstid"] = item.erp_purchase_order_d_pk, ["cfirsttypecode"] = "", ["crececountryid"] = "0001Z010000000079UJJ", - ["crowno"] = wmsPurchaseOrderDs.lineno, + ["crowno"] = item.erp_purchase_order_d_lineno, ["csendcountryid"] = "0001Z010000000079UJJ", ["csourcetypecode"] = "", ["ctaxcountryid"] = "0001Z010000000079UJJ", @@ -216,11 +216,11 @@ namespace Tnb.WarehouseMgr ["pk_arriveorder"] = null, ["pk_arriveorder_b"] = null, ["pk_group"] = erpOrg.pk_group, - ["csourcebid"] = wmsPurchaseOrderDs.erp_line_pk, + ["csourcebid"] = item.erp_purchase_order_d_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, + ["pk_order_b"] = item.erp_purchase_order_d_pk, ["pk_org"] = erpOrg.pk_org, ["pk_org_v"] = erpOrg.pk_org_v, ["pk_psfinanceorg"] = erpOrg.pk_org_v,