From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 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 2d1f503..48cab40 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
@@ -109,12 +109,38 @@
}
@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());
+ }
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:update')")
+ @OperationLog("鎷ｆ枡浠诲姟")
+ @PostMapping("/task/pick")
+ public R pick(@RequestBody Task task) {
+ try {
+ boolean result = workService.pickTask(task.getId());
+ return R.ok("鎷ｆ枡鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
--
Gitblit v1.9.1