#合并订单出库，统一转波次出库前最新代码

Junjie

2024-09-13 a1a7c03eae40f4b0344fce652e1a240cf5283624

 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,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());