From e4279da0f49517ada6e25a978e5df60f7c1e6997 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 四月 2026 09:45:51 +0800
Subject: [PATCH] #入库任务限制控制进输送
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 269 ++++++++++++++++++++++++++++-------------------------
1 files changed, 141 insertions(+), 128 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 0a9a7a3..3950d8b 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -1,13 +1,10 @@
package com.zy.core.utils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.BasStationService;
-import com.zy.asrs.service.WrkAnalysisService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -18,10 +15,7 @@
import com.zy.core.task.MainProcessLane;
import com.zy.core.task.MainProcessTaskSubmitter;
import com.zy.core.thread.StationThread;
-import com.zy.core.utils.station.StationDispatchLoadSupport;
-import com.zy.core.utils.station.StationOutboundDispatchProcessor;
-import com.zy.core.utils.station.StationRegularDispatchProcessor;
-import com.zy.core.utils.station.StationRerouteProcessor;
+import com.zy.core.utils.station.*;
import com.zy.core.utils.station.model.RerouteCommandPlan;
import com.zy.core.utils.station.model.RerouteContext;
import com.zy.core.utils.station.model.RerouteDecision;
@@ -32,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Component
public class StationOperateProcessUtils {
@@ -53,20 +48,14 @@
private StationRerouteProcessor stationRerouteProcessor;
@Autowired
private MainProcessTaskSubmitter mainProcessTaskSubmitter;
-
- //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- public synchronized void stationInExecute() {
- stationRegularDispatchProcessor.stationInExecute();
- }
+ @Autowired
+ private StationOutboundDecisionSupport stationOutboundDecisionSupport;
+ @Autowired
+ private BasCrnpService basCrnpService;
// 鎵ц鍗曚釜绔欑偣鐨勫叆搴撲换鍔′笅鍙�
public void stationInExecute(BasDevp basDevp, StationObjModel stationObjModel) {
stationRegularDispatchProcessor.stationInExecute(basDevp, stationObjModel);
- }
-
- //鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void crnStationOutExecute() {
- stationOutboundDispatchProcessor.crnStationOutExecute();
}
// 鎵ц鍗曚釜鍑哄簱浠诲姟瀵瑰簲鐨勮緭閫佺珯鐐逛笅鍙�
@@ -74,77 +63,35 @@
stationOutboundDispatchProcessor.crnStationOutExecute(wrkMast);
}
- //鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void dualCrnStationOutExecute() {
- stationOutboundDispatchProcessor.dualCrnStationOutExecute();
- }
-
- //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
- public synchronized void stationOutExecuteFinish() {
- stationRegularDispatchProcessor.stationOutExecuteFinish();
+ // 鎵ц鍗曚釜鍙屽伐浣嶅嚭搴撲换鍔″搴旂殑杈撻�佺珯鐐逛笅鍙�
+ public void dualCrnStationOutExecute(WrkMast wrkMast) {
+ stationOutboundDispatchProcessor.dualCrnStationOutExecute(wrkMast);
}
// 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀埌杈剧洰鏍囩珯鍙�
- public void stationOutExecuteFinish(WrkMast wrkMast) {
- stationRegularDispatchProcessor.stationOutExecuteFinish(wrkMast);
- }
-
- // 妫�娴嬪叆搴撲换鍔℃槸鍚﹀埌杈剧珯鍙板苟杞负绔欏彴杩愯瀹屾垚
- public synchronized void scanInboundStationArrival() {
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
- .eq("io_type", 1)
- .eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts)
- .isNotNull("sta_no"));
- for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast == null || wrkMast.getWrkNo() == null || wrkMast.getStaNo() == null) {
- continue;
- }
- BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>()
- .eq("station_id", wrkMast.getStaNo())
- .last("limit 1"));
- if (basStation == null || basStation.getDeviceNo() == null) {
- continue;
- }
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
- Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
- boolean arrived = stationProtocol != null
- && wrkMast.getWrkNo().equals(stationProtocol.getTaskNo())
- && stationProtocol.isLoading();
- if (!arrived && !stationThread.hasRecentArrival(basStation.getStationId(), wrkMast.getWrkNo())) {
- continue;
- }
- boolean updated = wrkAnalysisService.completeInboundStationRun(wrkMast, new Date());
- if (updated) {
- News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿鍛戒腑锛屽伐浣滃彿={}锛岀洰鏍囩珯={}", wrkMast.getWrkNo(), wrkMast.getStaNo());
- }
- }
+ public void stationOutExecuteFinish(StationObjModel stationObjModel) {
+ stationRegularDispatchProcessor.stationOutExecuteFinish(stationObjModel);
}
// 妫�娴嬪崟涓叆搴撲换鍔℃槸鍚﹀埌杈剧洰鏍囩珯鍙�
- public void scanInboundStationArrival(WrkMast wrkMast) {
- if (wrkMast == null || wrkMast.getWrkNo() == null || wrkMast.getStaNo() == null) {
+ public void scanInboundStationArrival(StationObjModel stationObjModel) {
+ if (stationObjModel == null) {
return;
}
- BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>()
- .eq("station_id", wrkMast.getStaNo())
- .last("limit 1"));
- if (basStation == null || basStation.getDeviceNo() == null) {
- return;
- }
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
if (stationThread == null) {
return;
}
Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
- boolean arrived = stationProtocol != null
- && wrkMast.getWrkNo().equals(stationProtocol.getTaskNo())
- && stationProtocol.isLoading();
- if (!arrived && !stationThread.hasRecentArrival(basStation.getStationId(), wrkMast.getWrkNo())) {
+ StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(stationObjModel.getStationId());
+ if (stationProtocol == null) {
+ return;
+ }
+ if (stationProtocol.getTaskNo() <= 0) {
+ return;
+ }
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
+ if (wrkMast == null) {
return;
}
boolean updated = wrkAnalysisService.completeInboundStationRun(wrkMast, new Date());
@@ -153,29 +100,14 @@
}
}
- // 妫�娴嬩换鍔¤浆瀹屾垚
- public synchronized void checkTaskToComplete() {
- stationRegularDispatchProcessor.checkTaskToComplete();
- }
-
// 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀彲浠ヨ浆瀹屾垚
public void checkTaskToComplete(WrkMast wrkMast) {
stationRegularDispatchProcessor.checkTaskToComplete(wrkMast);
}
- //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
- public synchronized void checkStationRunBlock() {
- stationRerouteProcessor.checkStationRunBlock();
- }
-
// 妫�娴嬪崟涓珯鐐规槸鍚﹁繍琛屽牭濉�
public void checkStationRunBlock(BasDevp basDevp, Integer stationId) {
stationRerouteProcessor.checkStationRunBlock(basDevp, stationId);
- }
-
- //妫�娴嬭緭閫佺珯鐐逛换鍔″仠鐣欒秴鏃跺悗閲嶆柊璁＄畻璺緞
- public synchronized void checkStationIdleRecover() {
- stationRerouteProcessor.checkStationIdleRecover();
}
// 妫�娴嬪崟涓珯鐐逛换鍔″仠鐣欒秴鏃跺悗鐨勬仮澶嶅鐞�
@@ -188,7 +120,7 @@
return stationDispatchLoadSupport.countCurrentStationTask();
}
- public synchronized int getCurrentOutboundTaskCountByTargetStation(Integer stationId) {
+ public int getCurrentOutboundTaskCountByTargetStation(Integer stationId) {
if (stationId == null) {
return 0;
}
@@ -201,19 +133,9 @@
WrkStsType.STATION_RUN.sts));
}
- // 妫�娴嬪嚭搴撴帓搴�
- public synchronized void checkStationOutOrder() {
- stationRerouteProcessor.checkStationOutOrder();
- }
-
// 妫�娴嬪崟涓珯鐐圭殑鍑哄簱鎺掑簭
public void checkStationOutOrder(BasDevp basDevp, StationObjModel stationObjModel) {
stationRerouteProcessor.checkStationOutOrder(basDevp, stationObjModel);
- }
-
- // 鐩戞帶缁曞湀绔欑偣
- public synchronized void watchCircleStation() {
- stationRerouteProcessor.watchCircleStation();
}
// 鐩戞帶鍗曚釜缁曞湀绔欑偣
@@ -245,7 +167,9 @@
if (stationProtocol == null
|| !stationProtocol.isAutoing()
|| !stationProtocol.isLoading()
- || stationProtocol.getTaskNo() <= 0) {
+ || stationProtocol.getTaskNo() <= 0
+ || !stationProtocol.isInEnable()
+ ) {
continue;
}
mainProcessTaskSubmitter.submitKeyedSerialTask(
@@ -282,22 +206,45 @@
}
}
+ public void submitDualCrnStationOutTasks(long minIntervalMs) {
+ submitDualCrnStationOutTasks(MainProcessLane.DUAL_STATION_OUT, minIntervalMs);
+ }
+
+ public void submitDualCrnStationOutTasks(MainProcessLane lane, long minIntervalMs) {
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
+ .eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
+ .isNotNull("dual_crn_no"));
+ for (WrkMast wrkMast : wrkMasts) {
+ Integer laneKey = wrkMast == null ? null : wrkMast.getSourceStaNo();
+ if (laneKey == null) {
+ laneKey = wrkMast == null ? null : wrkMast.getWrkNo();
+ }
+ mainProcessTaskSubmitter.submitKeyedSerialTask(
+ lane,
+ laneKey,
+ "dualCrnStationOutExecute",
+ minIntervalMs,
+ () -> dualCrnStationOutExecute(wrkMast)
+ );
+ }
+ }
+
public void submitStationOutExecuteFinishTasks(long minIntervalMs) {
submitStationOutExecuteFinishTasks(MainProcessLane.STATION_OUT_FINISH, minIntervalMs);
}
public void submitStationOutExecuteFinishTasks(MainProcessLane lane, long minIntervalMs) {
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
- .eq("wrk_sts", WrkStsType.STATION_RUN.sts)
- .isNotNull("sta_no"));
- for (WrkMast wrkMast : wrkMasts) {
- mainProcessTaskSubmitter.submitKeyedSerialTask(
- lane,
- wrkMast.getStaNo(),
- "stationOutExecuteFinish",
- minIntervalMs,
- () -> stationOutExecuteFinish(wrkMast)
- );
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
+ for (BasDevp basDevp : basDevps) {
+ for (StationObjModel stationObjModel : basDevp.getOutStationList$()) {
+ mainProcessTaskSubmitter.submitKeyedSerialTask(
+ lane,
+ stationObjModel.getStationId(),
+ "stationOutExecuteFinish",
+ minIntervalMs,
+ () -> stationOutExecuteFinish(stationObjModel)
+ );
+ }
}
}
@@ -306,18 +253,22 @@
}
public void submitInboundStationArrivalTasks(MainProcessLane lane, long minIntervalMs) {
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
- .eq("io_type", 1)
- .eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts)
- .isNotNull("sta_no"));
- for (WrkMast wrkMast : wrkMasts) {
- mainProcessTaskSubmitter.submitKeyedSerialTask(
- lane,
- wrkMast.getStaNo(),
- "scanInboundStationArrival",
- minIntervalMs,
- () -> scanInboundStationArrival(wrkMast)
- );
+ List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<>());
+ for (BasCrnp basCrnp : basCrnps) {
+ Integer crnNo = basCrnp == null ? null : basCrnp.getCrnNo();
+ if (crnNo == null) {
+ continue;
+ }
+
+ for (StationObjModel stationObjModel : basCrnp.getInStationList$()) {
+ mainProcessTaskSubmitter.submitKeyedSerialTask(
+ lane,
+ stationObjModel.getStationId(),
+ "scanInboundStationArrival",
+ minIntervalMs,
+ () -> scanInboundStationArrival(stationObjModel)
+ );
+ }
}
}
@@ -347,9 +298,24 @@
public void submitCheckStationOutOrderTasks(MainProcessLane lane, long minIntervalMs) {
List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+ if (stationThread == null) {
+ continue;
+ }
+
for (StationObjModel stationObjModel : basDevp.getOutOrderList$()) {
Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
if (stationId == null) {
+ continue;
+ }
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol stationProtocol = statusMap.get(stationId);
+ if (stationProtocol == null
+ || !stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || stationProtocol.isRunBlock()
+ || !stationProtocol.getStationId().equals(stationProtocol.getTargetStaNo())) {
continue;
}
mainProcessTaskSubmitter.submitKeyedSerialTask(
@@ -379,6 +345,13 @@
if (stationId == null) {
continue;
}
+ if (!stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || !stationOutboundDecisionSupport.isWatchingCircleArrival(stationProtocol.getTaskNo(), stationProtocol.getStationId())) {
+ continue;
+ }
+
mainProcessTaskSubmitter.submitKeyedSerialTask(
lane,
stationId,
@@ -406,6 +379,12 @@
if (stationId == null) {
continue;
}
+ if (!stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || !stationProtocol.isRunBlock()) {
+ continue;
+ }
mainProcessTaskSubmitter.submitKeyedSerialTask(
lane,
stationId,
@@ -431,6 +410,15 @@
for (StationProtocol stationProtocol : stationThread.getStatus()) {
Integer stationId = stationProtocol == null ? null : stationProtocol.getStationId();
if (stationId == null) {
+ continue;
+ }
+ if (!isIdleRecoverCandidateStation(basDevp, stationId)) {
+ continue;
+ }
+ if (!stationProtocol.isAutoing()
+ || !stationProtocol.isLoading()
+ || stationProtocol.getTaskNo() <= 0
+ || stationProtocol.isRunBlock()) {
continue;
}
mainProcessTaskSubmitter.submitKeyedSerialTask(
@@ -464,7 +452,32 @@
return stationRerouteProcessor.shouldUseRunBlockDirectReassign(wrkMast, stationId, runBlockReassignLocStationList);
}
+ public boolean isIdleRecoverCandidateStation(BasDevp basDevp, Integer stationId) {
+ if (basDevp == null || stationId == null) {
+ return false;
+ }
+ return !containsStation(basDevp.getBarcodeStationList$(), stationId)
+ && !containsStation(basDevp.getInStationList$(), stationId)
+ && !containsStation(basDevp.getOutStationList$(), stationId);
+ }
+
+ private boolean containsStation(List<StationObjModel> stationList, Integer stationId) {
+ if (stationList == null || stationList.isEmpty() || stationId == null) {
+ return false;
+ }
+ for (StationObjModel stationObjModel : stationList) {
+ if (stationObjModel != null && Objects.equals(stationObjModel.getStationId(), stationId)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private boolean shouldSkipIdleRecoverForRecentDispatch(Integer taskNo, Integer stationId) {
return stationRerouteProcessor.shouldSkipIdleRecoverForRecentDispatch(taskNo, stationId);
}
+
+ public void attemptClearTaskPath(StationThread stationThread, Integer taskNo) {
+ stationRegularDispatchProcessor.attemptClearTaskPath(stationThread, taskNo);
+ }
}
--
Gitblit v1.9.1