From e941917741b9b9b589d55fca1480126b78a0e2e3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 05 五月 2025 14:48:55 +0800
Subject: [PATCH] #存在移库任务禁止执行出库任务
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java | 6 +++---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
index 934ccfd..cae1327 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
@@ -48,13 +48,13 @@
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateInboundWrk(); // 缁勬墭
mainService.palletInbound();//鍏ュ簱-鎵樼洏杩涘簱
-
+ // 瑙ｆ瀽绉诲簱宸ヤ綔妗�
+ mainService.analyzeMoveTask();
// 瑙ｆ瀽鍑哄簱宸ヤ綔妗�
mainService.analyzeOutBoundTask();
// 瑙ｆ瀽鍏ュ簱宸ヤ綔妗�
mainService.analyzeInBoundTask();
- // 瑙ｆ瀽灏忚溅绉诲姩宸ヤ綔妗�
- mainService.analyzeMoveTask();
+
// 瑙ｆ瀽灏忚溅杞借揣绉诲姩宸ヤ綔妗�
mainService.analyzeLadenMoveTask();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 9c93ced..abc8368 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -779,6 +779,10 @@
* 鍑哄簱 ====>> 鍚屼竴鏃堕棿涓�鍙扮┛姊溅鍙兘鏈変竴涓嚭搴撲换鍔�
*/
public synchronized void analyzeOutBoundTask() {
+ List<Task> moveTask = taskService.selectWaitAnalyzeMoveTask();
+ if (!moveTask.isEmpty()) {
+ return;
+ }
List<Task> tasks = taskService.selectPakOut();
if (tasks.isEmpty()) {
return;
--
Gitblit v1.9.1