From 02694eed3c05ab89fcf5eabc33fa3c3fb0cd3161 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 16:15:42 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 29a3db3..cda7462 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1653,7 +1653,10 @@
                         crnThread.setResetFlag(true);
                     }
                 }else {
-                    if (wrkMast.getWrkSts() != 14 || wrkMast.getWrkSts() != 15) {
+                    List<Long> list = new ArrayList<>();
+                    list.add(14L);
+                    list.add(15L);
+                    if (!list.contains(wrkMast.getWrkSts())) {
                         News.error("" + mark + " - 1" + " - 鍫嗗灈鏈哄浜庣瓑寰呯‘璁や絾宸ヤ綔妗g姸鎬佹湭瀹屾垚銆傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
                         continue;
                     }

--
Gitblit v1.9.1