#

Junjie

2024-07-31 f3afce900e77ec46ed8b3b5b4484d72f796fcaef

#

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java

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

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WorkService.java

@@ -17,6 +17,9 @@
    //生成入库任务
    boolean generatePakIn(GeneratePakInParam param);

    //完成任务
    boolean completeTask(Long taskId);

    //取消任务
    boolean cancelTask(Long taskId);


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java

@@ -161,6 +161,34 @@
    }

    @Override
    public boolean completeTask(Long taskId) {
        Task task = taskService.getById(taskId);
        if(task == null){
            throw new CoolException("任务不存在");
        }

        List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(taskId);
        if (taskDetls.isEmpty()) {
            throw new CoolException("任务明细不存在");
        }

        if (task.getTaskType() < 100) {
            //入库
            task.setTaskSts(99L);//99.入库完成
        }else {
            //出库
            task.setTaskSts(199L);//199.出库完成
        }

        task.setUpdateTime(new Date());
        if (!taskService.updateById(task)) {
            throw new CoolException("任务更新失败");
        }

        return true;
    }

    @Override
    @Transactional
    public boolean cancelTask(Long taskId) {
        Task task = taskService.getById(taskId);