From ab01d75a3fbc8467d81a895cba5d6dde76fbe053 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 16 九月 2025 23:29:30 +0800
Subject: [PATCH] 1111

---
 MES.Service/service/BasicData/MesRohInManager.cs |   79 ++++++++++++++++++++++++++-------------
 1 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index fc681ae..e7de8e2 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -94,7 +94,6 @@
         if (single != null) mesRohIn.Guid = single.Guid;
         mesRohIn.EbelnK3id = eid;
         mesRohIn.BillNo = rohIn.FBillNo;
-        mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
         mesRohIn.DocumentType = rohIn.FBillTypeID;
         mesRohIn.BusinessType = rohIn.FBusinessType;
         /*if (rohIn.FDate != null)
@@ -129,34 +128,42 @@
             mesRohIn.Supplier = mesSupplier.Id.ToString();
         }
 
-        mesRohIn.CloseStatus = rohIn.FCloseStatus;
-        mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
-        mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
+        // SETTLEMENT_PARTY -> MesSupplier.id
+        if (!string.IsNullOrEmpty(rohIn.FSettleId))
+        {
+            var settlementSupplier = Db.Queryable<MesSupplier>()
+                .Where(s => s.SuppNo == rohIn.FSettleId)
+                .Select(s => s.Id)
+                .First();
+            if (settlementSupplier != null)
+            {
+                mesRohIn.SettlementParty = settlementSupplier.ToString();
+            }
+        }
+
+        // PURCHASE_DEPT -> SYS_DEPARTMENT.DEPARTMENTID
+        if (!string.IsNullOrEmpty(rohIn.FPurchaseDeptId))
+        {
+            var department = Db.Queryable<SysDepartment>()
+                .Where(d => d.Departmentcode == rohIn.FPurchaseDeptId)
+                .Select(d => d.Id)
+                .First();
+            if (department != null)
+            {
+                mesRohIn.PurchaseDept = department.ToString();
+            }
+        }
+
+        
+        // mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
+        mesRohIn.PurchaseOrg = "1";
         mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
         mesRohIn.Purchaser = rohIn.FPurchaserId;
-        mesRohIn.SettlementParty = rohIn.FSettleId;
         mesRohIn.PaymentParty = rohIn.FChargeId;
         mesRohIn.Email = rohIn.FProviderEMail;
         mesRohIn.Remarks = rohIn.Remarks;
-        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
         mesRohIn.CancellationPerson = rohIn.FCancellerId;
-        /*if (rohIn.FCancelDate != null)
-            if (!mesRohIn.CancellationPerson.IsNullOrEmpty())
-                mesRohIn.CancellationDate =
-                    DateTime.ParseExact(rohIn.FCancelDate,
-                        "yyyy-MM-d H:m:s", null);
-        mesRohIn.CreateBy = rohIn.FCreatorId;
-        if (rohIn.FCreateDate != null)
-            mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate,
-                "yyyy-MM-d H:m:s", null);
-        mesRohIn.LastupdateBy = rohIn.FModifierId;
-        if (rohIn.FModifyDate != null)
-            mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate,
-                "yyyy-MM-d H:m:s", null);
-        mesRohIn.Prearrivaldate = rohIn.Prearrivaldate != null
-            ? DateTime.ParseExact(rohIn.Prearrivaldate,
-                "yyyy-MM-d H:m:s", null)
-            : null;*/
+        
         if (!rohIn.FCancelDate.IsNullOrEmpty() &&
             !mesRohIn.CancellationPerson.IsNullOrEmpty())
         {
@@ -242,6 +249,17 @@
         mesRohIn.Address = rohIn.Address;
         mesRohIn.Acctype = rohIn.Acctype;
         mesRohIn.SynchronousDate = DateTime.Now;
+        mesRohIn.DocumentStatus = "C";
+        mesRohIn.CancellationStatus = "A";
+        
+        if (rohIn.FCloseStatus.IsNullOrEmpty())
+        {
+            mesRohIn.CloseStatus = "A";
+        }
+        else
+        {
+            mesRohIn.CloseStatus = rohIn.FCloseStatus == "1" ? "B" : "A";
+        }
 
         return mesRohIn;
     }
@@ -312,10 +330,13 @@
                 SupplierItemName = s.FSupMatName,
                 OutsourcingOrderId = s.FSUBREQBILLNO,
                 BatchNumber = s.FLot,
-                BusinessClose = s.FMRPCloseStatus,
-                BusinessFreeze = s.FMRPFreezeStatus,
+                // BusinessClose = s.FMRPCloseStatus,
+                // BusinessFreeze = s.FMRPFreezeStatus,
+                BusinessClose = "A",
+                BusinessFreeze = "A",
                 Freezer = s.FFreezerId,
-                BusinessTerminate = s.FMRPTerminateStatus,
+                // BusinessTerminate = s.FMRPTerminateStatus,
+                BusinessTerminate = "A",
                 Terminator = s.FTerminaterId,
                 TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //绱鏀舵枡鏁�
                 RemainingReceivedQty =
@@ -335,7 +356,8 @@
                 DemandDocumentId = s.FDEMANDBILLNO,
                 DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
                 DemandOrg = s.FRequireOrgId,
-                ReceivingOrg = s.FReceiveOrgId,
+                // ReceivingOrg = s.FReceiveOrgId,
+                ReceivingOrg = "1",
                 SettlementOrg = s.FEntrySettleOrgId,
                 PurchaseOrderLineNumber = s.FSEQ,
                 Demand = s.FRequireOrgId,
@@ -405,6 +427,9 @@
             {
                 entity.ItemId = mesItems.Id.ToString();
             }
+            
+            //BUSINESS_TERMINATE = 'A',RECEIVING_ORG = 1
+            
 
             var single = rohInDataManager.GetSingle(it =>
                 it.EbelnK3id == entity.EbelnK3id);

--
Gitblit v1.9.3