From 7791957685b2630fb0fd4a8c2b73e1867519a4f1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 07 五月 2025 10:04:32 +0800
Subject: [PATCH] #pda组托+物料组托
---
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("缁勬嫋妗ｄ笉鑳戒负绌猴紒锛�");
+ }
+ return taskService.generateTasks(taskParams, getLoginUserId());
}
}
--
Gitblit v1.9.1