盘点再入库

skyouc

2 天以前 03dbce0ba849005d060af569ffe3a58c0a1e0e45

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

@@ -132,7 +132,9 @@
            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);
@@ -146,6 +148,7 @@

    /**
     * 拣料出库
     *
     * @return
     */
    @PreAuthorize("hasAuthority('manager:task:update')")
@@ -156,7 +159,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());
        }