From febc49cd36666823893c233667b212dfb5527dfb Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 四月 2026 09:38:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 58 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 247d6ee..3950d8b 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Component
public class StationOperateProcessUtils {
@@ -52,19 +53,9 @@
@Autowired
private BasCrnpService basCrnpService;
- //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- public synchronized void stationInExecute() {
- stationRegularDispatchProcessor.stationInExecute();
- }
-
// 鎵ц鍗曚釜绔欑偣鐨勫叆搴撲换鍔′笅鍙�
public void stationInExecute(BasDevp basDevp, StationObjModel stationObjModel) {
stationRegularDispatchProcessor.stationInExecute(basDevp, stationObjModel);
- }
-
- //鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void crnStationOutExecute() {
- stationOutboundDispatchProcessor.crnStationOutExecute();
}
// 鎵ц鍗曚釜鍑哄簱浠诲姟瀵瑰簲鐨勮緭閫佺珯鐐逛笅鍙�
@@ -72,9 +63,9 @@
stationOutboundDispatchProcessor.crnStationOutExecute(wrkMast);
}
- //鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
- public synchronized void dualCrnStationOutExecute() {
- stationOutboundDispatchProcessor.dualCrnStationOutExecute();
+ // 鎵ц鍗曚釜鍙屽伐浣嶅嚭搴撲换鍔″搴旂殑杈撻�佺珯鐐逛笅鍙�
+ public void dualCrnStationOutExecute(WrkMast wrkMast) {
+ stationOutboundDispatchProcessor.dualCrnStationOutExecute(wrkMast);
}
// 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀埌杈剧洰鏍囩珯鍙�
@@ -109,29 +100,14 @@
}
}
- // 妫�娴嬩换鍔¤浆瀹屾垚
- public void checkTaskToComplete() {
- stationRegularDispatchProcessor.checkTaskToComplete();
- }
-
// 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀彲浠ヨ浆瀹屾垚
public void checkTaskToComplete(WrkMast wrkMast) {
stationRegularDispatchProcessor.checkTaskToComplete(wrkMast);
}
- //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
- public void checkStationRunBlock() {
- stationRerouteProcessor.checkStationRunBlock();
- }
-
// 妫�娴嬪崟涓珯鐐规槸鍚﹁繍琛屽牭濉�
public void checkStationRunBlock(BasDevp basDevp, Integer stationId) {
stationRerouteProcessor.checkStationRunBlock(basDevp, stationId);
- }
-
- //妫�娴嬭緭閫佺珯鐐逛换鍔″仠鐣欒秴鏃跺悗閲嶆柊璁＄畻璺緞
- public void checkStationIdleRecover() {
- stationRerouteProcessor.checkStationIdleRecover();
}
// 妫�娴嬪崟涓珯鐐逛换鍔″仠鐣欒秴鏃跺悗鐨勬仮澶嶅鐞�
@@ -157,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();
}
// 鐩戞帶鍗曚釜缁曞湀绔欑偣
@@ -201,7 +167,9 @@
if (stationProtocol == null
|| !stationProtocol.isAutoing()
|| !stationProtocol.isLoading()
- || stationProtocol.getTaskNo() <= 0) {
+ || stationProtocol.getTaskNo() <= 0
+ || !stationProtocol.isInEnable()
+ ) {
continue;
}
mainProcessTaskSubmitter.submitKeyedSerialTask(
@@ -234,6 +202,29 @@
"crnStationOutExecute",
minIntervalMs,
() -> crnStationOutExecute(wrkMast)
+ );
+ }
+ }
+
+ 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)
);
}
}
@@ -421,6 +412,9 @@
if (stationId == null) {
continue;
}
+ if (!isIdleRecoverCandidateStation(basDevp, stationId)) {
+ continue;
+ }
if (!stationProtocol.isAutoing()
|| !stationProtocol.isLoading()
|| stationProtocol.getTaskNo() <= 0
@@ -458,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