From 9e7a6d4a099f039319c9a3647957fe6d4aa4ca21 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 09 四月 2026 22:52:10 +0800
Subject: [PATCH] #退回优化
---
src/main/java/com/zy/core/plugin/GslProcess.java | 183 +++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index f752a17..257c0af 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -3,9 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.WrkLastnoService;
import com.zy.common.service.CommonService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
@@ -23,7 +25,6 @@
import com.zy.core.plugin.store.StoreInTaskContext;
import com.zy.core.plugin.store.StoreInTaskGenerationService;
import com.zy.core.plugin.store.StoreInTaskPolicy;
-import com.zy.core.task.MainProcessAsyncTaskScheduler;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.CrnOperateProcessUtils;
import com.zy.core.utils.StationOperateProcessUtils;
@@ -37,12 +38,8 @@
@Slf4j
@Component
public class GslProcess implements MainProcessPluginApi, StoreInTaskPolicy {
- private static final String CRN_TASK_LANE = "crn";
- private static final String STATION_TASK_LANE = "station";
- private static final String GENERATE_STORE_TASK_LANE_PREFIX = "generate-store-";
private static final long DISPATCH_INTERVAL_MS = 200L;
private static final long MAINTENANCE_INTERVAL_MS = 500L;
- private static final long TASK_SLOW_LOG_THRESHOLD_MS = 1000L;
@Autowired
private CrnOperateProcessUtils crnOperateUtils;
@@ -55,11 +52,11 @@
@Autowired
private RedisUtil redisUtil;
@Autowired
+ private WrkLastnoService wrkLastnoService;
+ @Autowired
private StoreInTaskGenerationService storeInTaskGenerationService;
@Autowired
private StationCommandDispatcher stationCommandDispatcher;
- @Autowired
- private MainProcessAsyncTaskScheduler mainProcessAsyncTaskScheduler;
@Override
public void run() {
@@ -68,61 +65,28 @@
//璇锋眰鐢熸垚鍏ュ簱浠诲姟锛屼繚鐣欐寜绔欑偣 lane 涓茶鎻愪氦
generateStoreWrkFile();
- //鍫嗗灈鏈轰笌杈撻�佺珯鐐归兘鎸夊崟涓换鍔℃彁浜ゅ埌鍚勮嚜涓茶閫氶亾锛岄�愪釜鎵ц
- // 鍫嗗灈鏈烘墽琛屽叆鍑哄簱涓绘祦绋�
- submitCrnTask("crnIoExecute", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecute);
- // 鍫嗗灈鏈烘敹灏惧苟鎺ㄨ繘鍚庣画鐘舵��
- submitCrnTask("crnIoExecuteFinish", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecuteFinish);
- // 杈撻�佺嚎鎵ц鍏ュ簱浠诲姟涓嬪彂
- submitStationTask("stationInExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationInExecute);
+ // 鎵ц鍫嗗灈鏈轰换鍔�
+ crnOperateUtils.submitCrnIoTasks(DISPATCH_INTERVAL_MS);
+ // 鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
+ crnOperateUtils.submitCrnIoExecuteFinishTasks(DISPATCH_INTERVAL_MS);
+ // 鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
+ stationOperateProcessUtils.submitStationInTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬪叆搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ stationOperateProcessUtils.submitInboundStationArrivalTasks(DISPATCH_INTERVAL_MS);
// 杈撻�佺嚎鎵ц鍫嗗灈鏈哄嚭搴撳悗鐨勭珯鍙版祦杞�
- submitStationTask("crnStationOutExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::crnStationOutExecute);
- // 楂橀妫�娴嬪嚭搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
- submitStationTask("stationOutExecuteFinish", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationOutExecuteFinish);
- // 楂橀妫�娴嬪叆搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
- submitStationTask("scanInboundStationArrival", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::scanInboundStationArrival);
+ stationOperateProcessUtils.submitCrnStationOutTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬪嚭搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ stationOperateProcessUtils.submitStationOutExecuteFinishTasks(DISPATCH_INTERVAL_MS);
// 妫�娴嬬珯鍙拌繍琛屽畬鎴愬悗鐨勪换鍔¤浆瀹屾垚
- submitStationTask("checkTaskToComplete", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::checkTaskToComplete);
+ stationOperateProcessUtils.submitCheckTaskToCompleteTasks(DISPATCH_INTERVAL_MS);
// 妫�娴嬪苟澶勭悊鍑哄簱鎺掑簭
- submitStationTask("checkStationOutOrder", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationOutOrder);
- // 鐩戞帶杈撻�佺嚎缁曞湀绔欑偣
- submitStationTask("watchCircleStation", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::watchCircleStation);
+ stationOperateProcessUtils.submitCheckStationOutOrderTasks(MAINTENANCE_INTERVAL_MS);
+// // 鐩戞帶杈撻�佺嚎缁曞湀绔欑偣
+// stationOperateProcessUtils.submitWatchCircleStationTasks(MAINTENANCE_INTERVAL_MS);
// 妫�娴嬭緭閫佺嚎杩愯鍫靛
- submitStationTask("checkStationRunBlock", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationRunBlock);
- // 妫�娴嬬珯鍙扮┖闂茶秴鏃跺悗鐨勬仮澶嶅鐞�
- submitStationTask("checkStationIdleRecover", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationIdleRecover);
- }
-
- @Override
- public boolean matchCandidate(StoreInTaskContext context) {
- return canRequestStoreIn(context.getStationProtocol());
- }
-
- @Override
- public boolean beforeApply(StoreInTaskContext context) {
- StationProtocol stationProtocol = context.getStationProtocol();
- if (stationProtocol.getError() <= 0) {
- return true;
- }
-
- Object lock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId());
- if (lock != null) {
- return false;
- }
-
- StationObjModel backStation = context.getStationObjModel().getBackStation();
- StationCommand command = context.getStationThread().getCommand(StationCommandType.MOVE,
- commonService.getWorkNo(WrkIoType.STATION_BACK.id),
- context.getStationObjModel().getStationId(),
- backStation.getStationId(), 0);
- if (command == null) {
- News.taskInfo(stationProtocol.getTaskNo(), "{}宸ヤ綔,鑾峰彇杈撻�佺嚎鍛戒护澶辫触", stationProtocol.getTaskNo());
- return false;
- }
- stationCommandDispatcher.dispatch(context.getBasDevp().getDevpNo(), command, "gsl-process", "station-back");
- News.taskInfo(stationProtocol.getTaskNo(), "{}鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
- redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId(), "lock", 10);
- return true;
+ stationOperateProcessUtils.submitCheckStationRunBlockTasks(MAINTENANCE_INTERVAL_MS);
+// // 妫�娴嬬珯鍙扮┖闂茶秴鏃跺悗鐨勬仮澶嶅鐞�
+// stationOperateProcessUtils.submitCheckStationIdleRecoverTasks(MAINTENANCE_INTERVAL_MS);
}
@Override
@@ -178,15 +142,7 @@
}
}
- private void submitStationTask(String taskName, long minIntervalMs, Runnable task) {
- submitProcessTask(STATION_TASK_LANE, taskName, minIntervalMs, task);
- }
-
private void generateStoreWrkFile() {
- submitGenerateStoreTasks();
- }
-
- private void submitGenerateStoreTasks() {
List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
@@ -208,10 +164,13 @@
if (!stationMap.containsKey(stationId)) {
continue;
}
+ if (!handleErrorStationBack(basDevp, stationThread, stationObjModel, stationMap.get(stationId))) {
+ continue;
+ }
if (!canRequestStoreIn(stationMap.get(stationId))) {
continue;
}
- submitGenerateStoreTask(stationId, DISPATCH_INTERVAL_MS,
+ storeInTaskGenerationService.submitGenerateStoreTask(this, basDevp, stationObjModel, DISPATCH_INTERVAL_MS,
() -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
}
}
@@ -219,6 +178,7 @@
private boolean canRequestStoreIn(StationProtocol stationProtocol) {
return stationProtocol != null
+ && stationProtocol.getError() <= 0
&& stationProtocol.isAutoing()
&& stationProtocol.isLoading()
&& stationProtocol.isInEnable()
@@ -226,22 +186,83 @@
&& !Cools.isEmpty(stationProtocol.getBarcode());
}
- private void submitGenerateStoreTask(Integer stationId, long minIntervalMs, Runnable task) {
- submitProcessTask(GENERATE_STORE_TASK_LANE_PREFIX + stationId, "generateStoreWrkFile", minIntervalMs, task);
- }
+ private boolean handleErrorStationBack(BasDevp basDevp,
+ StationThread stationThread,
+ StationObjModel stationObjModel,
+ StationProtocol stationProtocol) {
+ if (stationProtocol == null) {
+ return false;
+ }
- private void submitCrnTask(String taskName, long minIntervalMs, Runnable task) {
- submitProcessTask(CRN_TASK_LANE, taskName, minIntervalMs, task);
- }
+ if (!stationProtocol.isAutoing()) {
+ return false;
+ }
- private void submitProcessTask(String laneName, String taskName, long minIntervalMs, Runnable task) {
- mainProcessAsyncTaskScheduler.submit(
- laneName,
- taskName,
- minIntervalMs,
- TASK_SLOW_LOG_THRESHOLD_MS,
- task
- );
+ if (!stationProtocol.isLoading()) {
+ return false;
+ }
+
+ if (stationProtocol.getError() <= 0) {
+ return true;//绔欑偣鏃犳晠闅�
+ }
+
+ if (!stationProtocol.isInBarcodeError()) {
+ return true;//绔欑偣鏃犲紓甯�
+ }
+
+ WrkLastno stationBackTaskRange = wrkLastnoService.getById(WrkIoType.STATION_BACK.id);
+ Integer currentTaskNo = stationProtocol.getTaskNo();
+ if (currentTaskNo != null
+ && currentTaskNo > 0
+ && stationBackTaskRange != null
+ && stationBackTaskRange.getsNo() != null
+ && stationBackTaskRange.geteNo() != null
+ && currentTaskNo >= stationBackTaskRange.getsNo()
+ && currentTaskNo <= stationBackTaskRange.geteNo()) {
+ News.info("鏉＄爜绔欏凡澶勪簬閫�鍥炲伐浣滃彿鑼冨洿锛岃烦杩囬噸澶嶇敓鎴愰��鍥炲懡浠ゃ�俿tationId={}锛宼askNo={}锛宺ange=[{}, {}]",
+ stationProtocol.getStationId(),
+ currentTaskNo,
+ stationBackTaskRange.getsNo(),
+ stationBackTaskRange.geteNo());
+ return false;
+ }
+
+ 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;
+ }
+
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE,
+ commonService.getWorkNo(WrkIoType.STATION_BACK.id),
+ stationObjModel.getStationId(),
+ backStation.getStationId(), 0);
+ if (command == null) {
+ News.taskInfo(stationProtocol.getTaskNo(), "{}宸ヤ綔,鑾峰彇杈撻�佺嚎鍛戒护澶辫触", stationProtocol.getTaskNo());
+ return false;
+ }
+ stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "gsl-process", "station-back");
+ News.taskInfo(stationProtocol.getTaskNo(), "鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
+ redisUtil.set(lockKey, "lock", 10);
+ return false;
}
}
--
Gitblit v1.9.1