From 3abf837adf14f12819f43b20795584b684a97957 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 四月 2026 13:15:00 +0800
Subject: [PATCH] #启动入库优化
---
src/main/java/com/zy/core/plugin/GslProcess.java | 73 +-----------------------------------
1 files changed, 2 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index 5b469a4..dfd2d5f 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -4,7 +4,6 @@
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;
@@ -60,8 +59,8 @@
@Override
public void run() {
- //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
- checkInStationHasTask();
+ //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞舵寜绔欑偣 lane 寮傛鍚姩鍏ュ簱
+ stationOperateProcessUtils.submitStationEnableInTasks(DISPATCH_INTERVAL_MS);
//璇锋眰鐢熸垚鍏ュ簱浠诲姟锛屼繚鐣欐寜绔欑偣 lane 涓茶鎻愪氦
generateStoreWrkFile();
@@ -90,74 +89,6 @@
InTaskApplyRequest request = StoreInTaskPolicy.super.buildApplyRequest(context);
request.getExtraParams().put("weight", context.getStationProtocol().getWeight());
return request;
- }
-
- //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
- private synchronized void checkInStationHasTask() {
- List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
- for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if(stationThread == null){
- continue;
- }
-
- Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
-
- List<StationObjModel> list = basDevp.getInStationList$();
- for (StationObjModel entity : list) {
- Integer stationId = entity.getStationId();
- if(!stationMap.containsKey(stationId)){
- continue;
- }
-
- StationProtocol stationProtocol = stationMap.get(stationId);
- if (stationProtocol == null) {
- continue;
- }
-
- Object lock = redisUtil.get(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId);
- if(lock != null){
- continue;
- }
-
- //婊¤冻鑷姩銆佹棤鐗┿�佸伐浣滃彿0锛岀敓鎴愬叆搴撴暟鎹�
- if (stationProtocol.isAutoing()
- && stationProtocol.isLoading()
- && stationProtocol.getTaskNo() == 0
- && stationProtocol.isEnableIn()
- ) {
- if (stationProtocol.getIoMode() != 1) {
- continue;//涓嶅睘浜庡叆搴撴ā寮�
- }
-
- //鍚姩鍏ュ簱锛屽垹闄ゆ潯鐮佺珯閫�鍥為檺鍒�
- 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());
- }
- redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
- News.info("{}绔欑偣鍚姩鍏ュ簱鎴愬姛锛屾暟鎹寘:{}", stationId, JSON.toJSONString(command));
- }
- }
- }
}
private void generateStoreWrkFile() {
--
Gitblit v1.9.1