diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/jx/IJxCenterWorkingBoardService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/jx/IJxCenterWorkingBoardService.java index 285f701..8d66b0d 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/jx/IJxCenterWorkingBoardService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/jx/IJxCenterWorkingBoardService.java @@ -19,4 +19,12 @@ public interface IJxCenterWorkingBoardService { @ApiOperation(value = "嘉兴产线运行看板", notes = "嘉兴产线运行看板") Map queryCenterWorkingBoardData(Map dataMap); + /** + * 清除产线运行看板数据无用数据 + * @param dataMap 数据 + * @return 产线运行看板数据 + */ + @ApiOperation(value = "清除产线运行看板数据无用数据", notes = "清除产线运行看板数据无用数据") + default Map clearUselessData(Map dataMap) { return dataMap; } + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java index 9ec5a44..9dbcdda 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/JxCenterWorkingBoardController.java @@ -47,7 +47,8 @@ public class JxCenterWorkingBoardController extends MesBaseController { .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorDetail("参数缺失业务标志[flag]!") .build(); - dataMap.put(MesExtConstWords.ORGANIZE_CODE, AuthUtil.getOrganize().getOrganizeCode()); + dataMap.put(MesExtConstWords.ORGANIZE_CODE, "CN33"); +// dataMap.put(MesExtConstWords.ORGANIZE_CODE, AuthUtil.getOrganize().getOrganizeCode()); dataMap.put(MesExtConstWords.START_TIME, TimeTool.getNowTime(true)); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(centerWorkingBoardService.queryCenterWorkingBoardData(dataMap)); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiOneService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiOneService.java index 81cc793..62ae867 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiOneService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiOneService.java @@ -66,6 +66,13 @@ public class JxCenterWorkingBoardBusiOneService implements IJxCenterWorkingBoard dataMap.put("公告信息", getWorkCenterNotificationBarData(workCenterExtDb)); + return clearUselessData(dataMap); + } + + @Override + public Map clearUselessData(Map dataMap) { + dataMap.remove(MesWorkCenterExt.class.getSimpleName()); + dataMap.remove(MesShiftProdCenterRecord.class.getSimpleName()); return dataMap; } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java index 952d97b..1530620 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java @@ -95,6 +95,22 @@ public class JxCenterWorkingBoardBusiTwoService implements IJxCenterWorkingBoard dataMap.put("生产计划进度", getProductionSchedule(workOrderList, outPutStatisticsList, workCenterExtDb)); + return clearUselessData(dataMap); + } + + @Override + public Map clearUselessData(Map dataMap) { + dataMap.remove(MesWorkCenterExt.class.getSimpleName()); + dataMap.remove(MesShiftProdCenterRecord.class.getSimpleName()); + dataMap.remove(MesWorkOrder.class.getSimpleName()); + dataMap.remove(MesOutPutStatistics.class.getSimpleName()); + dataMap.remove(MesExtConstWords.STANDARD_WORK); + dataMap.remove(MesExtConstWords.QTY); + dataMap.remove(MesExtConstWords.COMPLET_QTY); + dataMap.remove("serviceTime"); + dataMap.remove("nonWorkingTime"); + dataMap.remove("standardTime"); + dataMap.remove("workingTime"); return dataMap; } @@ -221,15 +237,15 @@ public class JxCenterWorkingBoardBusiTwoService implements IJxCenterWorkingBoard Map> itemMap2OutPut = CollectionUtils.isEmpty(outPutList) ? null : outPutList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesOutPutStatistics::getWorkOrderNo)); - psData.addChartData(partNo, statisticsPlanQty(orderList, itemMap2OutPut), getOutPutStatisticsList2AmountQty(outPutList), !CollectionUtils.isEmpty(psData.getChartDataList()) ? "#ffffff" : "#00ff00"); + psData.addChartData(partNo, statisticsPlanQty(orderList, itemMap2OutPut, workCenterExtDb), getOutPutStatisticsList2AmountQty(outPutList), !CollectionUtils.isEmpty(psData.getChartDataList()) ? "#ffffff" : "#00ff00"); } return psData; } - private Double statisticsPlanQty(List orderList, Map> itemMap2OutPut) { + private Double statisticsPlanQty(List orderList, Map> itemMap2OutPut, MesWorkCenterExt workCenterExtDb) { return CollectionUtils.isEmpty(orderList) ? new Double(0) : - orderList.stream().filter(o -> null != o).mapToDouble(o -> MathOperation.add(MathOperation.sub(o.getQty(), o.getCompleteQty()), getOutPutQty(o.getOrderNo(), itemMap2OutPut))).sum(); + orderList.stream().filter(o -> null != o).mapToDouble(o -> o.getStartTime().contains(workCenterExtDb.getWorkTime()) ? o.getQty() : MathOperation.add(MathOperation.sub(o.getQty(), o.getCompleteQty()), getOutPutQty(o.getOrderNo(), itemMap2OutPut))).sum(); } private Double getOutPutQty(String workOrderNo, Map> itemMap2OutPut) {