From c34f9c17fde14f78b3663803e9776d438e8481b9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 三月 2026 22:30:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 138 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 8d51557..040a5c6 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;
@@ -36,7 +37,7 @@
@Component
public class StationOperateProcessUtils {
private static final int LOOP_LOAD_RESERVE_EXPIRE_SECONDS = 120;
- private static final int OUT_ORDER_DISPATCH_LIMIT_SECONDS = 10;
+ private static final int OUT_ORDER_DISPATCH_LIMIT_SECONDS = 2;
private static final int STATION_IDLE_RECOVER_SECONDS = 10;
private static final int STATION_IDLE_RECOVER_LIMIT_SECONDS = 10;
private static final int STATION_IDLE_TRACK_EXPIRE_SECONDS = 60 * 60;
@@ -67,6 +68,8 @@
private StationPathPolicyService stationPathPolicyService;
@Autowired
private BasStationOptService basStationOptService;
+ @Autowired
+ private StationTaskLoopService stationTaskLoopService;
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
public synchronized void stationInExecute() {
@@ -312,39 +315,45 @@
for (WrkMast wrkMast : wrkMasts) {
Integer wrkNo = wrkMast.getWrkNo();
Integer targetStaNo = wrkMast.getStaNo();
+ if (wrkNo == null || targetStaNo == null) {
+ continue;
+ }
boolean complete = false;
+ Integer targetDeviceNo = null;
BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", targetStaNo));
- if (basStation == null) {
- continue;
- }
-
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
-
- Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap.get(basStation.getStationId());
- if (stationProtocol == null) {
- continue;
- }
-
- if (stationProtocol.getTaskNo().equals(wrkNo)) {
- complete = true;
+ if (basStation != null) {
+ targetDeviceNo = basStation.getDeviceNo();
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
+ if (stationThread != null) {
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol stationProtocol = statusMap.get(basStation.getStationId());
+ if (stationProtocol != null && wrkNo.equals(stationProtocol.getTaskNo())) {
+ complete = true;
+ }
+ }
}
if (complete) {
- wrkMast.setWrkSts(WrkStsType.STATION_RUN_COMPLETE.sts);
- wrkMast.setIoTime(new Date());
- wrkMastService.updateById(wrkMast);
- notifyUtils.notify(String.valueOf(SlaveType.Devp), basStation.getDeviceNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.STATION_OUT_TASK_RUN_COMPLETE, null);
- redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
+ completeStationRunTask(wrkMast, targetDeviceNo);
}
}
} catch (Exception e) {
e.printStackTrace();
}
+ }
+
+ private void completeStationRunTask(WrkMast wrkMast, Integer deviceNo) {
+ if (wrkMast == null || wrkMast.getWrkNo() == null) {
+ return;
+ }
+ wrkMast.setWrkSts(WrkStsType.STATION_RUN_COMPLETE.sts);
+ wrkMast.setIoTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ if (deviceNo != null) {
+ notifyUtils.notify(String.valueOf(SlaveType.Devp), deviceNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.STATION_OUT_TASK_RUN_COMPLETE, null);
+ }
+ redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
}
// 妫�娴嬩换鍔¤浆瀹屾垚
@@ -580,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>());
@@ -753,11 +775,7 @@
if (!Objects.equals(dispatchStationId, wrkMast.getStaNo())
&& isCurrentOutOrderStation(currentStationId, outOrderStationIds)
&& isWatchingCircleArrival(wrkMast.getWrkNo(), currentStationId)) {
- Integer circleTarget = resolveNextCircleOrderTarget(currentStationId, outOrderStationIds);
- if (circleTarget == null) {
- return null;
- }
- return new OutOrderDispatchDecision(circleTarget, true);
+ return new OutOrderDispatchDecision(dispatchStationId, true, null, false);
}
return new OutOrderDispatchDecision(dispatchStationId, false);
}
@@ -808,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) {
@@ -867,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,
@@ -953,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<Integer> reachableStationIdList = new ArrayList<>();
for (int offset = 1; offset < total; offset++) {
int candidateIndex = (startIndex + offset + total) % total;
Integer candidateStationId = orderedOutStationList.get(candidateIndex);
@@ -969,11 +1035,29 @@
try {
List<NavigateNode> path = navigateUtils.calcByStationId(currentStationId, candidateStationId);
if (path != null && !path.isEmpty()) {
- return candidateStationId;
+ reachableStationIdList.add(candidateStationId);
}
} catch (Exception ignore) {}
}
- return null;
+ if (reachableStationIdList.isEmpty()) {
+ return null;
+ }
+ int gradualIndex = resolveGradualCircleTargetIndex(expectedLoopIssueCount, reachableStationIdList.size());
+ return reachableStationIdList.get(gradualIndex);
+ }
+
+ private int resolveGradualCircleTargetIndex(Integer expectedLoopIssueCount, int candidateCount) {
+ if (candidateCount <= 1) {
+ return 0;
+ }
+ if (expectedLoopIssueCount == null || expectedLoopIssueCount <= 2) {
+ return 0;
+ }
+ int gradualIndex = expectedLoopIssueCount - 2;
+ if (gradualIndex < 1) {
+ gradualIndex = 1;
+ }
+ return Math.min(gradualIndex, candidateCount - 1);
}
private boolean tryAcquireOutOrderDispatchLock(Integer wrkNo, Integer stationId) {
@@ -1408,10 +1492,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() {
@@ -1421,6 +1516,14 @@
private boolean isCircle() {
return circle;
}
+
+ private StationTaskLoopService.LoopEvaluation getLoopEvaluation() {
+ return loopEvaluation;
+ }
+
+ private boolean shouldCountLoopIssue() {
+ return countLoopIssue;
+ }
}
private void saveLoopLoadReserve(Integer wrkNo, LoopHitResult loopHitResult) {
--
Gitblit v1.9.1