From 2d48eb3d32262cfbb21ec21debefa84d870fdff5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 11 四月 2026 12:34:12 +0800
Subject: [PATCH] #入库异常
---
src/main/java/com/zy/core/plugin/GslProcess.java | 72 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index e5e2034..3ca41cc 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -134,7 +134,25 @@
continue;//涓嶅睘浜庡叆搴撴ā寮�
}
- StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
+ //鍚姩鍏ュ簱锛屽垹闄ゆ潯鐮佺珯閫�鍥為檺鍒�
+ Integer backStationId = entity.getBarcodeStation().getStationId();
+ String lockKey = RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + backStationId;
+ if (redisUtil.hasKey(lockKey)) {
+ StationProtocol backStationProtocol = stationMap.get(backStationId);
+ if (backStationProtocol == null) {
+ continue;
+ }
+
+ if (backStationProtocol.isAutoing()
+ && !backStationProtocol.isLoading()
+ && stationProtocol.getTaskNo() == 0
+ ) {
+ //鏉＄爜绔欒嚜鍔ㄣ�佹棤鐗┿�佸伐浣滃彿0銆傚垹闄ゆ潯鐮佺珯閫�鍥為檺鍒�
+ redisUtil.del(lockKey);
+ }
+ }
+
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, backStationId, 0);
stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "gsl-process", "enable-in");
if (entity.getBarcodeStation() != null && entity.getBarcodeStation().getStationId() != null) {
Utils.precomputeInTaskEnableRow(entity.getBarcodeStation().getStationId());
@@ -171,23 +189,44 @@
if (!handleErrorStationBack(basDevp, stationThread, stationObjModel, stationMap.get(stationId))) {
continue;
}
- if (!canRequestStoreIn(stationMap.get(stationId))) {
+
+ StationProtocol stationProtocol = stationMap.get(stationId);
+ if (stationProtocol == null) {
continue;
}
+
+ if (!stationProtocol.isAutoing()) {
+ continue;
+ }
+
+ if (!stationProtocol.isLoading()) {
+ continue;
+ }
+
+ if (!stationProtocol.isInEnable()) {
+ continue;
+ }
+
+ if (stationProtocol.getTaskNo() == 0) {
+ continue;
+ }
+
+ if (Cools.isEmpty(stationProtocol.getBarcode())) {
+ continue;
+ }
+
+ if (stationProtocol.getError() > 0) {
+ continue;
+ }
+
+ if (stationProtocol.isInBarcodeError()) {
+ continue;
+ }
+
storeInTaskGenerationService.submitGenerateStoreTask(this, basDevp, stationObjModel, DISPATCH_INTERVAL_MS,
() -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
}
}
- }
-
- private boolean canRequestStoreIn(StationProtocol stationProtocol) {
- return stationProtocol != null
- && stationProtocol.getError() <= 0
- && stationProtocol.isAutoing()
- && stationProtocol.isLoading()
- && stationProtocol.isInEnable()
- && stationProtocol.getTaskNo() > 0
- && !Cools.isEmpty(stationProtocol.getBarcode());
}
private boolean handleErrorStationBack(BasDevp basDevp,
@@ -246,10 +285,7 @@
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();
+ String lockKey = RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId();
Object lock = redisUtil.get(lockKey);
if (lock != null) {
return false;
@@ -264,8 +300,8 @@
return false;
}
stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "gsl-process", "station-back");
- News.taskInfo(stationProtocol.getTaskNo(), "鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
- redisUtil.set(lockKey, "lock", 10);
+ News.info("{}鎵爜绔欏紓甯革紝宸查��鍥炶嚦{},鏉＄爜绔欑姸鎬侊細{}", stationProtocol.getTaskNo(), backStation.getStationId(), JSON.toJSONString(stationProtocol));
+ redisUtil.set(lockKey, "lock", 60 * 60);
return false;
}
--
Gitblit v1.9.1