From 75c7716ee5349ea1eeb7bcdd1724ef2423454c0e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 15 十月 2024 17:17:43 +0800
Subject: [PATCH] 优化手工结束包装信息保存逻辑

---
 Tiger.Business.MES/WorkAction/PackingAction.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index daa40d0..ab7c1f1 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -926,11 +926,12 @@
                                     .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.ID == pkg.WIP_ID)
                                     .ExecuteCommand();
                                 //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
+                                var endOperCode = CurPkg.IsReachedEndNode ? "EndNode" : "NotReachedEndNode";
                                 db.Updateable<MES_WIP_HIS>()
                                     .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
                                     .SetColumns(q => q.INNER_SN == q.CARTON_SN)
                                     .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
-                                    .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID)
+                                    .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && (q.NODE_ID == pkg.NODE_ID || q.OPER_CODE == endOperCode))
                                     .ExecuteCommand();
                                 //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц涓鸿褰�
                                 db.Updateable<MES_WIP_ACT>()

--
Gitblit v1.9.3