From 92a30abbdc9f65cb1a45a65e39cbfd3f6b52461e Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 21 五月 2025 14:06:26 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 12 ++++++++++-- 1 files changed, 10 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..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 @@ -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,14 @@ 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); + + R pickTask(Long id); } -- Gitblit v1.9.1