From a27f32ecbfc7390ceb9e3a8d8651c57ada88bfa0 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 19 十二月 2025 20:51:42 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/XB_MES_API

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

diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
index 42e2b20..57f2a49 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs
@@ -95,7 +95,15 @@
         var mesRohIn = new MesRohIn();
 
         var single = base.GetSingle(it => it.EbelnK3id == eid);
-        if (single != null) mesRohIn.Id = single.Id;
+        if (single != null)
+        {
+            mesRohIn.Id = single.Id;
+
+            if (single.CheckDate != null)
+                mesRohIn.CheckDate = single.CheckDate;
+            else
+                mesRohIn.CheckDate = DateTime.Now;
+        }
 
         var mesLinkU9 = Db.Queryable<MesLinkU9>()
             .Where(s => s.U9Id == rohIn.FSupplierId
@@ -143,6 +151,7 @@
         mesRohIn.PrivateDescSeg1 = rohIn.PrivateDescSeg1;
         mesRohIn.Version = rohIn.FVersion;
         mesRohIn.ZzpoNo = rohIn.ZzpoNo;
+        mesRohIn.Remark1 = rohIn.Ywlx;
 
         //浣滃簾鐨勭浉鍏冲瓧娈�
         mesRohIn.CancellationStatus = rohIn.FCancelStatus;

--
Gitblit v1.9.3