跑库逻辑调整

zhang

8 小时以前 11c50b4816162753dd40ce5f501487d939196f69

跑库逻辑调整

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/TaskDto.java

@@ -22,4 +22,6 @@

    private Integer priority = 1;

    private String memo;

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java

@@ -216,7 +216,7 @@
            taskDto.setDestLoc(idleLoc.getLocNo());
            taskDto.setPriority(100);
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));

            taskDto.setMemo(memo);
            param.getTaskList().add(taskDto);
        }

@@ -268,7 +268,7 @@
            taskDto.setDestLoc(idleLoc.getLocNo());
            taskDto.setPriority(99);
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));

            taskDto.setMemo(memo);
            param.getTaskList().add(taskDto);
            num--;
        }
@@ -320,7 +320,7 @@
            taskDto.setDestSta(idleSta.getStaNo());
            taskDto.setPriority(100);
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));

            taskDto.setMemo(memo);
            param.getTaskList().add(taskDto);
        }

@@ -372,6 +372,7 @@
            taskDto.setOriLoc(stockLoc.getLocNo());
            taskDto.setDestSta(idleSta.getStaNo());
            taskDto.setPriority(100);
            taskDto.setMemo(memo);
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));

            param.getTaskList().add(taskDto);
@@ -391,15 +392,21 @@
        int availableAgvCount = this.getAvailableAgvCount(agvGroupList);

        // 最多 ? 组bus运行
        if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()).in(Bus::getMemo, memo, staTaskMemo))) {
            return;
        }
//        if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()).in(Bus::getMemo, memo, staTaskMemo))) {
//            return;
//        }

        AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
        if (null == agvModel) {
            return;
        }
        int maxCapacity = agvModel.getBackpack();

        Integer maxTask = configService.getVal("maxTask", Integer.class, 30);
        // 最多 ? 个任务运行
        if (maxTask <= taskService.count(new LambdaQueryWrapper<Task>().in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()).in(Task::getMemo, memo, staTaskMemo))) {
            return;
        }

        // STOCK
        LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
@@ -439,7 +446,7 @@
            taskDto.setOriLoc(stockLoc.getLocNo());
            taskDto.setDestLoc(idleLoc.getLocNo());
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));

            taskDto.setMemo(memo);
            param.getTaskList().add(taskDto);
        }

@@ -504,7 +511,7 @@
            taskDto.setOriLoc(stockLoc.getLocNo());
            taskDto.setDestLoc(idleLoc.getLocNo());
            taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));

            taskDto.setMemo(memo);
            param.getTaskList().add(taskDto);
        }


 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/ValidService.java

@@ -53,7 +53,7 @@
            task.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            task.setSeqNum(taskDto.getSeqNum());
            task.setPriority(taskDto.getPriority());

            task.setMemo(taskDto.getMemo());
            List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getSeqNum, taskDto.getSeqNum()).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
            if (!Cools.isEmpty(list)){
                throw new BusinessException("Task seqNum: " + taskDto.getSeqNum() + " is already exists!");