From 48b875f66aa0b9346b698e600f03361e972028e8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 19 六月 2025 18:33:22 +0800
Subject: [PATCH] 波次出库任务失败
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
index b527b50..14d46fe 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
@@ -92,14 +92,12 @@
if (Objects.isNull(ids)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, ids));
- if (taskItems.isEmpty()) {
+ List<Long> list = Arrays.asList(ids);
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, list));
+ if (!taskItems.isEmpty()) {
throw new CoolException("鏈夋湭瀹屾垚浠诲姟锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�");
}
- if (!waveService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
- }
- return R.ok("Delete Success").add(ids);
+ return waveService.cancelWave(list);
}
@PreAuthorize("hasAuthority('manager:wave:list')")
@@ -132,6 +130,16 @@
return waveService.publicTask(map, getLoginUserId());
}
+ @PreAuthorize("hasAuthority('manager:wave:update')")
+ @ApiOperation("閫夋嫨鏄庣粏涓嬪彂浠诲姟")
+ @PostMapping("/wave/selects/task")
+ public R waveToTask(@RequestBody Map<String, Object> map) {
+ if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return waveService.waveToTask(map, getLoginUserId());
+ }
+
@PreAuthorize("hasAuthority('manager:wave:list')")
@ApiOperation("娉㈡鍑哄簱浠诲姟棰勮")
@PostMapping("/wave/locs/preview/page")
--
Gitblit v1.9.1