From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java | 272 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 154 insertions(+), 118 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..8f3a030 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
@@ -1,118 +1,154 @@
-package com.zy.asrs.wms.asrs.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.asrs.service.WorkService;
-import com.zy.asrs.wms.common.annotation.OperationLog;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.common.domain.KeyValVo;
-import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.asrs.entity.Task;
-import com.zy.asrs.wms.asrs.service.TaskService;
-import com.zy.asrs.wms.system.controller.BaseController;
-import com.zy.asrs.wms.utils.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api")
-public class TaskController extends BaseController {
-
- @Autowired
- private TaskService taskService;
- @Autowired
- private WorkService workService;
-
- @PreAuthorize("hasAuthority('asrs:task:list')")
- @PostMapping("/task/page")
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
- return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));
- }
-
- @PreAuthorize("hasAuthority('asrs:task:list')")
- @PostMapping("/task/list")
- public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(taskService.list());
- }
-
- @PreAuthorize("hasAuthority('asrs:task:list')")
- @GetMapping("/task/{id}")
- public R get(@PathVariable("id") Long id) {
- return R.ok().add(taskService.getById(id));
- }
-
- @PreAuthorize("hasAuthority('asrs:task:save')")
- @OperationLog("娣诲姞浠诲姟")
- @PostMapping("/task/save")
- public R save(@RequestBody Task task) {
- if (!taskService.save(task)) {
- return R.error("娣诲姞澶辫触");
- }
- return R.ok("娣诲姞鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:task:update')")
- @OperationLog("淇敼浠诲姟")
- @PostMapping("/task/update")
- public R update(@RequestBody Task task) {
- if (!taskService.updateById(task)) {
- return R.error("淇敼澶辫触");
- }
- return R.ok("淇敼鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:task:remove')")
- @OperationLog("鍒犻櫎浠诲姟")
- @PostMapping("/task/remove/{ids}")
- public R remove(@PathVariable Long[] ids) {
- if (!taskService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
- }
- return R.ok("鍒犻櫎鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:task:list')")
- @PostMapping("/task/query")
- public R query(@RequestParam(required = false) String condition) {
- List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(Task::getId, condition);
- }
- taskService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getId()))
- );
- return R.ok().add(vos);
- }
-
- @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);
- }
-
- @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("淇敼鎴愬姛");
- } catch (Exception e) {
- e.printStackTrace();
- return R.error(e.getMessage());
- }
- }
-
-}
+package com.zy.asrs.wms.asrs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.service.WorkService;
+import com.zy.asrs.wms.common.annotation.OperationLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.KeyValVo;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.asrs.entity.Task;
+import com.zy.asrs.wms.asrs.service.TaskService;
+import com.zy.asrs.wms.system.controller.BaseController;
+import com.zy.asrs.wms.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class TaskController extends BaseController {
+
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private WorkService workService;
+
+ @PreAuthorize("hasAuthority('asrs:task:list')")
+ @PostMapping("/task/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
+ return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:list')")
+ @PostMapping("/task/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(taskService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:list')")
+ @GetMapping("/task/{id}")
+ public R get(@PathVariable("id") Long id) {
+ 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")
+ public R save(@RequestBody Task task) {
+ if (!taskService.save(task)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:update')")
+ @OperationLog("淇敼浠诲姟")
+ @PostMapping("/task/update")
+ public R update(@RequestBody Task task) {
+ if (!taskService.updateById(task)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:remove')")
+ @OperationLog("鍒犻櫎浠诲姟")
+ @PostMapping("/task/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!taskService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:list')")
+ @PostMapping("/task/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Task::getId, condition);
+ }
+ taskService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:list')")
+ @PostMapping("/task/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ 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')")
+ @OperationLog("鍙栨秷浠诲姟")
+ @PostMapping("/task/cancel")
+ public R cancel(@RequestBody Task task) {
+ try {
+ boolean result = workService.cancelTask(task.getId());
+ 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