From 7fb2fa2382a4de194c0e906a8b206f854a3de17f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 07 十月 2025 09:35:59 +0800
Subject: [PATCH] #和得服务器

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 7926c47..f146152 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -125,7 +125,7 @@
             Arrays.asList(1051,1055,1057,1065,1067,1069,1077,1081,1083,1086,1089,1092,1095,1097,1100));
 
     private static final Set<Integer> specialSites3 = new HashSet<>(//鏈烘鑷傜珯鐐�
-            Arrays.asList(1098,1093,1087,1082,1074,1071,1062,1059));
+            Arrays.asList(1098,1093,1087,1082,1074,1071,1061,1058));
 
 
     public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
@@ -367,7 +367,7 @@
 //                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
 //                staProtocol.setLow(status[7]);      // 浣庡簱浣�
 
-                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                if (!staProtocol.isPakMk() && (!staProtocol.isLoading() || !staProtocol.isInEnable())) {
                     staProtocol.setPakMk(true);
                 }
             }

--
Gitblit v1.9.1