From 4ef036d70c07b11114cc5d325b8efcaca7abc170 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 19 五月 2025 08:47:33 +0800
Subject: [PATCH] #调试
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2bf4d3a..8714c1b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -86,6 +86,16 @@
add(222);add(224);add(227);add(230);
}};
+ public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
+ add(123);
+ add(223);add(225);add(228);add(231);
+ }};
+
+ public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
+ add(102);add(105);add(107);add(109);
+ add(203);add(205);add(208);add(211);
+ }};
+
private Integer count=0;
/**
@@ -116,6 +126,17 @@
return staNosErrList1;
case 2:
return staNosErrList2;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
+ }
+
+ private ArrayList<Integer> getStaNoWeight() {
+ switch (slave.getId()) {
+ case 1:
+ return staNoWeight1;
+ case 2:
+ return staNoWeight2;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -248,10 +269,13 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
ArrayList<Integer> staNosErrList = getStaNoErr();
+ 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) (10 * 4));
- if (result.IsSuccess) {
+ if (result.IsSuccess && resultWeight.IsSuccess) {
+ int j = 0;
for(int i = 0 ; i<staNoSize;i++){
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
@@ -264,9 +288,11 @@
int offset = getOffsetFromSiteId(siteId);//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset)); // 宸ヤ綔鍙�
-
+ if (staNoWeight.contains(siteId)) {
+ 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);
staProtocol.setAutoing(status[0]); // 鑷姩
--
Gitblit v1.9.1