From fef0596c74e1a82f5c5b7fac7686e3b520844555 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 14 十二月 2023 19:13:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
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 99d6878..c070adc 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -170,7 +170,7 @@
OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
News.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
- siemensS7Net.ConnectClose();
+// siemensS7Net.ConnectClose();
return result;
}
@@ -296,7 +296,7 @@
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result5.Content, 1, 1);
staProtocol.setAutoing(staProtocol300.isAutoing()); // 鑷姩
- staProtocol.setLoading(status1[2]); // 鏈夌墿
+ staProtocol.setLoading(!status1[2]); // 鏈夌墿
if (staNos3.contains(staNo) || staNos4.contains(staNo)) {
continue;
--
Gitblit v1.9.1