11

啊鑫

2025-02-14 94018ba848c6fc56c8555881e8d92b9c88164222

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

@@ -138,8 +138,6 @@
        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;
        mesRohIn.TradePathName = rohIn.FTradePathName;
@@ -149,7 +147,7 @@
        mesRohIn.Version = rohIn.FVersion;

        //作废的相关字段
        // mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        // mesRohIn.CancellationPerson = rohIn.FCancellerId;
        //
        // if (rohIn.FCancelDate != null)
@@ -202,6 +200,7 @@
                DemandSource = s.FDemandType,
                DemandDocumentId = s.FDemandBillNo,
                DemandDocumentLineId = s.FDemandBillEntrySeq,
                RdProject = s.RdProject,
                ProjectPurchaser = s.ProjectPurchaser
            };

@@ -219,16 +218,7 @@
            {
                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