From 1de6b39bfe3967916dcab8122be0d69fbaba8cca Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 17:29:06 +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 | 8 ++++++--
1 files changed, 6 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 257f8c5..1d20247 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
@@ -19,9 +19,13 @@
// R completeTask(String id);
void completeTask(List<Task> task) throws Exception;
- R removeTask(Long[] ids);
+ R removeTask(Long[] ids, Long loginUserId);
- Task pickTask(Long id) throws Exception;
+ Task pickOrCheckTask(Long id, String oType) throws Exception;
void complateInTask(List<Task> tasks) throws Exception;
+
+ Task taskToTop(Long id, Long loginUserId) throws Exception;
+
+ Task operateComplete(Long id, Long loginUserId);
}
--
Gitblit v1.9.1