From b678a2c6b0b43feaad90c558b2c2c3bd608deedb Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 22 六月 2024 14:56:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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..5bc6821 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,11 +32,15 @@
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> selectWorkingByShuttle(Integer shuttleNo, String taskNo);
List<Task> selectWorkingByLift(Integer liftNo);
--
Gitblit v1.9.1