From d489b3674cb3914f485218b874ed03ceb06dabe9 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 07 五月 2024 14:21:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++++++-
1 files changed, 6 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 caa1916..b2f5887 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1917,6 +1917,7 @@
StaProtocol staProtocol = devpThread.getStation().get(staNo);
StaProtocol staProtocol1 = devpThread.getStation().get(staNo+1);
if (staProtocol == null) { continue; }
+ if (staProtocol1 == null) { continue; }
if (staProtocol.getWorkNo() != 0 || staProtocol.isLoading()) {
reset = false;
break;
@@ -1925,9 +1926,13 @@
reset = false;
break;
}
+ if (!staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && !staProtocol1.isLoading() && staProtocol1.getWorkNo() == 0){
+ News.error("{}鍙稬ED鍏ュ簱鍙�2涓珯鐐归兘娌℃湁鏁版嵁,鍑嗗reset澶嶄綅鏄剧ず鍣紒锛侊紒[ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ }
}
// 鑾峰彇led绾跨▼
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
+// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
if (reset) {
if (ledThread == null) {
--
Gitblit v1.9.1