From b14bac5e0de905a6eff0ff65f6b808ff10fddb16 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 14:15:38 +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/controller/WaitPakinController.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 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..8e088f9 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;
@@ -108,22 +109,10 @@
@PostMapping("/waitPakin/remove/{ids}")
@Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
- List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
- .in(WaitPakinItem::getPakinId, ids));
- if (!pakinItems.isEmpty()) {
- List<Long> list = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, list));
- if (!taskItems.isEmpty()) {
- return R.error("缁勬嫋妗ｆ湁鏄庣粏浠诲姟");
- }
+ if (Arrays.asList(ids).isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
- }
- if (!waitPakinItemService.removeByIds(pakinItems)) {
- throw new CoolException("鏄庣粏鍒犻櫎澶辫触锛侊紒");
- }
- return R.ok("Delete Success").add(ids);
+ return waitPakinService.removePakin(Arrays.asList(ids));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@@ -150,11 +139,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