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 | 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 b2ee0b1..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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
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;
@@ -9,7 +10,16 @@
public interface TaskService extends IService<Task> {
- R generateTasks(List<WaitPakin> waitPakin, Long loginUserId);
+ R generateTasks(GenerateTaskParams waitPakin, Long loginUserId);
- R completeTask(String id);
+ R generateFlatWarehouseTasks(WaitPakin waitPakins,String locCode, Long loginUserId);
+
+ 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