From 4496b9019ba423dd1c51c719bcc0a5938d90fff9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 17:33:18 +0800
Subject: [PATCH] #修改优化  1. DO单明细编码优化  2. DO单明细新增优化  3. 出库单新增单据增加新单据功能

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 4a674b5..ceea18d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -10,6 +10,7 @@
 import com.vincent.rsf.server.common.domain.BaseParam;
 import com.vincent.rsf.server.common.domain.KeyValVo;
 import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
 import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
 import com.vincent.rsf.server.manager.entity.TaskItem;
 import com.vincent.rsf.server.manager.entity.WaitPakin;
@@ -150,11 +151,14 @@
     @PreAuthorize("hasAuthority('manager:waitPakin:update')")
     @ApiOperation("鐢熸垚浠诲姟鍒楄〃")
     @PostMapping("/waitPakin/merge")
-    public R generateTask(@RequestBody List<WaitPakin> waitPakin) {
-        if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
+    public R generateTask(@RequestBody GenerateTaskParams taskParams) {
+        if (Objects.isNull(taskParams)) {
             throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        return  taskService.generateTasks(waitPakin, getLoginUserId());
+        if (Objects.isNull(taskParams.getWaitPakins()) || taskParams.getWaitPakins().isEmpty()) {
+            throw new CoolException("缁勬嫋妗d笉鑳戒负绌猴紒锛�");
+        }
+        return  taskService.generateTasks(taskParams, getLoginUserId());
     }
 
 }

--
Gitblit v1.9.1