From 52b397b5901c0ec428d0dc6589cbf4c9c2729c24 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 20 四月 2024 17:43:24 +0800
Subject: [PATCH] #演示

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2481e3e..78b31bf 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -338,25 +338,45 @@
                 staProtocol.setBarcodeErr(status[6]);
             }
         } else if (slave.getId() == 3) {
-
             //鏉$爜
             //Thread.sleep(200);
             OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.18",(short)10);
             if (result2.IsSuccess) {
-
                     String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
                     BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 7);
                     if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                         barcodeThread.setBarcode(barcode);
                     }
+            }
+            OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
+            if (result10.IsSuccess) {
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result10.Content, 0, 1);
+                StaProtocol staProtocol = station.get(301);
+                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]);
+            }
+        } else if (slave.getId() == 4) {
+            //鏉$爜
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.18",(short)10);
+            if (result2.IsSuccess) {
 
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 8);
+                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    barcodeThread.setBarcode(barcode);
+                }
             }
             // 澶栧舰妫�娴� - 111
             //Thread.sleep(50);
             OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
             if (result10.IsSuccess) {
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result10.Content, 0, 1);
-                StaProtocol staProtocol = station.get(301);
+                StaProtocol staProtocol = station.get(401);
                 staProtocol.setFrontErr(status[0]);
                 staProtocol.setBackErr(status[1]);
                 staProtocol.setHighErr(status[2]);
@@ -438,6 +458,7 @@
             DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
             deviceErrorService.deleteDeviceError("devp", slave.getId());
         } else {
+            initSite();
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
 //            log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);

--
Gitblit v1.9.1