1
ZY
2026-04-01 5a3f249a2dc6f79773843b5ea7602d73af2d52d2
1
2个文件已修改
14 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -167,7 +167,7 @@
        List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>()
                .in(Task::getUplinkSts, TaskUplinkStateType.PENDING.toString(), TaskUplinkStateType.FAILED.toString())
                .eq(Task::getTaskSts, TaskStsType.COMPLETE.val())
                .isNotNull(Task::getBusId)
                .isNotNull(Task::getBusId).ne(Task::getPriority, 9999)
        );
        if (Cools.isEmpty(taskList)) { return; }
        for (Task task : taskList) {
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java
@@ -137,7 +137,7 @@
        Collections.shuffle(staList);
        OpenBusSubmitParam param = new OpenBusSubmitParam();
        //param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        for (int i = 0; i < Math.min(agvModel.getBackpack(), staList.size()); i++) {
            Sta stockSta = staList.get(i);
@@ -150,7 +150,7 @@
            TaskDto taskDto = new TaskDto();
            taskDto.setOriSta(stockSta.getStaNo());
            taskDto.setDestLoc(idleLoc.getLocNo());
            taskDto.setPriority(100);
            taskDto.setPriority(9999);
            taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
            param.getTasks().add(taskDto);
@@ -182,7 +182,7 @@
        Collections.shuffle(staList);
        OpenBusSubmitParam param = new OpenBusSubmitParam();
        //param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        for (int i = 0; i < Math.min(agvModel.getBackpack(), staList.size()); i++) {
            Sta idleSta = staList.get(i);
@@ -196,7 +196,7 @@
            TaskDto taskDto = new TaskDto();
            taskDto.setOriLoc(stockLoc.getLocNo());
            taskDto.setDestSta(idleSta.getStaNo());
            taskDto.setPriority(100);
            taskDto.setPriority(9999);
            taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
            param.getTasks().add(taskDto);
@@ -239,7 +239,7 @@
        Collections.shuffle(idleLocList);
        OpenBusSubmitParam param = new OpenBusSubmitParam();
        //param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        param.setBatchNo(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        for (int i = 0; i < Math.min(maxCapacity, Math.min(stockLocList.size(), idleLocList.size())); i++) {
            Loc stockLoc = stockLocList.get(i);
            Loc idleLoc = idleLocList.get(i);
@@ -248,7 +248,7 @@
            taskDto.setOriLoc(stockLoc.getLocNo());
            taskDto.setDestLoc(idleLoc.getLocNo());
            taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
            taskDto.setPriority(1);
            taskDto.setPriority(9999);
            param.getTasks().add(taskDto);
        }
        if (Cools.isEmpty(param.getTasks())) {