From 4fe69aa7c84b8e9d88cb7cb88865a88a4815f84c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 11:18:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 335747a..955735e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1856,18 +1856,28 @@
StaProtocol modelStaProtocol = devpThread.getStation().get(led.getModelSta());
if (null != modelStaProtocol && modelStaProtocol.isIn()) {
staArr = led.getInStaArr();
+ for (Integer staNo : staArr) {
+ // 鑾峰彇鍙夎溅绔欑偣
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null) { continue; }
+ if (staProtocol.getWorkNo() != 0 || staProtocol.isErr()) {
+ reset = false;
+ break;
+ }
+ }
} else if (null != modelStaProtocol && modelStaProtocol.isOut()) {
staArr = led.getOutStaArr();
- }
- for (Integer staNo : staArr) {
- // 鑾峰彇鍙夎溅绔欑偣
- StaProtocol staProtocol = devpThread.getStation().get(staNo);
- if (staProtocol == null) { continue; }
- if (staProtocol.getWorkNo() != 0 || staProtocol.isErr()) {
- reset = false;
- break;
+ for (Integer staNo : staArr) {
+ // 鑾峰彇鍙夎溅绔欑偣
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null) { continue; }
+ if (staProtocol.isLoading() || staProtocol.isErr()) {
+ reset = false;
+ break;
+ }
}
}
+
// 鑾峰彇led绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
--
Gitblit v1.9.1