From ecdc2cadd4a21b80de4e30e38878fdeb39084e3f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 23 六月 2025 17:05:12 +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/WaveService.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java
index e6648c9..c6afb77 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveService.java
@@ -11,13 +11,14 @@
 public interface WaveService extends IService<Wave> {
 
     /**
+     * @param
+     * @param loginUserId
+     * @return
      * @author Ryan
      * @description 娉㈡浠诲姟涓嬪彂
-     * @param
-     * @return
      * @time 2025/4/25 16:24
      */
-    R publicTask(Map<String, Object> map);
+    R publicTask(Map<String, Object> map, Long loginUserId);
 
     /**
      * @author Ryan
@@ -27,4 +28,23 @@
      * @time 2025/4/27 11:08
      */
     List<WaveItem> mergeWavePreview(Long waveId);
+
+    /**
+    * @author Ryan
+    * @description 鍙栨秷娉㈡锛屼慨鏀硅鍗曚俊鎭�
+    * @param
+    * @return
+    * @time 2025/6/17 10:03
+    */
+    R cancelWave(List<Long> ids);
+
+    /**
+     * @param
+     * @param loginUserId
+     * @return
+     * @author Ryan
+     * @description 閫夋嫨鏄庣粏涓嬪彂浠诲姟
+     * @time 2025/4/25 16:24
+     */
+    R waveToTask(Map<String, Object> map, Long loginUserId);
 }

--
Gitblit v1.9.1