#单据出库

zjj

3 小时以前 50f2f8945f1ab86c931fee6cf9d9bd88a122ae6e

 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));
    }

@@ -102,9 +101,9 @@
    }

    @PreAuthorize("hasAuthority('manager:task:remove')")
    @OperationLog("Delete 任务工作档")
    @OperationLog("取消/删除工作极档")
    @ApiOperation("取消/删除工作极档")
    @PostMapping("/task/remove/{ids}")
    @Transactional(rollbackFor = Exception.class)
    public R remove(@PathVariable Long[] ids) {
        if (Objects.isNull(ids) || ids.length < 1) {
            return R.error("参数不能为空！！");
@@ -136,30 +135,13 @@
    @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, getLoginUserId()));
    }


    /**
     * 拣料出库（用于测试拣料出库）
@@ -216,7 +198,7 @@
            throw new CoolException("参数不能为空！！");
        }
        try {
            taskService.taskToTop(id);
            taskService.taskToTop(id, getLoginUserId());
        } catch (Exception e) {
            logger.error("UNK", e);
            throw new CoolException(e.getMessage());