no message

skyouc

3 天以前 687e4da4b6fb9147b12eb0cd5072e1dda02abc00

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

@@ -92,14 +92,12 @@
        if (Objects.isNull(ids)) {
            throw new CoolException("参数不能为空！！");
        }
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, ids));
        if (taskItems.isEmpty()) {
        List<Long> list = Arrays.asList(ids);
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, list));
        if (!taskItems.isEmpty()) {
            throw new CoolException("有未完成任务，不可执行删除操作！！");
        }
        if (!waveService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
        return waveService.cancelWave(list);
    }

    @PreAuthorize("hasAuthority('manager:wave:list')")
@@ -132,6 +130,16 @@
        return waveService.publicTask(map, getLoginUserId());
    }

    @PreAuthorize("hasAuthority('manager:wave:update')")
    @ApiOperation("选择明细下发任务")
    @PostMapping("/wave/selects/task")
    public R waveToTask(@RequestBody Map<String, Object> map) {
        if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
            throw new CoolException("参数不能为空！！");
        }
        return waveService.waveToTask(map, getLoginUserId());
    }

    @PreAuthorize("hasAuthority('manager:wave:list')")
    @ApiOperation("波次出库任务预览")
    @PostMapping("/wave/locs/preview/page")