From d07e0c1a8961b61557de3812450ddfd227f773de Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 三月 2026 22:36:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 164 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 485ef91..8c5fed5 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -27,6 +27,7 @@
import com.zy.core.model.Task;
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
+import com.zy.core.service.StationTaskLoopService;
import com.zy.core.thread.StationThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -67,6 +68,8 @@
private StationPathPolicyService stationPathPolicyService;
@Autowired
private BasStationOptService basStationOptService;
+ @Autowired
+ private StationTaskLoopService stationTaskLoopService;
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
public synchronized void stationInExecute() {
@@ -586,6 +589,19 @@
return countCurrentStationTask();
}
+ public synchronized int getCurrentOutboundTaskCountByTargetStation(Integer stationId) {
+ if (stationId == null) {
+ return 0;
+ }
+ return (int) wrkMastService.count(new QueryWrapper<WrkMast>()
+ .eq("io_type", WrkIoType.OUT.id)
+ .eq("sta_no", stationId)
+ .in("wrk_sts",
+ WrkStsType.OUTBOUND_RUN.sts,
+ WrkStsType.OUTBOUND_RUN_COMPLETE.sts,
+ WrkStsType.STATION_RUN.sts));
+ }
+
// 妫�娴嬪嚭搴撴帓搴�
public synchronized void checkStationOutOrder() {
List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
@@ -759,7 +775,7 @@
if (!Objects.equals(dispatchStationId, wrkMast.getStaNo())
&& isCurrentOutOrderStation(currentStationId, outOrderStationIds)
&& isWatchingCircleArrival(wrkMast.getWrkNo(), currentStationId)) {
- return new OutOrderDispatchDecision(dispatchStationId, true);
+ return new OutOrderDispatchDecision(dispatchStationId, true, null, false);
}
return new OutOrderDispatchDecision(dispatchStationId, false);
}
@@ -810,20 +826,38 @@
if (hasReachableOutReleaseSlot(currentStationId, wrkMast.getStaNo())) {
return new OutOrderDispatchDecision(wrkMast.getStaNo(), false);
}
- Integer circleTarget = resolveNextCircleOrderTarget(currentStationId, outOrderStationIds);
+ StationTaskLoopService.LoopEvaluation loopEvaluation = evaluateOutOrderLoop(
+ wrkMast.getWrkNo(),
+ currentStationId,
+ outOrderStationIds
+ );
+ Integer circleTarget = resolveNextCircleOrderTarget(
+ currentStationId,
+ outOrderStationIds,
+ loopEvaluation.getExpectedLoopIssueCount()
+ );
if (circleTarget == null) {
News.taskInfo(wrkMast.getWrkNo(), "鐩爣绔欏綋鍓嶄笉鍙繘锛屼笖鏈壘鍒板彲鎵ц鐨勪笅涓�鎺掑簭妫�娴嬬偣锛屽綋鍓嶇珯鐐�={}", currentStationId);
return null;
}
- return new OutOrderDispatchDecision(circleTarget, true);
+ return new OutOrderDispatchDecision(circleTarget, true, loopEvaluation, true);
}
- Integer circleTarget = resolveNextCircleOrderTarget(currentStationId, outOrderStationIds);
+ StationTaskLoopService.LoopEvaluation loopEvaluation = evaluateOutOrderLoop(
+ wrkMast.getWrkNo(),
+ currentStationId,
+ outOrderStationIds
+ );
+ Integer circleTarget = resolveNextCircleOrderTarget(
+ currentStationId,
+ outOrderStationIds,
+ loopEvaluation.getExpectedLoopIssueCount()
+ );
if (circleTarget == null) {
News.taskInfo(wrkMast.getWrkNo(), "鏈壘鍒板彲鎵ц鐨勪笅涓�鎺掑簭妫�娴嬬偣锛屽綋鍓嶇珯鐐�={}", currentStationId);
return null;
}
- return new OutOrderDispatchDecision(circleTarget, true);
+ return new OutOrderDispatchDecision(circleTarget, true, loopEvaluation, true);
}
private boolean shouldApplyOutOrder(WrkMast wrkMast, List<Integer> outOrderStationIds) {
@@ -869,9 +903,36 @@
}
if (dispatchDecision.isCircle()) {
saveWatchCircleCommand(wrkMast.getWrkNo(), command);
+ if (dispatchDecision.shouldCountLoopIssue()
+ && stationTaskLoopService != null
+ && dispatchDecision.getLoopEvaluation() != null) {
+ stationTaskLoopService.recordLoopIssue(dispatchDecision.getLoopEvaluation(), "OUT_ORDER_CIRCLE");
+ }
} else {
clearWatchCircleCommand(wrkMast.getWrkNo());
}
+ }
+
+ private StationTaskLoopService.LoopEvaluation evaluateOutOrderLoop(Integer taskNo,
+ Integer currentStationId,
+ List<Integer> outOrderStationIds) {
+ if (stationTaskLoopService == null) {
+ return new StationTaskLoopService.LoopEvaluation(
+ taskNo,
+ currentStationId,
+ StationTaskLoopService.LoopIdentitySnapshot.empty(),
+ 0,
+ 0,
+ false
+ );
+ }
+ return stationTaskLoopService.evaluateLoop(
+ taskNo,
+ currentStationId,
+ true,
+ outOrderStationIds,
+ "outOrderCircle"
+ );
}
private Integer resolveDispatchOutOrderTarget(Integer sourceStationId,
@@ -955,13 +1016,16 @@
|| (stationProtocol.getTaskNo() != null && stationProtocol.getTaskNo() > 0);
}
- private Integer resolveNextCircleOrderTarget(Integer currentStationId, List<Integer> orderedOutStationList) {
+ private Integer resolveNextCircleOrderTarget(Integer currentStationId,
+ List<Integer> orderedOutStationList,
+ Integer expectedLoopIssueCount) {
if (currentStationId == null || orderedOutStationList == null || orderedOutStationList.size() <= 1) {
return null;
}
int startIndex = orderedOutStationList.indexOf(currentStationId);
int total = orderedOutStationList.size();
+ List<CircleTargetCandidate> candidateList = new ArrayList<>();
for (int offset = 1; offset < total; offset++) {
int candidateIndex = (startIndex + offset + total) % total;
Integer candidateStationId = orderedOutStationList.get(candidateIndex);
@@ -971,11 +1035,60 @@
try {
List<NavigateNode> path = navigateUtils.calcByStationId(currentStationId, candidateStationId);
if (path != null && !path.isEmpty()) {
- return candidateStationId;
+ candidateList.add(new CircleTargetCandidate(candidateStationId, path.size(), offset));
}
} catch (Exception ignore) {}
}
- return null;
+ if (candidateList.isEmpty()) {
+ return null;
+ }
+ candidateList.sort(new Comparator<CircleTargetCandidate>() {
+ @Override
+ public int compare(CircleTargetCandidate left, CircleTargetCandidate right) {
+ if (left == right) {
+ return 0;
+ }
+ if (left == null) {
+ return 1;
+ }
+ if (right == null) {
+ return -1;
+ }
+ int pathCompare = Integer.compare(left.getPathLength(), right.getPathLength());
+ if (pathCompare != 0) {
+ return pathCompare;
+ }
+ return Integer.compare(left.getOffset(), right.getOffset());
+ }
+ });
+ return resolveGradualCircleTargetByPathLength(expectedLoopIssueCount, candidateList);
+ }
+
+ private Integer resolveGradualCircleTargetByPathLength(Integer expectedLoopIssueCount,
+ List<CircleTargetCandidate> candidateList) {
+ if (candidateList == null || candidateList.isEmpty()) {
+ return null;
+ }
+ if (expectedLoopIssueCount == null || expectedLoopIssueCount <= 2) {
+ return candidateList.get(0).getStationId();
+ }
+
+ List<CircleTargetCandidate> tierList = new ArrayList<>();
+ Integer lastPathLength = null;
+ for (CircleTargetCandidate candidate : candidateList) {
+ if (candidate == null) {
+ continue;
+ }
+ if (lastPathLength == null || !Objects.equals(lastPathLength, candidate.getPathLength())) {
+ tierList.add(candidate);
+ lastPathLength = candidate.getPathLength();
+ }
+ }
+ if (tierList.isEmpty()) {
+ return candidateList.get(0).getStationId();
+ }
+ int tierIndex = Math.min(expectedLoopIssueCount - 2, tierList.size() - 1);
+ return tierList.get(tierIndex).getStationId();
}
private boolean tryAcquireOutOrderDispatchLock(Integer wrkNo, Integer stationId) {
@@ -1410,10 +1523,21 @@
private static class OutOrderDispatchDecision {
private final Integer targetStationId;
private final boolean circle;
+ private final StationTaskLoopService.LoopEvaluation loopEvaluation;
+ private final boolean countLoopIssue;
private OutOrderDispatchDecision(Integer targetStationId, boolean circle) {
+ this(targetStationId, circle, null, false);
+ }
+
+ private OutOrderDispatchDecision(Integer targetStationId,
+ boolean circle,
+ StationTaskLoopService.LoopEvaluation loopEvaluation,
+ boolean countLoopIssue) {
this.targetStationId = targetStationId;
this.circle = circle;
+ this.loopEvaluation = loopEvaluation;
+ this.countLoopIssue = countLoopIssue;
}
private Integer getTargetStationId() {
@@ -1423,6 +1547,38 @@
private boolean isCircle() {
return circle;
}
+
+ private StationTaskLoopService.LoopEvaluation getLoopEvaluation() {
+ return loopEvaluation;
+ }
+
+ private boolean shouldCountLoopIssue() {
+ return countLoopIssue;
+ }
+ }
+
+ private static class CircleTargetCandidate {
+ private final Integer stationId;
+ private final Integer pathLength;
+ private final Integer offset;
+
+ private CircleTargetCandidate(Integer stationId, Integer pathLength, Integer offset) {
+ this.stationId = stationId;
+ this.pathLength = pathLength == null ? 0 : pathLength;
+ this.offset = offset == null ? 0 : offset;
+ }
+
+ private Integer getStationId() {
+ return stationId;
+ }
+
+ private Integer getPathLength() {
+ return pathLength;
+ }
+
+ private Integer getOffset() {
+ return offset;
+ }
}
private void saveLoopLoadReserve(Integer wrkNo, LoopHitResult loopHitResult) {
--
Gitblit v1.9.1