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 |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 841b204..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 @@
 
     // 瑙f瀽鍏ュ簱宸ヤ綔妗�
     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) {
@@ -741,6 +753,18 @@
                 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

--
Gitblit v1.9.1