From 5b9da592f9bc117c88244f469418d5a5b29e4266 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 16 七月 2025 17:31:52 +0800
Subject: [PATCH] mes取消修改

---
 process/DeviceProcess.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/process/DeviceProcess.cs b/process/DeviceProcess.cs
index ca86b07..f92a1cb 100644
--- a/process/DeviceProcess.cs
+++ b/process/DeviceProcess.cs
@@ -177,9 +177,13 @@
                             var wcsTask1 = TaskHelper.GetTaskByWorkNo(mst.S_OP_CODE, "wcs");
                             if (wcsTask1 != null)
                             {
-                                if (wcsTask1.S_B_STATE != "瀹屾垚")
+                                //绔嬪簱鍑哄簱浠诲姟瀹屾垚鎵嶈兘涓嬪彂
+                                if (wcsTask1.S_TYPE.Contains("鍑哄簱"))
                                 {
-                                    return;
+                                    if (wcsTask1.S_B_STATE != "瀹屾垚")
+                                    {
+                                        return;
+                                    }
                                 }
                             }
                             else {
@@ -287,7 +291,6 @@
                         //1涓烘帴椹充綅浜や簰
                         if (safety.type == 1)
                         {
-
                             LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽嵏璐у簱鍖烘帴椹充綅浜や簰", "瀹夊叏浜や簰");
 
                             //鍏堢粰绔嬪簱鍙戦�鍗歌揣閫氱煡
@@ -338,10 +341,7 @@
                                 LogHelper.Info($"鑳庨潰瀹夊叏浜や簰鍗歌揣锛屼换鍔″彿={mst.S_CODE},娌℃壘鍒扮粓鐐箋mst.S_END_LOC}閰嶇疆", "鑳庨潰浜や簰");
                             }
                         }
-                    }
-
-
-                    
+                    }                  
                 }
                 else
                 {

--
Gitblit v1.9.1