From 8575212fc3785e484a37f981e0a3c9ebe33028a1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 24 十二月 2023 21:58:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |    9 +++++----
 1 files changed, 5 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 2efb1ea..221619e 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -146,7 +146,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 4;
+    private int barcodeSize = 2;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -278,7 +278,7 @@
         if (result1.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*8+6, 1);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*8+6, 2);
                 StaProtocol staProtocol = station.get(siteId);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
@@ -288,7 +288,8 @@
                 staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
                 staProtocol.setHigh(status[6]);     // 楂樺簱浣�
                 staProtocol.setLow(status[7]);      // 浣庡簱浣�
-                staProtocol.setEmptyPalletRequire(status[8]);      // 绌烘墭鐩橀渶姹備俊鍙�
+                staProtocol.setEmptyOutPalletRequire(status[8]);      // 绌烘墭鐩樺彲鍑洪渶姹備俊鍙�
+                staProtocol.setEmptyInPalletRequire(status[9]);      // 绌烘墭鐩樺彲鍏ラ渶姹備俊鍙�
 
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
@@ -300,7 +301,7 @@
         if(slave.getId() == 1) {
             Thread.sleep(200);
             OperateResultExOne<byte[]> result2 = null;
-            result2 = siemensS7Net.Read("DB101.840.0", (short) (barcodeSize * 8));
+            result2 = siemensS7Net.Read("DB101.208.0", (short) (barcodeSize * 8));
             if (result2.IsSuccess) {
                 for (int i = 0; i < barcodeSize; i++) {
                     String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");

--
Gitblit v1.9.1