#
luxiaotao1123
2024-11-12 5ff701e6cbc25ba4071dbcb390b8fd214a87aee8
#
3个文件已修改
9 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -544,6 +544,9 @@
            if (!agvService.judgeEnable(agv.getId())) {
                return false;
            }
            if (!Cools.isEmpty(taskService.selectInSts(agv.getId(), TaskStsType.ASSIGN, TaskStsType.PROGRESS))) {
                throw new CoolException("AGV[" + agv.getUuid() + "] failed to assign,because already has the task in running...");
            }
            Date now = new Date();
            Code endCode = null;
zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java
@@ -70,7 +70,7 @@
        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
        // init executorService
        if (null == this.executorService) {
            int count = agvList.size() > 30 ? agvList.size() : 20;
            int count = agvList.size() > 30 ? 20 : agvList.size();
            this.executorService = Executors.newFixedThreadPool(count);
        }
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -402,6 +402,8 @@
        }
        if (!Cools.isEmpty(oriDesc) && null != this.oriCode) {
            oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
        } else {
            oriDesc = "CODE" + " - " + this.getOriCode$();
        }
        return oriDesc;
    }
@@ -416,6 +418,8 @@
        }
        if (!Cools.isEmpty(destDesc) && null != this.destCode) {
            destDesc = destDesc + " (" + this.getDestCode$() + ")";
        } else {
            destDesc = "CODE" + " - " + this.getDestCode$();
        }
        return destDesc;
    }