From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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..1ecf312 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
@@ -105,7 +105,24 @@
@PreAuthorize("hasAuthority('asrs:task:list')")
@PostMapping("/task/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
+ List<Task> data = taskService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, Task.class), response);
+ }
+
+ @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')")
@@ -114,7 +131,20 @@
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