From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 14 ++++++++++++--
1 files changed, 12 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 77ce80e..257f8c5 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
@@ -4,6 +4,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.Task;
+import com.vincent.rsf.server.manager.entity.WaitPakin;
import java.util.List;
@@ -11,7 +12,16 @@
R generateTasks(GenerateTaskParams waitPakin, Long loginUserId);
-// R completeTask(String id);
+ R generateFlatWarehouseTasks(WaitPakin waitPakins,String locCode, Long loginUserId);
- void completeTask(List<Task> task) throws Exception;
+ R generateAGVTasks(WaitPakin waitPakins,String locCode,String orgSta, Long loginUserId);
+
+// R completeTask(String id);
+ void completeTask(List<Task> task) throws Exception;
+
+ R removeTask(Long[] ids);
+
+ Task pickTask(Long id) throws Exception;
+
+ void complateInTask(List<Task> tasks) throws Exception;
}
--
Gitblit v1.9.1