修复bug

gavel/src/main/java/com/gavel/qzsa/agv/service/impl/AgvServiceImpl.java

@@ -157,8 +157,7 @@ public class AgvServiceImpl extends BaseEditServiceImpl implements AgvService {
                 //是否启用充电阈值设置
                 String isEnable =  commonService.getStringOptionValue(JcsjParamEnum.AgvBatteryEnable.id());
                 //充电状态，阈值比较
-                if(StringUtils.equals(isEnable,"Y")){
-                    if(StringUtils.equals("7",agvStatus.getStatus())) {
+                if(StringUtils.equals("7",agvStatus.getStatus()) && StringUtils.equals(isEnable,"Y")){
                 	Integer yz =  commonService.getIntOptionValue(JcsjParamEnum.AgvBatterySetting.id());//设置值
                     Integer curValue = Integer.valueOf(agvStatus.getBattery());//获取小车值
                     if(NumberUtils.less(curValue , yz)){
@@ -166,7 +165,6 @@ public class AgvServiceImpl extends BaseEditServiceImpl implements AgvService {
                         continue;
                     }
                 }
-                }
                 //查询Eptask中是否已存在小车，如果存在，返回空，生成任务失败
                 if (eptaskDao.countExecutingHcTask(agvStatus.getRobotCode()) > 0) {
                    logger.error("小车"+agvStatus.getRobotCode()+"已存在执行任务！");