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 | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 32caee7..889589e 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -1122,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;
}
@@ -1156,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