From 70c104c001de0c586b0d468a30729a9a944560ef Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 29 一月 2026 16:42:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
index 92cadb7..55db83b 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -146,6 +147,14 @@
stationProtocol.setRunBlock(statusEntity.isRunBlock());
stationProtocol.setEnableIn(statusEntity.isEnableIn());
stationProtocol.setWeight(statusEntity.getWeight());
+ }
+
+ if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
+ if (stationProtocol.isAutoing()
+ && !stationProtocol.isLoading()
+ ) {
+ stationProtocol.setSystemWarning("");
+ }
}
}
}
@@ -330,6 +339,11 @@
boolean firstRun = true;
while (true) {
try {
+ Object cancel = redisUtil.get(RedisKeyType.DEVICE_STATION_MOVE_RESET.key + original.getTaskNo());
+ if (cancel != null) {
+ break;//鏀跺埌涓柇淇″彿
+ }
+
StationProtocol currentStation = findCurrentStationByTask(original.getTaskNo());
if (currentStation == null) {
if(System.currentTimeMillis() - runTime > 1000 * 60){
--
Gitblit v1.9.1