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 | 84 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index ebc4bdf..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;
@@ -34,10 +33,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Slf4j
@Component
@@ -85,6 +81,8 @@
//涓婃姤鍫嗗灈鏈篋B110鐘舵�佹暟鎹�
reportDb110();
+ //璺ㄥ尯鍏ュ簱浠诲姟涓嬪彂锛屼慨鏀圭珯鐐逛换鍔″彿涓哄叆搴撲换鍔″彿
+ taskToNewAreaInTaskStationSend();
}
/**
@@ -212,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);
@@ -306,15 +305,76 @@
}
}
- 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));
}
}
+ //璺ㄥ尯鍏ュ簱浠诲姟涓嬪彂锛屼慨鏀圭珯鐐逛换鍔″彿涓哄叆搴撲换鍔″彿
+ public synchronized void taskToNewAreaInTaskStationSend() {
+ Set<String> list = redisUtil.searchKeys(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK.key);
+ for (String key : list) {
+ Object dataStr = redisUtil.get(key);
+ if (dataStr == null) {
+ continue;
+ }
+
+ JSONObject data = JSON.parseObject(dataStr.toString());
+ Integer oldTaskNo = data.getInteger("oldTaskNo");
+ Integer newTaskNo = data.getInteger("newTaskNo");
+ StationCommand command = data.getObject("command", StationCommand.class);
+ Integer stationId = data.getInteger("stationId");
+ Integer deviceNo = data.getInteger("deviceNo");
+
+ Object lock = redisUtil.get(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId);
+ if(lock != null){
+ continue;
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, deviceNo);
+ if(stationThread == null){
+ continue;
+ }
+
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol stationProtocol = statusMap.get(stationId);
+ if(stationProtocol == null){
+ continue;
+ }
+
+ if (!stationProtocol.isAutoing()) {
+ continue;
+ }
+
+ if (!stationProtocol.isLoading()) {
+ continue;
+ }
+
+ if (stationProtocol.getTaskNo() == 0) {
+ continue;
+ }
+
+ if (!stationProtocol.getTaskNo().equals(oldTaskNo)) {
+ //鍜岀紦瀛樺懡浠や笉鐩稿悓鍒犻櫎
+ redisUtil.del(key);
+ continue;
+ }
+
+ //缂撳瓨鍛戒护鐩稿悓锛屼笅鍙戝懡浠ゆ敼鍙樺叆搴撲换鍔″彿淇℃伅
+ MessageQueue.offer(SlaveType.Devp, deviceNo, new Task(2, command));
+ redisUtil.set(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId, "lock", 5);
+ }
+
+ }
+
}
--
Gitblit v1.9.1