From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java b/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java
index 7504b2d..25269ab 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java
@@ -170,6 +170,21 @@
                 OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇璐у弶鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
             }
 
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB102.0", (short) 8);
+            if (result2.IsSuccess) {
+                for (int i = 0; i < this.slave.getSta().size(); i++) {
+                    ForkLiftSlave.Sta sta = this.slave.getSta().get(i);
+                    if (forkLiftStaProtocols.isEmpty()) {
+                        continue;
+                    }
+
+                    ForkLiftStaProtocol forkLiftStaProtocol = forkLiftStaProtocols.get(i);
+                    boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result2.Content, i * 2, 2);
+                    forkLiftStaProtocol.setHasTray(status1[0]);
+                    forkLiftStaProtocol.setHasCar(status1[1]);
+                }
+            }
+
             if (System.currentTimeMillis() - forkLiftProtocol.getDeviceDataLog() > 1000 * 5) {
                 //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
                 //淇濆瓨鏁版嵁璁板綍
@@ -241,7 +256,7 @@
         array[3] = command.getPut();//鏀捐揣鏁版嵁
         OperateResult result = siemensS7Net.Write("DB103.0", array);
         if (result.IsSuccess) {
-            OperateResult result2 = siemensS7Net.Write("DB103.16", command.getConfirm());
+            OperateResult result2 = siemensS7Net.Write("DB103.8", command.getConfirm());
             if (result2.IsSuccess) {
                 response.setResult(true);
             }

--
Gitblit v1.9.1