From 94359cabfd77f8cac9191b41a586b587953dffd5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 04 九月 2024 16:14:33 +0800
Subject: [PATCH] 增加雅达专用上料行为 增加雅达U9数据实体

---
 Tiger.Business.MES/WorkAction/ThreeInOne.cs |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index 40672b5..669a4fb 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -84,15 +84,22 @@
             //鍘傚唴鏉$爜宸茬粦瀹氬鎴锋潯鐮侊紝鐩存帴缁撴潫琛屼负
             if (!CurCSN.IsNullOrEmpty())
             {
-                CurCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
-                CurCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
-                action.Data.Data = new
+                if (CurCSN.WORK_ORDER == CurPosition.WorkBatch.WO.ORDER_NO)
                 {
-                    NeedPrint = false,
-                    NeedScan = false,
-                    Label = "",
-                };
-                action = End(input);
+                    CurCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
+                    CurCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
+                    action.Data.Data = new
+                    {
+                        NeedPrint = false,
+                        NeedScan = false,
+                        Label = "",
+                    };
+                    action = End(input);
+                }
+                else
+                {
+
+                }
             }
             //鍘傚唴鏉$爜鏈粦瀹氬鎴锋潯鐮�
             else

--
Gitblit v1.9.3