11

啊鑫

2025-02-14 0a923d4aa5be3c24139efc7c901e58491af4946d

11

 StandardPda/MES.Service/service/BasicData/MesRohInManager.cs

@@ -98,15 +98,15 @@
        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();
            .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;
@@ -115,7 +115,7 @@
        if (rohIn.FDate != null)
            mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,
                "yyyy-MM-dd HH:mm:ss", null);
        

        mesRohIn.CloseStatus = rohIn.FCloseStatus;
        mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
        mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
@@ -175,7 +175,7 @@
                BusinessFreeze = s.FStatus,
                PurchaseOrderLineNumber = s.FSeq,
                SalesOrderId = s.FDemandBillEntrySeq,
                

                PurchaseUnit = s.FUnitId,
                PurchaseQty = Convert.ToDecimal(s.FQty),
                PricingUnit = s.FPriceUnitId,
@@ -202,26 +202,44 @@
                DemandSource = s.FDemandType,
                DemandDocumentId = s.FDemandBillNo,
                DemandDocumentLineId = s.FDemandBillEntrySeq,
                RdProject = s.RdProject,
                Project = s.Project,
                ProjectPurchaser = s.ProjectPurchaser
            };

            var single = rohInDataManager.GetSingle(it =>
                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();
                .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_ITEMS").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_ITEMS").First();

            if (mesLinkU92 != null)
            {
                entity.Project = mesLinkU92.MesId;
            }

            return entity;
        }).ToList();
    }