完成任务，判断浅库位是否完成，降低任务优先级

skyouc

6 天以前 b7708454cd284e64159eea04eb32b818f5d1a930

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

@@ -53,7 +53,6 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
        QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
        queryWrapper.orderByDesc("sort");
        return R.ok().add(taskService.page(pageParam, queryWrapper));
    }

@@ -136,31 +135,14 @@
    @PreAuthorize("hasAuthority('manager:task:update')")
    @ApiOperation("完成任务")
    @PostMapping("/task/complete/{id}")
    public R completeTask(@PathVariable String id) throws Exception {
        if (Objects.isNull(id)) {
    public R completeTask(@PathVariable Long id) throws Exception {
        if (Cools.isEmpty(id)) {
            throw new CoolException("参数不能为空！！");
        }
        List<Integer> 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));
        for (Task task : tasks) {
//            if (StringUtils.isNotBlank(task.getParentId() + "")) {
//                Task task1 = taskService.getById(task.getParentId());
//                if (!Objects.isNull(task1) && task1.getTaskType().equals(TaskStsType.UPDATED_IN.id)) {
//                    throw new CoolException("父任务：" + task1.getTaskCode() + "未执行完成！");
//                }
//            }
            task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
        }

        if (!taskService.updateBatchById(tasks)) {
            return R.error("完成任务失败");
        }

        return R.ok("完成任务成功");
        return R.ok("完成任务成功").add(taskService.operateComplete(id));
    }


    /**
     * 拣料出库（用于测试拣料出库）
     * @return