From 071edbee0491256ac379d826bfdfe9c3f4e3094b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 08 一月 2026 12:48:00 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
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 718fc35..7c082f8 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
@@ -419,6 +419,18 @@
// 瑙ｆ瀽鍏ュ簱宸ヤ綔妗�
public synchronized void analyzeInBoundTask() {
+
+ List<Task> chargetaskList = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskSts
+ , TaskStsType.NEW_CHARGE.sts
+ , TaskStsType.ANALYZE_CHARGE.sts
+ , TaskStsType.EXECUTE_CHARGE.sts
+ , TaskStsType.COMPLETE_CHARGE.sts
+ )
+ );
+ if (!chargetaskList.isEmpty()) {
+ return;
+ }
for (Task task : taskService.selectWaitAnalyzeInBoundTask()) {
BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>().eq(BasConveyorSta::getSiteNo, task.getDestSite()));
if (basConveyorSta == null) {
@@ -539,6 +551,20 @@
* 鍑哄簱 ====>> 鍚屼竴鏃堕棿涓�鍙扮┛姊溅鍙兘鏈変竴涓嚭搴撲换鍔�
*/
public synchronized void analyzeOutBoundTask() {
+
+ List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskSts
+ , TaskStsType.NEW_CHARGE.sts
+ , TaskStsType.ANALYZE_CHARGE.sts
+ , TaskStsType.EXECUTE_CHARGE.sts
+ , TaskStsType.COMPLETE_CHARGE.sts
+ )
+ );
+ if (!taskList.isEmpty()) {
+ return;
+ }
+
+
List<Task> tasks = taskService.selectPakOut();
if (tasks.isEmpty()) {
return;
@@ -727,6 +753,32 @@
continue;
}
+ List<Task> chargetaskList = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskSts
+ , TaskStsType.NEW_CHARGE.sts
+ , TaskStsType.ANALYZE_CHARGE.sts
+ , TaskStsType.EXECUTE_CHARGE.sts
+ , TaskStsType.COMPLETE_CHARGE.sts
+ )
+ );
+ if (!chargetaskList.isEmpty()) {
+ return;
+ }
+
+ List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskSts
+ , TaskStsType.NEW_INBOUND.sts
+ , TaskStsType.ANALYZE_INBOUND.sts
+ , TaskStsType.EXECUTE_INBOUND.sts
+ , TaskStsType.NEW_OUTBOUND.sts
+ , TaskStsType.ANALYZE_OUTBOUND.sts
+ , TaskStsType.EXECUTE_OUTBOUND.sts)
+ );
+ if (!taskList.isEmpty()) {
+ News.info("{}鍙峰皬杞︼紝绯荤粺瀛樺湪姝ｅ湪鎵ц浠诲姟锛屾殏鍋滃厖鐢典换鍔�", shuttleProtocol.getShuttleNo());
+ continue;//姝ｅ湪鎵ц浠诲姟锛屼笉鎵ц鍏呯數
+ }
+
String currentLocNo = shuttleProtocol.getCurrentLocNo();
int lev = Utils.getLev(currentLocNo);//鑾峰彇灏忚溅妤煎眰
//鎼滅储灏忚溅褰撳墠妤煎眰鍏呯數妗�
--
Gitblit v1.9.1