From aab207a06cf1e294750b38af00ac1b3968bf540f Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期五, 14 二月 2025 08:24:02 +0800 Subject: [PATCH] 11 --- StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs index 4781880..274fb28 100644 --- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs +++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs @@ -97,6 +97,16 @@ var single = base.GetSingle(it => it.EbelnK3id == eid); if (single != null) mesRohIn.Id = single.Id; + var mesLinkU9 = Db.Queryable<MesLinkU9>() + .Where(s => s.U9Id == rohIn.FSupplierId + && s.OrgId == rohIn.FReceiveOrgId + && s.TableType == "MES_SUPPLIER").First(); + + if (mesLinkU9 != null) + { + mesRohIn.Supplier = mesLinkU9.MesId; + } + mesRohIn.EbelnK3id = eid; mesRohIn.BillNo = rohIn.FBillNo; mesRohIn.DocumentStatus = rohIn.FDocumentStatus; @@ -105,7 +115,7 @@ if (rohIn.FDate != null) mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate, "yyyy-MM-dd HH:mm:ss", null); - mesRohIn.Supplier = rohIn.FSupplierId; + mesRohIn.CloseStatus = rohIn.FCloseStatus; mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId; mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId; @@ -128,6 +138,7 @@ mesRohIn.Changereason = rohIn.PubDescSeg2; mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId); mesRohIn.Remarks = rohIn.Remarks; + mesRohIn.CancellationStatus = rohIn.FCancelStatus; mesRohIn.SrcDocType = rohIn.FSrcDocType; mesRohIn.SrcDoc = rohIn.FSrcDoc; @@ -164,7 +175,7 @@ BusinessFreeze = s.FStatus, PurchaseOrderLineNumber = s.FSeq, SalesOrderId = s.FDemandBillEntrySeq, - ItemId = s.FMaterialId, + PurchaseUnit = s.FUnitId, PurchaseQty = Convert.ToDecimal(s.FQty), PricingUnit = s.FPriceUnitId, @@ -191,8 +202,6 @@ DemandSource = s.FDemandType, DemandDocumentId = s.FDemandBillNo, DemandDocumentLineId = s.FDemandBillEntrySeq, - RdProject = s.RdProject, - Project = s.Project, ProjectPurchaser = s.ProjectPurchaser }; @@ -200,6 +209,37 @@ it.EbelnK3id == entity.EbelnK3id); if (single != null) entity.Id = single.Id; + //ItemId = s.FMaterialId, + var mesLinkU9 = Db.Queryable<MesLinkU9>() + .Where(x => x.U9Id == s.FMaterialId + && x.OrgId == s.FReceiveOrgId + && x.TableType == "MES_ITEMS").First(); + + if (mesLinkU9 != null) + { + entity.ItemId = mesLinkU9.MesId; + } + + var mesLinkU91 = Db.Queryable<MesLinkU9>() + .Where(x => x.U9Id == s.RdProject + && x.OrgId == s.FReceiveOrgId + && x.TableType == "MES_PROJECT").First(); + + if (mesLinkU91 != null) + { + entity.RdProject = mesLinkU91.MesId; + } + + var mesLinkU92 = Db.Queryable<MesLinkU9>() + .Where(x => x.U9Id == s.Project + && x.OrgId == s.FReceiveOrgId + && x.TableType == "MES_PROJECT").First(); + + if (mesLinkU92 != null) + { + entity.Project = mesLinkU92.MesId; + } + return entity; }).ToList(); } -- Gitblit v1.9.3