From e74add6a913a5fd6ea1de5fc62379e3f9b24b228 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 15:08:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 69a088e..8eaa64b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -150,20 +150,19 @@
 
         //璇绘潯鐮�
         Thread.sleep(100);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(barcodeSize*8));
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0",(short)31);
         if (result2.IsSuccess) {
             for (int i = 0; i < barcodeSize; i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,15, "UTF-8");
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);
                 }
             }
-
         }
 
         // 鍏呯數淇″彿浣�
-        Thread.sleep(100);
+        Thread.sleep(50);
         OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.128", (short)1);
         if (result3.IsSuccess) {
             boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
@@ -172,6 +171,35 @@
             charge2 = status[2];
         }
 
+        // 澶栧舰妫�娴� - 102
+        Thread.sleep(50);
+        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.129", (short)1);
+        if (result4.IsSuccess) {
+            boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
+            StaProtocol staProtocol = station.get(102);
+            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]);
+        }
+        // 澶栧舰妫�娴� - 203
+        Thread.sleep(50);
+        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB102.130", (short)1);
+        if (result5.IsSuccess) {
+            boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
+            StaProtocol staProtocol = station.get(203);
+            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]);
+        }
+
         if (result.IsSuccess && result1.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));

--
Gitblit v1.9.1