电压改电量

zhang

6 天以前 1809dba25f489ea01c07a9ecc977d9f408545310

电压改电量

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

@@ -96,7 +96,7 @@
        for (Agv agv : agvList) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
            if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus() || null == agvDetail.getRecentCode()) {
            if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus() || null == agvDetail.getRecentCode()) {
                continue;
            }
            // low battery status, that need to go to charge
@@ -105,7 +105,7 @@
//            }
            // is charging ?
            if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
                if (agvDetail.getVol() < agvModel.getQuaBattery()) {
                if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
                    continue;
                }
            }

 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());
        }
    }