From b18a3f58bbad48573a63a298bd6228095c4260a7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 10:22:37 +0800
Subject: [PATCH] #devp

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d7de2ab..3722538 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -338,29 +338,23 @@
             }
         }
 
+        //鎶ヨ淇℃伅
         Thread.sleep(200);
         OperateResultExOne<byte[]> result3 = null;
-        result3 = siemensS7Net.Read("DB101.0", (short) (getErrorStaNo().size() * 8));
+        result3 = siemensS7Net.Read("DB101.800.0", (short) (getErrorStaNo().size() * 4));
         if (result3.IsSuccess) {
             for (int i = 0; i < getErrorStaNo().size(); i++) {
                 Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
-                staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 ));   // 搴撲綅楂樺害
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4, 2);
-                staProtocol.setF(status[0]);  // 鑷姩
-                staProtocol.setLoading(status[1]);  // 鏈夌墿
-                staProtocol.setInEnable(status[2]); // 鍙叆
-                staProtocol.setOutEnable(status[3]);// 鍙嚭
-                staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
-                staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-                staProtocol.setLow(status[7]);      // 浣庡簱浣�
-                staProtocol.setEmptyOutPalletRequire(status[8]);      // 绌烘墭鐩樺彲鍑洪渶姹備俊鍙�
-                staProtocol.setEmptyInPalletRequire(status[9]);      // 绌烘墭鐩樺彲鍏ラ渶姹備俊鍙�
-
-                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-                    staProtocol.setPakMk(true);
-                }
+                staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));   // 搴撲綅楂樺害
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 2);
+                staProtocol.setFrontErr(status[0]);
+                staProtocol.setBackErr(status[1]);
+                staProtocol.setHighErr(status[2]);
+                staProtocol.setLeftErr(status[3]);
+                staProtocol.setRightErr(status[4]);
+                staProtocol.setWeightErr(status[5]);
+                staProtocol.setBarcodeErr(status[6]);
             }
         }
 

--
Gitblit v1.9.1