From 770a7701c1473993c0e8148377c4f44dfec31e20 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 28 十一月 2023 16:34:19 +0800
Subject: [PATCH] #接口+高度位变更为检测小车+扫码

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d258bd5..7b417cf 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -73,7 +73,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 3;
+    private int barcodeSize = 7;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -223,7 +223,7 @@
                 staProtocol.setOutEnable(status[3]);// 鍙嚭
                 staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
                 staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
+                staProtocol.setCar(status[6]);     // 鏄惁鏈夎溅
                 staProtocol.setLow(status[7]);      // 浣庡簱浣�
 
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
@@ -232,20 +232,21 @@
             }
         }
 
+
+        if (slave.getId() == 1){
             //鏉$爜
             Thread.sleep(200);
-            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.100",(short)31);
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.102",(short)60);
             if (result2.IsSuccess) {
-                for (int i = 0; i < barcodeSize; i++) {
-                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+                for (int i = 0; i < 6; i++) {
+                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10,8, "UTF-8");
                     BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                     if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                         barcodeThread.setBarcode(barcode);
                     }
                 }
-
             }
-        if (slave.getId() == 1){
+
             // 澶栧舰妫�娴� - 102
             Thread.sleep(100);
             OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.150", (short)1);

--
Gitblit v1.9.1