From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java
index 47ecd7a..0e7fdda 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java
@@ -32,14 +32,23 @@
 
     List<Task> selectPakOut();
 
+    List<Task> selectWaitAnalyzeMoveTask();
+
     List<Task> hasChargeInLoc(String locNo);
 
     Task selectMoveWorking(Integer shuttleNo);
 
-    List<Task> selectWorkingByShuttle(Integer shuttleNo);
+    Task selectManualWorking(Integer shuttleNo);
 
-    List<Task> selectWorkingByLift(Integer liftNo);
+    List<Task> selectWorkingByShuttle(Integer shuttleNo, String taskNo);
+
+    List<Task> selectWorkingByLift(Integer liftNo, String taskNo);
 
     Task selectChargeWorking(Integer shuttleNo);
 
+    List<Task> selectWaitAnalyzeLadenMoveTask();
+
+    List<Task> selectLadenMoveByAnalyzeSts();
+
+    List<Task> selectLadenMoveByExecuteSts();
 }

--
Gitblit v1.9.1