diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardMonitorOneService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardMonitorOneService.java index 7eaa90c..62e208e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardMonitorOneService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardMonitorOneService.java @@ -159,12 +159,12 @@ public class JxCenterWorkingBoardMonitorOneService extends JxCenterWorkingBoardC List outPutStatisticsList = (List) dataMap.get(MesOutPutStatistics.class.getSimpleName()); if (CollectionUtils.isEmpty(workOrderList) && CollectionUtils.isEmpty(outPutStatisticsList)) return psData; - String catagoryCodeCfg4Cached = (String) execCachedCenterWorkingBoardData(organizeCode, MesExtConstWords.ZERO_STR, MesExtConstWords.SX_CATEGORY_CFG, null); - MesBusiConfig catagoryCodeCfg = !StringUtils.isEmpty(catagoryCodeCfg4Cached) ? JSONObject.parseObject(catagoryCodeCfg4Cached, MesBusiConfig.class) : execCatagoryCodeCfg(organizeCode); - if (null == catagoryCodeCfg || StringUtils.isEmpty(catagoryCodeCfg.getCfgValue()) || StringUtils.isEmpty(catagoryCodeCfg.getCfgValueSeq())) return psData; + String categoryCodeCfg4Cached = (String) execCachedCenterWorkingBoardData(organizeCode, MesExtConstWords.ZERO_STR, MesExtConstWords.SX_CATEGORY_CFG, null); + MesBusiConfig categoryCodeCfg = !StringUtils.isEmpty(categoryCodeCfg4Cached) ? JSONObject.parseObject(categoryCodeCfg4Cached, MesBusiConfig.class) : execCatagoryCodeCfg(organizeCode); + if (null == categoryCodeCfg || StringUtils.isEmpty(categoryCodeCfg.getCfgValue()) || StringUtils.isEmpty(categoryCodeCfg.getCfgValueSeq())) return psData; - String[] categoryCodeArr = catagoryCodeCfg.getCfgValueSeq().split(MesExtConstWords.COMMA); - String[] categoryNameArr = catagoryCodeCfg.getCfgValue().split(MesExtConstWords.COMMA); + String[] categoryCodeArr = categoryCodeCfg.getCfgValueSeq().split(MesExtConstWords.COMMA); + String[] categoryNameArr = categoryCodeCfg.getCfgValue().split(MesExtConstWords.COMMA); if (categoryCodeArr.length != categoryNameArr.length) return psData; Map> centerMap4OutPutFilter = new HashMap<>(); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyOrderService.java index 816e769..f8900b9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyOrderService.java @@ -43,7 +43,7 @@ public class JxCenterWorkingBoardProxyOrderService implements IJxCenterWorkingBo String startTime = (String) dataMap.get(MesExtConstWords.START_TIME); String endTime = (String) dataMap.get(MesExtConstWords.END_TIME); - if (!StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)) return dataMap; + if (StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)) return dataMap; DdlPackBean packBean = DdlPackBean.getDdlPackBean(orgainzeCode); DdlPreparedPack.getStringEqualPack(workCenterCode, MesExtConstWords.WORK_CENTER_CODE, packBean);