From a0b49b0d11220c7fefcbe0ca0e938827c16edae4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 19:09:18 +0800
Subject: [PATCH] #预调度堆垛机2
---
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 73 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 21f433e..889589e 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -385,7 +385,7 @@
return false;
}
- if (!allowBatchOutboundExecute(wrkMast)) {
+ if (!allowBatchOutboundExecute(wrkMast, true)) {
return false;
}
@@ -458,13 +458,19 @@
return false;
}
- private boolean allowBatchOutboundExecute(WrkMast wrkMast) {
+ public boolean canOutboundTaskExecuteInCurrentBatchWindow(WrkMast wrkMast) {
+ return allowBatchOutboundExecute(wrkMast, false);
+ }
+
+ private boolean allowBatchOutboundExecute(WrkMast wrkMast, boolean logBlockedReason) {
if (wrkMast == null || Cools.isEmpty(wrkMast.getBatch())) {
return true;
}
if (Cools.isEmpty(wrkMast.getBatchSeq())) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 缂哄皯鎵规搴忓彿锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 缂哄皯鎵规搴忓彿锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ }
return false;
}
@@ -479,7 +485,9 @@
}
if (Cools.isEmpty(firstBatchWrkMast.getBatchSeq())) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑浠诲姟锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑浠诲姟锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱", wrkMast.getBatch());
+ }
return false;
}
@@ -487,7 +495,9 @@
boolean firstBatchTaskExecuted = firstBatchWrkMast.getWrkSts() != null
&& !firstBatchWrkMast.getWrkSts().equals(WrkStsType.NEW_OUTBOUND.sts);
if (!currentIsFirstBatchTask && !firstBatchTaskExecuted) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 棣栦釜搴忓彿浠诲姟:{} 灏氭湭鎵ц锛屽綋鍓嶄换鍔℃殏涓嶅厑璁稿嚭搴�", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 棣栦釜搴忓彿浠诲姟:{} 灏氭湭鎵ц锛屽綋鍓嶄换鍔℃殏涓嶅厑璁稿嚭搴�", wrkMast.getBatch(), firstBatchWrkMast.getWrkNo());
+ }
return false;
}
@@ -498,19 +508,24 @@
List<WrkMast> unfinishedBatchWrkMasts = listUnfinishedBatchWrkMasts(wrkMast.getBatch());
if (hasMissingBatchSeq(unfinishedBatchWrkMasts)) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑鏈畬鎴愪换鍔★紝鏆備笉鍏佽鍫嗗灈鏈哄嚭搴�", wrkMast.getBatch());
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 瀛樺湪鏈厤缃壒娆″簭鍙风殑鏈畬鎴愪换鍔★紝鏆備笉鍏佽鍫嗗灈鏈哄嚭搴�", wrkMast.getBatch());
+ }
return false;
}
if (!isWithinBatchExecuteWindow(wrkMast, unfinishedBatchWrkMasts, batchRunningLimit)) {
- Integer windowStartSeq = unfinishedBatchWrkMasts.get(0).getBatchSeq();
- Integer windowEndSeq = unfinishedBatchWrkMasts.get(Math.min(batchRunningLimit, unfinishedBatchWrkMasts.size()) - 1).getBatchSeq();
- News.taskInfo(wrkMast.getWrkNo(),
- "鎵规:{} 褰撳墠涓ユ牸鎵ц绐楀彛搴忓彿涓篬{}-{}]锛屽綋鍓嶅簭鍙�={}锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱",
- wrkMast.getBatch(),
- windowStartSeq,
- windowEndSeq,
- wrkMast.getBatchSeq());
+ if (logBlockedReason) {
+ List<Integer> windowBatchSeqList = unfinishedBatchWrkMasts.stream()
+ .limit(Math.min(batchRunningLimit, unfinishedBatchWrkMasts.size()))
+ .map(WrkMast::getBatchSeq)
+ .collect(java.util.stream.Collectors.toList());
+ News.taskInfo(wrkMast.getWrkNo(),
+ "鎵规:{} 褰撳墠涓ユ牸鎵ц绐楀彛搴忓彿鍒楄〃涓簕}锛屽綋鍓嶅簭鍙�={}锛屾殏涓嶅厑璁稿爢鍨涙満鍑哄簱",
+ wrkMast.getBatch(),
+ windowBatchSeqList,
+ wrkMast.getBatchSeq());
+ }
return false;
}
@@ -522,7 +537,9 @@
WrkStsType.COMPLETE_OUTBOUND.sts,
WrkStsType.SETTLE_OUTBOUND.sts));
if (batchRunningCount >= batchRunningLimit) {
- News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 鎵ц涓换鍔℃暟杈惧埌涓婇檺锛屽綋鍓�={}锛屼笂闄�={}", wrkMast.getBatch(), batchRunningCount, batchRunningLimit);
+ if (logBlockedReason) {
+ News.taskInfo(wrkMast.getWrkNo(), "鎵规:{} 鎵ц涓换鍔℃暟杈惧埌涓婇檺锛屽綋鍓�={}锛屼笂闄�={}", wrkMast.getBatch(), batchRunningCount, batchRunningLimit);
+ }
return false;
}
@@ -1105,6 +1122,10 @@
//璋冨害鍫嗗灈鏈虹Щ鍔�
public synchronized boolean dispatchCrnMove(Integer crnNo, String targetLocNo) {
+ return dispatchCrnMove(crnNo, targetLocNo, false);
+ }
+
+ public synchronized boolean dispatchCrnMove(Integer crnNo, String targetLocNo, boolean allowQueueWhenBusy) {
if (crnNo == null || Cools.isEmpty(targetLocNo)) {
return false;
}
@@ -1139,16 +1160,18 @@
return false;
}
- long runningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
- .eq("crn_no", crnNo)
- .in("wrk_sts",
- WrkStsType.INBOUND_RUN.sts,
- WrkStsType.OUTBOUND_RUN.sts,
- WrkStsType.LOC_MOVE_RUN.sts,
- WrkStsType.CRN_MOVE_RUN.sts));
- if (runningCount > 0) {
- News.info("鍫嗗灈鏈�:{} 瀛樺湪鎵ц涓殑浠诲姟锛屾殏涓嶇敓鎴愮Щ鍔ㄤ换鍔�", crnNo);
- return false;
+ if (!allowQueueWhenBusy) {
+ long runningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
+ .eq("crn_no", crnNo)
+ .in("wrk_sts",
+ WrkStsType.INBOUND_RUN.sts,
+ WrkStsType.OUTBOUND_RUN.sts,
+ WrkStsType.LOC_MOVE_RUN.sts,
+ WrkStsType.CRN_MOVE_RUN.sts));
+ if (runningCount > 0) {
+ News.info("鍫嗗灈鏈�:{} 瀛樺湪鎵ц涓殑浠诲姟锛屾殏涓嶇敓鎴愮Щ鍔ㄤ换鍔�", crnNo);
+ return false;
+ }
}
WrkMast activeTask = wrkMastService.getOne(new QueryWrapper<WrkMast>()
--
Gitblit v1.9.1