代码调整

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

@@ -154,7 +154,7 @@ public class AgvServiceImpl extends BaseEditServiceImpl implements AgvService {
                 if(agvExsit !=null && BooleanEnum.equalsYes(agvExsit.getTybz())){
                     continue;
                 }
-                //是否启用充电阈值设置
+               /* //是否启用充电阈值设置
                 String isEnable =  commonService.getStringOptionValue(JcsjParamEnum.AgvBatteryEnable.id());
                 //充电状态，阈值比较
                 if(StringUtils.equals(isEnable,"Y")){
@@ -166,7 +166,7 @@ public class AgvServiceImpl extends BaseEditServiceImpl implements AgvService {
                             continue;
                         }
                     }
-                }
+                }*/
                 //查询Eptask中是否已存在小车，如果存在，返回空，生成任务失败
                 if (eptaskDao.countExecutingHcTask(agvStatus.getRobotCode()) > 0) {
                    logger.error("小车"+agvStatus.getRobotCode()+"已存在执行任务,生成任务失败！");

gavel/src/main/java/com/gavel/qzsa/jcsj/utils/JcsjParamEnum.java

@@ -21,16 +21,17 @@ public enum JcsjParamEnum {
     MapDataSync("SYS108", "地图编号同步参数设置", "B", "地图编号同步参数设置", "S", "", "", ""),
     BatterySetting("SYS109", "货架充电区间设置参数", "B", "货架充电区间设置参数[30,60]", "S", "", "[30,60]", ""),
     KwDataSync("SYS110", "地图简称同步库位参数设置", "B", "地图简称同步库位参数设置", "S", "", "", ""),
-    AgvBatteryEnable("SYS112", "是否启用充电状态小车充电阈值(默认值否)", "B", "是否启用充电状态小车充电阈值(默认值否)", "B", "N"),
-    AgvBatterySetting("SYS111", "充电状态小车充电阈值设置参数(默认值80)", "B", "充电状态小车充电阈值设置参数(默认值80)", "S", "", "80", ""),
+    AgvBatteryEnable("SYS111", "是否启用充电状态小车充电阈值(默认值否)", "B", "是否启用充电状态小车充电阈值(默认值否)", "B", "N"),
+    AgvBatterySetting("SYS112", "充电状态小车充电阈值设置参数(默认值80)", "B", "充电状态小车充电阈值设置参数(默认值80)", "S", "", "80", ""),
+    ChargingThreshold("SYS113", "充电阈值", "B", "货架充电阈值", "S", "", "100", ""),
+    ForcedChargeCycle("SYS114", "强制充电周期", "B", "强制货架n天内必须存在一次满充记录", "S", "", "3", ""),
 	MCSU001("MCSU001", "用户可操作的仓库", "U", "用户可操作的仓库", "E", "select CK_ID as ID, CK_CODE as CODE, CK_NAME as NAME  from CK  where isnull(CK_TYBZ,'N')='N' order by CK_CODE", "", ""),
     MCSU002("MCSU002", "用户可操作的产线", "U", "用户可操作的产线", "E", "select CX_ID as ID, CX_CXBM as CODE, CX_CXMC as NAME  from CX  where 1=1 order by CX_CXBM", "", ""),
     MCSU003("MCSU003", "用户可操作的站点", "U", "用户可操作的站点", "E", "select ZD_ID as ID, ZD_ZDBM as CODE, ZD_ZDMC as NAME  from ZD  where 1=1 order by ZD_ZDBM", "", ""),
 	JCSJ_WLXX_CODESTRATEGY("ERPB006", "物料编码的编码规则", "C", "物料编码由系统自动生成时的编码规则", "L", "A: 物料分类编码+流水号; B: 物料分类编码+'-'+流水号", "A", "物料分类编码+流水号"),
     AGVBACK_TEMPLATE("MCSU004", "回冲电区任务模板", "B", "回冲电区任务模板,可以是多个，逗号分隔","S", "",""),
-    MATTERAREA("MCSU005", "回库区域编码", "B", "回库区域编码","S", "",""),
-    ChargingThreshold("SYS111", "充电阈值", "B", "货架充电阈值", "S", "", "100", ""),
-    ForcedChargeCycle("SYS112", "强制充电周期", "B", "强制货架n天内必须存在一次满充记录", "S", "", "3", "");
+    MATTERAREA("MCSU005", "回库区域编码", "B", "回库区域编码","S", "","");
+
 
     private String id;      // 参数ID
     private String name;    //参数名称