From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
index 1b330a1..f2ec28d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -14,7 +14,12 @@
 
     R generateFlatWarehouseTasks(WaitPakin waitPakins,String locCode, Long loginUserId);
 
-//    R completeTask(String id);
+    R generateAGVTasks(WaitPakin waitPakins,String locCode,String orgSta, Long loginUserId);
 
-    void completeTask(List<Task> task) throws Exception;
+//    R completeTask(String id);
+     void completeTask(List<Task> task) throws Exception;
+
+    R removeTask(Long[] ids);
+
+    R pickTask(Long id);
 }

--
Gitblit v1.9.1