From 903932bc3db70f11bb8ebbe67321fc4336b09bba Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 16 九月 2025 18:01:23 +0800
Subject: [PATCH] 111
---
MES.Service/service/BasicData/MesRohInManager.cs | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 213d614..e4ba0fe 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -154,7 +154,7 @@
}
}
- mesRohIn.CloseStatus = rohIn.FCloseStatus;
+
// mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
mesRohIn.PurchaseOrg = "1";
mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
@@ -163,23 +163,7 @@
mesRohIn.Email = rohIn.FProviderEMail;
mesRohIn.Remarks = rohIn.Remarks;
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())
{
@@ -267,6 +251,17 @@
mesRohIn.SynchronousDate = DateTime.Now;
mesRohIn.DocumentStatus = "C";
mesRohIn.CancellationStatus = "A";
+
+ if (rohIn.FCloseStatus.IsNullOrEmpty())
+ {
+ mesRohIn.CloseStatus = "A";
+ }
+ else
+ {
+ //鎴戞湡鏈涚殑鍊兼槸A=鍚�,B=鏄�
+ //瀹為檯缁欐垜鐨勫�兼槸0鎴�1锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
+ mesRohIn.CloseStatus = rohIn.FCloseStatus == "1" ? "B" : "A";
+ }
return mesRohIn;
}
--
Gitblit v1.9.3