From 3441d5d4e8f06a97768ef4aec76f1161a77a52fe Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 四月 2026 16:30:26 +0800
Subject: [PATCH] #入库退回检查封装
---
src/main/java/com/zy/core/plugin/XiaosongProcess.java | 67 ---------------------------------
1 files changed, 0 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/XiaosongProcess.java b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
index e3f6fa6..74a2eee 100644
--- a/src/main/java/com/zy/core/plugin/XiaosongProcess.java
+++ b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
@@ -1,20 +1,11 @@
package com.zy.core.plugin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.zy.common.service.CommonService;
-import com.zy.common.utils.RedisUtil;
-import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.dispatch.StationCommandDispatcher;
-import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
-import com.zy.core.enums.StationCommandType;
-import com.zy.core.enums.WrkIoType;
import com.zy.core.model.StationObjModel;
-import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.plugin.api.MainProcessPluginApi;
import com.zy.core.plugin.store.StoreInTaskGenerationService;
@@ -40,17 +31,11 @@
@Autowired
private StationOperateProcessUtils stationOperateProcessUtils;
@Autowired
- private CommonService commonService;
- @Autowired
private BasDevpService basDevpService;
- @Autowired
- private RedisUtil redisUtil;
@Autowired
private DualCrnOperateProcessUtils dualCrnOperateProcessUtils;
@Autowired
private StoreInTaskGenerationService storeInTaskGenerationService;
- @Autowired
- private StationCommandDispatcher stationCommandDispatcher;
@Override
public void run() {
@@ -106,62 +91,10 @@
continue;
}
- StationProtocol stationProtocol = stationMap.get(stationId);
- if (!canSubmitGenerateStoreTask(basDevp, stationThread, stationObjModel, stationProtocol)) {
- continue;
- }
-
storeInTaskGenerationService.submitGenerateStoreTask(this, basDevp, stationObjModel, 0L,
() -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
}
}
- }
-
- private boolean canSubmitGenerateStoreTask(BasDevp basDevp,
- StationThread stationThread,
- StationObjModel stationObjModel,
- StationProtocol stationProtocol) {
- if (!handleErrorStationBack(basDevp, stationThread, stationObjModel, stationProtocol)) {
- return false;
- }
- return canRequestStoreIn(stationProtocol);
- }
-
- 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,
- StationThread stationThread,
- StationObjModel stationObjModel,
- StationProtocol stationProtocol) {
- if (stationProtocol.getError() <= 0) {
- return true;
- }
-
- Object lock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getTaskNo());
- if (lock != null) {
- return false;
- }
- StationObjModel backStation = stationObjModel.getBackStation();
- 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, "xiaosong-process", "station-back");
- News.taskInfo(stationProtocol.getTaskNo(), "{}鎵爜寮傚父锛屽凡閫�鍥炶嚦{}", backStation.getStationId());
- redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getTaskNo(), "lock", 10);
- return false;
}
}
--
Gitblit v1.9.1