From 41a4105259344fa33706fa4ecc88e54d2d181005 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 11 九月 2024 00:50:47 +0800
Subject: [PATCH] 包装规则更新

---
 Tiger.Business.MES/Transaction/PackingNode.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 4584680..d3fc692 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -86,7 +86,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())
@@ -311,6 +311,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(),
                             });
@@ -437,7 +438,8 @@
                     Steps.Clear();
 	                var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this) 
                     {
-	                    Sequence = Steps.Count + 1,
+                        Name = "鎵弿浜у搧",
+                        Sequence = Steps.Count + 1,
 	                    Node = curNode,
                         OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == curNode.ID),
                         DBSubmitAction = () =>

--
Gitblit v1.9.3