# version merge

vincentlu

7 天以前 583b31d46bb8abbee7410d29ca229120ee589cba

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java

@@ -73,9 +73,9 @@
            agvModel = agvModelService.getByAgvId(agv.getId());
        }
        if (null == agv.getChargeLine()) {
            return agvDetail.getVol() < agvModel.getLowBattery();
            return agvDetail.getSoc() < agvModel.getLowBattery();
        } else {
            return agvDetail.getVol() < Math.max(agv.getChargeLine(), agvModel.getLowBattery());
            return agvDetail.getSoc() < Math.max(agv.getChargeLine(), agvModel.getLowBattery());
        }
    }