#

vincentlu

110 分钟以前 b1dd4c6e284244bd7224e2c050a9670fbd9a38ea

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

@@ -73,20 +73,23 @@
            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());
        }
    }

    @Override
    public Code getCurrentCode(Long agvId) {
        AgvDetail agvDetail = this.selectMajorByAgvId(agvId);
        if (null == agvDetail) {
            return null;
        }
        Long recentCode = agvDetail.getRecentCode();
        if (null == recentCode) {
            return null;
        }
        return codeService.getById(recentCode);
        return codeService.getCacheById(recentCode);
    }

}