From 03dbce0ba849005d060af569ffe3a58c0a1e0e45 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 14:24:06 +0800
Subject: [PATCH] 盘点再入库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 7e7ae8a..eb28056 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -100,7 +100,7 @@
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return taskService.removeTask(ids);
+ return taskService.removeTask(ids);
// return R.ok("Delete Success").add(ids);
}
@@ -132,7 +132,9 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getId, id)
+ .in(Task::getTaskStatus, longs));
for (Task task : tasks) {
task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
@@ -146,6 +148,7 @@
/**
* 鎷ｆ枡鍑哄簱
+ *
* @return
*/
@PreAuthorize("hasAuthority('manager:task:update')")
@@ -156,7 +159,26 @@
throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
}
try {
- return R.ok(taskService.pickTask(id));
+ return R.ok(taskService.pickOrCheckTask(id, "pick"));
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鐩樼偣鍑哄簱
+ *
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鎷ｆ枡鍑哄簱")
+ @PostMapping("/task/check/{id}")
+ public R checkTask(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+ }
+ try {
+ return R.ok(taskService.pickOrCheckTask(id, "check"));
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
--
Gitblit v1.9.1