DO单excel导入功能 任务工作档优化

skyouc

3 天以前 5074c51d978a490a1d0e9dc116a874d33ddeb16c

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -455,10 +455,12 @@
        }

        modiftyTaskSort(task, loginUserId);

        //

//        if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
//            task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
//        } else {
        task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
//        }
        if (!this.updateById(task)) {
            throw new CoolException("完成任务失败");
        }
@@ -511,26 +513,34 @@
//
//                return moveTask;
//            }
        } else {
            //浅库位，判断深对应深库位是否为空，如果为空生成一个移库任务，将托盘送入深库位
            String deepLoc = LocUtils.getDeepLoc(curLoc);
            if (StringUtils.isBlank(deepLoc)) {
                throw new CoolException("数据异常，请联系管理员！");
            }
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, deepLoc));
            if (Objects.isNull(loc)) {
                throw new CoolException("数据错误，库位不存在！！");
            }
            //判断深库位是否为空
            if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
                LocToTaskParams params = new LocToTaskParams();
                params.setOrgLoc(curLoc).setTarLoc(deepLoc);
                //生成移深库位任务
                locItemService.genMoveTask(params, loginUserId);
            }
        }

        return task;
    }

    /**
     * 任务完成后，判断深库位是否为空，如果为空生成移库任务
     * @param loginUserId
     * @param curLoc
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void moveToDeep(Long loginUserId, String curLoc) throws Exception {
        //浅库位，判断深对应深库位是否为空，如果为空生成一个移库任务，将托盘送入深库位
        String deepLoc = LocUtils.getDeepLoc(curLoc);
        if (StringUtils.isBlank(deepLoc)) {
            throw new CoolException("数据异常，请联系管理员！");
        }
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, deepLoc));
        if (Objects.isNull(loc)) {
            throw new CoolException("数据错误，库位不存在！！");
        }
        //判断深库位是否为空
        if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
            LocToTaskParams params = new LocToTaskParams();
            params.setOrgLoc(curLoc).setTarLoc(deepLoc);
            //生成移深库位任务
            locItemService.genMoveTask(params, loginUserId);
        }
    }

    @Transactional(rollbackFor = Exception.class)
@@ -708,8 +718,8 @@
    @Transactional(rollbackFor = Exception.class)
    public R removeTask(Long[] ids, Long loginUserId) {
        List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type,TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
                TaskType.TASK_TYPE_CHECK_OUT.type,  TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type,
        List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
                TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type,
                TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
        List<Task> tasks = this.list(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskType, list)
@@ -719,7 +729,7 @@
        }
        for (Task task : tasks) {
            //取消移库任务
            if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_OUT.id)) {
            if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id)) {
                if (!locService.update(new LambdaUpdateWrapper<Loc>()
                        .eq(Loc::getCode, task.getOrgLoc())
                        .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) {
@@ -732,12 +742,17 @@
                Task outTask = taskService.getById(task.getParentId());
                if (!Objects.isNull(outTask)) {
                    LocToTaskParams params = new LocToTaskParams();
                    params.setOrgLoc(task.getOrgLoc());
                    params.setOrgLoc(task.getOrgLoc()).setSiteNo(task.getOrgSite());
                    //生成移深库位任务
                    Task moveTask = locItemService.genMoveTask(params, loginUserId);
                    moveTask.setTaskType(task.getSort() + 1);
                } else {
                    throw new CoolException("无法生成新的移库任务，取消失败！！");
                    moveTask.setSort(task.getSort() + 1).setParentId(outTask.getId());
                    if (!this.updateById(moveTask)) {
                        throw new CoolException("任务信息修改失败！！");
                    }
                    outTask.setParentId(moveTask.getId());
                    if (!this.updateById(outTask)) {
                        throw new CoolException("任务信息修改失败！！");
                    }
                }
            }