From 96cfc17f191fee0a05070ec8e7bb6fb099f0231c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 24 十二月 2025 14:28:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
index 246f081..06dc6ed 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -104,7 +104,7 @@
if (task != null) {
step = task.getStep();
}
- if (step == 2 && task != null) {
+ if (step == 2) {
sendCommand((StationCommand) task.getData());
}
} catch (Exception e) {
@@ -158,6 +158,7 @@
stationProtocol.setPalletHeight(statusEntity.getPalletHeight());
stationProtocol.setError(statusEntity.getError());
stationProtocol.setBarcode(statusEntity.getBarcode());
+ stationProtocol.setRunBlock(statusEntity.isRunBlock());
}
}
}
@@ -181,7 +182,7 @@
@Override
public boolean connect() {
- zyStationConnectDriver = new ZyStationConnectDriver(deviceConfig);
+ zyStationConnectDriver = new ZyStationConnectDriver(deviceConfig, redisUtil);
zyStationConnectDriver.start();
DeviceConnectPool.put(SlaveType.Devp, deviceConfig.getDeviceNo(), zyStationConnectDriver);
return true;
--
Gitblit v1.9.1