From 351b16d0a3dc194841c2192cacfabf788ecafd5c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 05 八月 2024 08:19:17 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
index 05ff011..d4c90b1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
@@ -52,6 +52,12 @@
return R.ok().add(taskService.getById(id));
}
+ @PreAuthorize("hasAuthority('asrs:task:list')")
+ @GetMapping("/task/orderDetlId/{orderDetlId}")
+ public R getByOrderDetlId(@PathVariable("orderDetlId") Long orderDetlId) {
+ return R.ok().add(taskService.getByOrderDetlId(orderDetlId));
+ }
+
@PreAuthorize("hasAuthority('asrs:task:save')")
@OperationLog("娣诲姞浠诲姟")
@PostMapping("/task/save")
@@ -103,12 +109,25 @@
}
@PreAuthorize("hasAuthority('asrs:task:update')")
+ @OperationLog("瀹屾垚浠诲姟")
+ @PostMapping("/task/complete")
+ public R complete(@RequestBody Task task) {
+ try {
+ boolean result = workService.completeTask(task.getId());
+ return R.ok("瀹屾垚鎴愬姛");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error(e.getMessage());
+ }
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:update')")
@OperationLog("鍙栨秷浠诲姟")
@PostMapping("/task/cancel")
public R cancel(@RequestBody Task task) {
try {
boolean result = workService.cancelTask(task.getId());
- return R.ok("淇敼鎴愬姛");
+ return R.ok("鍙栨秷鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
--
Gitblit v1.9.1