skyouc
2 天以前 093c43638d3f9aa64fc3b396a0a2452cc28abbe3
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -100,7 +100,7 @@
        if (Objects.isNull(ids) || ids.length < 1) {
            return R.error("参数不能为空!!");
        }
       return taskService.removeTask(ids);
        return taskService.removeTask(ids);
//        return R.ok("Delete Success").add(ids);
    }
@@ -132,10 +132,12 @@
            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));
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getId, id)
                .in(Task::getTaskStatus, longs));
        for (Task task : tasks) {
            task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
            task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
        }
        if (!taskService.updateBatchById(tasks)) {
            return R.error("完成任务失败");
@@ -145,7 +147,7 @@
    }
    /**
     * 拣料出库
     * 拣料出库(用于测试拣料出库)
     * @return
     */
    @PreAuthorize("hasAuthority('manager:task:update')")
@@ -156,7 +158,26 @@
            throw new CoolException("能数不能为空!!");
        }
        try {
            return R.ok(taskService.pickTask(id));
            return R.ok(taskService.pickOrCheckTask(id, "pick"));
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
    }
    /**
     * 盘点出库(用于测试盘点出库)
     *
     * @return
     */
    @PreAuthorize("hasAuthority('manager:task:update')")
    @ApiOperation("盘点出库")
    @PostMapping("/task/check/{id}")
    public R checkTask(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            throw new CoolException("能数不能为空!!");
        }
        try {
            return R.ok(taskService.pickOrCheckTask(id, "check"));
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }