#
luxiaotao1123
2024-09-25 a1cd6d27c1cb1143f14297da2235e797d8d6d91b
#
3个文件已修改
19 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -285,8 +285,9 @@
                    return 0;
                }
            });
            if (taskList.size() > agv.getStage()) {
                taskList = taskList.subList(0, agv.getStage());
            Integer backpack = agvService.getBackpack(agv);
            if (taskList.size() > backpack) {
                taskList = taskList.subList(0, backpack);
            }
            /**
@@ -353,7 +354,7 @@
                }
                if (backpackLev > agv.getStage()) {
                if (backpackLev > backpack) {
                    throw new BusinessException("解析Task失败,AGV背篓已满......");
                }
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java
@@ -35,4 +35,6 @@
    List<VehicleDto> getVehicleDtoList(List<String> noIncluded);
    Integer getBackpack(Agv agv);
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -143,4 +143,14 @@
        return res;
    }
    @Override
    public Integer getBackpack(Agv agv) {
        if (null != agv.getStage()) {
            return agv.getStage();
        }
        AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
        assert null != agvModel;
        return agvModel.getBackpack();
    }
}