no message

skyouc

2 天以前 45430b88dab1451ecff39236dab01d5668b5b9c8

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java

@@ -132,10 +132,6 @@
        }
        List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
//        if (tasks.isEmpty()) {
//            throw new CoolException("任务已处执行状态不可一键完成！！");
//        }
//        taskService.completeTask(tasks);
        for (Task task : tasks) {
            task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
        }
@@ -146,6 +142,20 @@
        return R.ok("完成任务成功");
    }

    /**
     * 拣料出库
     * @return
     */
    @PreAuthorize("hasAuthority('manager:task:update')")
    @ApiOperation("拣料出库")
    @PostMapping("/task/pick/{id}")
    public R pickTask(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            throw new CoolException("能数不能为空！！");
        }
        return taskService.pickTask(id);
    }

//    @PreAuthorize("hasAuthority('manager:task:update')")
//    @ApiOperation("取消任务")
//    @PostMapping("/task/cancel/{id}")