From a454c4e3e56ed63a7676348f260a240fa18be481 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 14:02:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 921b842..4055c3b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -77,17 +77,16 @@
add(10); add(11); add(12); add(13);
}};
public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
- add(101); add(104);add(106);add(108);
- add(202);add(204);add(207);add(210);
+ add(102); add(105);add(107);add(109);
+ add(203);add(205);add(208);add(211);
}};
public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
- add(122);
- add(222);add(224);add(227);add(230);
+ add(123);
+ add(223);add(225);add(228);add(231);
}};
public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
- add(123);
add(223);add(225);add(228);add(231);
}};
@@ -242,7 +241,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("SiemensDevp"+" - 2"+" - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
- siemensS7Net.ConnectClose();
+// siemensS7Net.ConnectClose();
initSite();
return result;
}
@@ -274,7 +273,14 @@
ArrayList<Integer> staNoWeight = getStaNoWeight();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (500 * 8));
- OperateResultExOne<byte[]> resultWeight = siemensS7Net.Read("DB102.0", (short) (8 * 4));
+ OperateResultExOne<byte[]> resultWeight = null;
+ if(staNoWeight.size()>4){
+ resultWeight = siemensS7Net.Read("DB102.0", (short) (8 * 4));
+ }else{
+ resultWeight = siemensS7Net.Read("DB102.0", (short) (4 * 4));
+ }
+ OperateResultExOne<byte[]> resultWeight2 = siemensS7Net.Read("DB102.0", (short) (4 * 4));
+
if (result.IsSuccess && resultWeight.IsSuccess) {
int j = 0;
for(int i = 0 ; i<staNoSize;i++){
@@ -290,8 +296,14 @@
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset)); // 宸ヤ綔鍙�
if (staNoWeight.contains(siteId)) {
- staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight.Content, j));
- j = j + 4;
+ if(staNoWeight.size() == 4){
+ staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight2.Content, j));
+ j = j + 4;
+ }else{
+ staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight.Content, j));
+ j = j + 4;
+
+ }
}
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset+ 4)); // 鐩爣绔�
status = siemensS7Net.getByteTransform().TransBool(result.Content, offset+ 6, 2);
--
Gitblit v1.9.1