From b2a011edd5bf1abb316900cfd041ae0f888f9dc8 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 04 九月 2024 21:02:57 +0800
Subject: [PATCH] 优化了三码合一行为

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

diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index c0c3a39..d07171d 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -63,7 +63,7 @@
                     else
                     {
                         var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
-                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
+                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
 
                         //鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
                         if (!wosns.IsNullOrEmpty())
@@ -279,6 +279,7 @@
                                 WORK_ORDER = CurBatch.Batch.ORDER_NO,
                                 WIP_ID = wipSN.ID,
                                 SN = wipSN.SN,
+                                FLOW_SN = wipSN.SN,
                                 TRAY_SN = wipSN.TRAY_SN,
                                 STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
                             });

--
Gitblit v1.9.3