From 5549a8a5751ea37ec7d31bc6e1e9488c0ae6a2af Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期三, 20 八月 2025 11:21:14 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index e770367..adb160c 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -264,20 +264,23 @@
// updateIoMode();
// if (slave.getId()==1) return;
- ArrayList<Integer> staNos = getStaNo();
+ ArrayList<Integer> staNos = staNos1;
+ int staNoSize = staNos1.size();
+ //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));
+ //int staNoSize = staNos.size();
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
OperateResultExOne<byte[]> resultWeight = null;
- if(staNoWeight.size()>4){
+ /*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));
+ OperateResultExOne<byte[]> resultWeight2 = siemensS7Net.Read("DB102.0", (short) (4 * 4));*/
- if (result.IsSuccess && resultWeight.IsSuccess) {
+ //if (result.IsSuccess && resultWeight.IsSuccess) {
+ if (result.IsSuccess) {
int j = 0;
for(int i = 0 ; i<staNoSize;i++){
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -290,8 +293,8 @@
boolean[] status = null;
int offset = getOffsetFromSiteId(siteId);//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset)); // 宸ヤ綔鍙�
- if (staNoWeight.contains(siteId)) {
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
+ /*if (staNoWeight.contains(siteId)) {
if(staNoWeight.size() == 4){
staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight2.Content, j));
j = j + 4;
@@ -300,9 +303,9 @@
j = j + 4;
}
- }
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset+ 4)); // 鐩爣绔�
- status = siemensS7Net.getByteTransform().TransBool(result.Content, offset+ 6, 2);
+ }*/
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
+ status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 1);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
--
Gitblit v1.9.1