jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

智能监控看板数据查询有误

Browse Source
tags/yfai-mes-ext-v1.0
yxw 2 years ago
parent 431a62f51e
commit cb20da8db9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardMonitorOneService.java
Unescape Escape View File

@ -159,12 +159,12 @@ public class JxCenterWorkingBoardMonitorOneService extends JxCenterWorkingBoardC
List<MesOutPutStatistics> outPutStatisticsList = (List<MesOutPutStatistics>) 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<String, List<MesOutPutStatistics>> centerMap4OutPutFilter = new HashMap<>();

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyOrderService.java
Unescape Escape View File

@ -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);

Write Preview
Loading…
Cancel
Save