From 7fb7e64c4bd096b031d9a6015f8ee0ac0ae900e1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 四月 2025 10:19:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
index d84c69c..473fd95 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
@@ -139,7 +139,7 @@
if (Integer.parseInt(resultData.get("slaveId").toString()) != this.slave.getId()) {
return;
}
- if (!resultData.get("slaveId").toString().equals("status")) {
+ if (!resultData.get("dbTag").toString().equals("status")) {
return;
}
@@ -185,13 +185,13 @@
if (resultData2 == null) {
OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇璐у弶鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
}
- if (Integer.parseInt(resultData.get("slaveId").toString()) != this.slave.getId()) {
+ if (Integer.parseInt(resultData2.get("slaveId").toString()) != this.slave.getId()) {
return;
}
- if (!resultData.get("slaveId").toString().equals("staStatus")) {
+ if (!resultData2.get("dbTag").toString().equals("staStatus")) {
return;
}
- OperateResultExOne<byte[]> result2 = (OperateResultExOne<byte[]>) resultData.get("data");
+ OperateResultExOne<byte[]> result2 = (OperateResultExOne<byte[]>) resultData2.get("data");
if (result2.IsSuccess) {
for (int i = 0; i < this.slave.getSta().size(); i++) {
ForkLiftSlave.Sta sta = this.slave.getSta().get(i);
@@ -203,6 +203,12 @@
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result2.Content, i * 2, 2);
forkLiftStaProtocol.setHasTray(status1[0]);
forkLiftStaProtocol.setHasCar(status1[1]);
+
+ if (sta.getStaNo() == 1001) {
+ if (forkLiftStaProtocol.getHasTray() == false) {
+ continue;
+ }
+ }
}
}
--
Gitblit v1.9.1