From 715101e29ad1eb8d70f587237a37d74d50d3fd2a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 15:23:28 +0800
Subject: [PATCH] 初步调试

---
 src/main/java/com/zy/core/thread/impl/FyDevpThread.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index d1ddd93..676d8a2 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -41,7 +41,7 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
 
-    public IoModeType ioModeOf2_5 = IoModeType.PAKIN_MODE;
+    public IoModeType ioModeOf2_5 = IoModeType.PAKOUT_MODE;
 
     private short heartBeatVal = 1;
     private int barcodeSize = 10;
@@ -163,8 +163,12 @@
                 staProtocol.setOutEnable(status[4]);// 鍙嚭
 
                 staProtocol.setBackErr(status[5]);
-                staProtocol.setLeftErr(status[6]);
+                staProtocol.setHigh(status[6]);
                 staProtocol.setRightErr(status[7]);
+//                staProtocol.setHighErr(status[8]);
+//                staProtocol.setWeightErr(status[9]);
+//                staProtocol.setLow(status[10]);
+//                staProtocol.setHigh(status[11]);
 
                 boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, i * 26 + 1, 2);
                 staProtocol.setHighErr(status2[0]);
@@ -200,11 +204,7 @@
                     BasDevp sqlModel = staProtocol.toSqlModel();
                     stations.add(sqlModel);
 
-                    //鏆傛椂鍐欏叆鏁版嵁搴�
-                    BasDevp basDevp = basConveyorStaService.selectById(sta);
-                    if (basDevp == null) {
-                        basConveyorStaService.insert(sqlModel);
-                    }
+
                 }
                 if (!stations.isEmpty()) {
                     if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
@@ -300,9 +300,11 @@
 
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
-    private void updateIoMode() throws InterruptedException {
+    private void updateIoMode() {
         if (this.ioModeOf2_5 != null && (this.ioModeOf2_5.id == 0 || this.ioModeOf2_5.id == 1)) {
-            if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id).IsSuccess) {
+            short[] array = new short[1];
+            array[0] = this.ioModeOf2_5.id;
+            if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id == 1).IsSuccess) {
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐�", this.ioModeOf2_5));
                 log.error("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", this.ioModeOf2_5);
             } else {

--
Gitblit v1.9.1