From a5e0d72c0a71f795e56690879a560ce715fa6313 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 20 三月 2026 08:54:01 +0800
Subject: [PATCH] 入库口强制入库确认后还会退回一次，才可入库修复
---
src/main/java/com/zy/core/plugin/NormalProcess.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 5973403..a3d4b6e 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.SpringUtils;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
@@ -211,6 +210,7 @@
StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO,
9991, 1015, 1013, 0);
MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ wmsOperateUtils.clearAsyncInTaskCache(barcode, stationIdVal);
// 鎺ュ彛杩斿洖闈�200锛岄噸鏂板彂璧疯姹�
News.error("WMS鍏ュ簱鎺ュ彛杩斿洖闈�200锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}", barcode,
stationIdVal, response);
@@ -305,14 +305,18 @@
}
}
- try {
- WmsOperateUtils wmsOperateUtils = SpringUtils.getBean(WmsOperateUtils.class);
- if (wmsOperateUtils != null) {
- wmsOperateUtils.reportCrnDb110Status(crnProtocol.getCrnNo(), currentIndices);
- }
- } catch (Exception e) {
- log.error("Report Crn Db110 Status Fail", e);
+ if (currentIndices.isEmpty()) {
+ continue;
}
+
+ String reportLockKey = RedisKeyType.REPORT_CRN_DB110_STATUS_LIMIT.key + crnProtocol.getCrnNo();
+ if (redisUtil.get(reportLockKey) != null) {
+ continue;
+ }
+
+ long reportLockSeconds = Math.max(60L, currentIndices.size() * 35L);
+ redisUtil.set(reportLockKey, "lock", reportLockSeconds);
+ wmsOperateUtils.reportCrnDb110StatusAsync(crnProtocol.getCrnNo(), new ArrayList<>(currentIndices));
}
}
@@ -332,7 +336,7 @@
Integer stationId = data.getInteger("stationId");
Integer deviceNo = data.getInteger("deviceNo");
- Object lock = redisUtil.get(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT.key + stationId);
+ Object lock = redisUtil.get(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId);
if(lock != null){
continue;
}
@@ -368,7 +372,7 @@
//缂撳瓨鍛戒护鐩稿悓锛屼笅鍙戝懡浠ゆ敼鍙樺叆搴撲换鍔″彿淇℃伅
MessageQueue.offer(SlaveType.Devp, deviceNo, new Task(2, command));
- redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT.key + stationId, "lock", 5);
+ redisUtil.set(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId, "lock", 5);
}
}
--
Gitblit v1.9.1