From 3f0fe86c814e65f09bfdf08923226ced9252a537 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 09 四月 2026 20:43:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/plugin/GslProcess.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index 609da19..0e16ea5 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -77,12 +77,12 @@
stationOperateProcessUtils.submitCheckTaskToCompleteTasks(DISPATCH_INTERVAL_MS);
// 妫�娴嬪苟澶勭悊鍑哄簱鎺掑簭
stationOperateProcessUtils.submitCheckStationOutOrderTasks(MAINTENANCE_INTERVAL_MS);
- // 鐩戞帶杈撻�佺嚎缁曞湀绔欑偣
- stationOperateProcessUtils.submitWatchCircleStationTasks(MAINTENANCE_INTERVAL_MS);
+// // 鐩戞帶杈撻�佺嚎缁曞湀绔欑偣
+// stationOperateProcessUtils.submitWatchCircleStationTasks(MAINTENANCE_INTERVAL_MS);
// 妫�娴嬭緭閫佺嚎杩愯鍫靛
stationOperateProcessUtils.submitCheckStationRunBlockTasks(MAINTENANCE_INTERVAL_MS);
- // 妫�娴嬬珯鍙扮┖闂茶秴鏃跺悗鐨勬仮澶嶅鐞�
- stationOperateProcessUtils.submitCheckStationIdleRecoverTasks(MAINTENANCE_INTERVAL_MS);
+// // 妫�娴嬬珯鍙扮┖闂茶秴鏃跺悗鐨勬仮澶嶅鐞�
+// stationOperateProcessUtils.submitCheckStationIdleRecoverTasks(MAINTENANCE_INTERVAL_MS);
}
@Override
@@ -186,16 +186,50 @@
StationThread stationThread,
StationObjModel stationObjModel,
StationProtocol stationProtocol) {
- if (stationProtocol.getError() <= 0) {
- return true;
+ if (stationProtocol == null) {
+ return false;
}
- Object lock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId());
+ if (!stationProtocol.isAutoing()) {
+ return false;
+ }
+
+ if (!stationProtocol.isLoading()) {
+ return false;
+ }
+
+ if (stationProtocol.getError() <= 0) {
+ return true;//绔欑偣鏃犳晠闅�
+ }
+
+ if (!stationProtocol.isInBarcodeError()) {
+ return true;//绔欑偣鏃犲紓甯�
+ }
+
+ StationObjModel backStation = stationObjModel.getBackStation();
+ if (backStation == null || backStation.getStationId() == null) {
+ News.warn("鏉＄爜绔欓��鍥炲け璐ワ紝閫�鍥炵珯鏈厤缃�俤eviceNo={}锛宻tationId={}",
+ basDevp == null ? null : basDevp.getDevpNo(),
+ stationProtocol.getStationId());
+ return false;
+ }
+
+ // 褰撳墠绔欑偣宸茬粡鎸傜潃閫�鍥炵洰鏍囨椂锛屼笉鍐嶉噸澶嶇敓鎴愭柊鐨勯��鍥炲伐浣滃彿銆�
+ if (stationProtocol.getTaskNo() != null
+ && stationProtocol.getTaskNo() > 0
+ && backStation.getStationId().equals(stationProtocol.getTargetStaNo())) {
+ return false;
+ }
+
+ Integer lockTaskNo = stationProtocol.getTaskNo();
+ String lockKey = (lockTaskNo != null && lockTaskNo > 0)
+ ? RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + lockTaskNo
+ : RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + "station_" + stationProtocol.getStationId();
+ Object lock = redisUtil.get(lockKey);
if (lock != null) {
return false;
}
- StationObjModel backStation = stationObjModel.getBackStation();
StationCommand command = stationThread.getCommand(StationCommandType.MOVE,
commonService.getWorkNo(WrkIoType.STATION_BACK.id),
stationObjModel.getStationId(),
@@ -205,8 +239,8 @@
return false;
}
stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "gsl-process", "station-back");
- News.taskInfo(stationProtocol.getTaskNo(), "{}鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
- redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId(), "lock", 10);
+ News.taskInfo(stationProtocol.getTaskNo(), "鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
+ redisUtil.set(lockKey, "lock", 10);
return false;
}
--
Gitblit v1.9.1