From 3271d09e9c1a4dd1280ae27b9d0e8f6e6b1104c0 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 14 二月 2025 14:34:39 +0800
Subject: [PATCH] 111

---
 StandardPda/MES.Service/service/BasicData/MesRohInManager.cs |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
index 274fb28..0332ba0 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -91,7 +91,7 @@
     // 灏� ErpRohIn 瀵硅薄杞崲涓� MesRohIn 瀵硅薄鐨勬柟娉�
     private MesRohIn GetMesRohIn(ErpRohIn rohIn)
     {
-        var eid = Convert.ToDecimal(rohIn.id);
+        var eid = rohIn.id;
         var mesRohIn = new MesRohIn();
 
         var single = base.GetSingle(it => it.EbelnK3id == eid);
@@ -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)
@@ -168,8 +166,8 @@
         {
             var entity = new MesRohInData
             {
-                EbelnK3id = Convert.ToDecimal(s.id),
-                ErpId = Convert.ToDecimal(s.Eid),
+                EbelnK3id = s.id,
+                ErpId = s.Eid,
                 BillNo = s.FBillNo,
                 OrderLineId = s.FSeq,
                 BusinessFreeze = s.FStatus,
@@ -202,6 +200,7 @@
                 DemandSource = s.FDemandType,
                 DemandDocumentId = s.FDemandBillNo,
                 DemandDocumentLineId = s.FDemandBillEntrySeq,
+                RdProject = s.RdProject,
                 ProjectPurchaser = s.ProjectPurchaser
             };
 
@@ -220,15 +219,6 @@
                 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

--
Gitblit v1.9.3