From 6d11821ff01c5bfb1c07153772a8efce774ab5d5 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期四, 28 八月 2025 08:14:34 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3312f98..9d87197 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -78,8 +78,9 @@
}};*/
public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
- add(101);
- add(102);add(103);add(104);add(105);
+// add(101);
+// add(102);add(103);add(104);add(105);
+ add(102);
}};
public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
@@ -324,7 +325,7 @@
//鏉＄爜鎵弿鍣�
ArrayList<Integer> barcodeList = getBarcodeList();
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2848", (short) (barcodeList.size() * 8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.602", (short) (barcodeList.size() * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeList.size(); i++) {
Integer barcodeId = barcodeList.get(i);
@@ -338,11 +339,12 @@
//澶栧舰妫�娴�
ArrayList<Integer> staNoErrs = staNosErrList;
int staNoErrsSize = staNoErrs.size();
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2808", (short) (staNoErrsSize * 4));
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.702", (short) (staNoErrsSize * 7));
if (resultErr.IsSuccess) {
for (int i = 0; i < staNoErrsSize; i++) {
Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 7, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
--
Gitblit v1.9.1