From 4f33cf4caa568544dc9c50c60e2f607a02da11c1 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 24 十一月 2025 15:58:13 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   15 ++++++++++-----
 1 files changed, 10 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..e7110bf 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>() {{
@@ -316,6 +317,9 @@
                 staProtocol.setHigh(status[6]);     // 楂樺簱浣�
                 staProtocol.setLow(status[7]);      // 浣庡簱浣�
 
+                status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 7, 1);
+                staProtocol.setMid(status[0]);     // 涓簱浣�
+
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
                 }
@@ -324,7 +328,7 @@
 
             //鏉$爜鎵弿鍣�
             ArrayList<Integer> barcodeList = getBarcodeList();
-            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2848", (short) (barcodeList.size() * 8));
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.200", (short) (barcodeList.size() * 8));
             if (result2.IsSuccess) {
                 for (int i = 0; i < barcodeList.size(); i++) {
                     Integer barcodeId = barcodeList.get(i);
@@ -338,11 +342,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.102", (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