zhang
6 天以前 1809dba25f489ea01c07a9ecc977d9f408545310
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -54,7 +54,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()) {
            if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus()) {
                continue;
            }
            if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -96,16 +96,16 @@
        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
            if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
                continue;
            }
//            if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
//                continue;
//            }
            // is charging ?
            if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
                if (agvDetail.getVol() < agvModel.getQuaBattery()) {
                if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
                    continue;
                }
            }