From aa1964420ea01519b3d72a049aea822e8f0e6d54 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 13 Dec 2023 09:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jx/JxCenterWorkingBoardCenterTwoService.java | 4 +- .../jx/JxCenterWorkingBoardDispatchService.java | 6 +++ .../jx/JxCenterWorkingBoardProxyAssistService.java | 53 ++++++++++++++++++++++ .../jx/JxCenterWorkingBoardProxySpcPmService.java | 11 ++++- 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyAssistService.java diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java index 4119ed4..8920c70 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java @@ -189,6 +189,8 @@ public class JxCenterWorkingBoardCenterTwoService extends JxCenterWorkingBoardCo List workOrderList2Sort = getWorkOrderList2Sort(workOrderList, outPutStatisticsList, workCenterExtDb); + outPutStatisticsList = sortOutPutStatisticsList(outPutStatisticsList); + Set partNoList = new TreeSet<>(); if (!CollectionUtils.isEmpty(outPutStatisticsList)) partNoList.add(outPutStatisticsList.get(0).getPartNo()); if (!CollectionUtils.isEmpty(workOrderList2Sort)) workOrderList2Sort.stream().filter(o -> null != o).forEach(o -> partNoList.add(o.getPartNo())); @@ -206,7 +208,7 @@ public class JxCenterWorkingBoardCenterTwoService extends JxCenterWorkingBoardCo Map> itemMap2OutPut = getOutPutStatisticsMapByOrderNo(outPutList); - psData.addChartData2ChartDataLists(5, partNo, statisticsPlanQty(orderList, itemMap2OutPut, workCenterExtDb), getOutPutStatisticsList2AmountQty(outPutList), !CollectionUtils.isEmpty(psData.getChartDataLists()) ? "#ffffff" : "#008000"); + psData.addChartData2ChartDataLists(5, partNo, statisticsPlanQty(orderList, itemMap2OutPut, workCenterExtDb), getOutPutStatisticsList2AmountQty(outPutList), !CollectionUtils.isEmpty(psData.getChartDataLists()) ? null : "#008000"); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java index 47116d1..3fb851e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java @@ -58,6 +58,12 @@ public class JxCenterWorkingBoardDispatchService implements IJxCenterWorkingBoar new JxCenterWorkingBoardProxyOrderService(new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxySpcrService(new JxCenterWorkingBoardProxySpcPmService()))) )).queryCenterWorkingBoardData(dataMap); +// case "workDaily": +// return new JxCenterWorkingBoardWatchService(new JxCenterWorkingBoardWorkDailyService( +// new JxCenterWorkingBoardProxyCenterService(), +// new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxySpcrService(new JxCenterWorkingBoardProxySpcPmService(new JxCenterWorkingBoardProxyAssistService()))) +// )).queryCenterWorkingBoardData(dataMap); + default: return dataMap; } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyAssistService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyAssistService.java new file mode 100644 index 0000000..2207f4f --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyAssistService.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi.jx; + +import cn.estsh.i3plus.ext.mes.api.busi.jx.IJxCenterWorkingBoardService; +import cn.estsh.i3plus.ext.mes.pojo.bean.MesAssistOutAndEnter; +import cn.estsh.i3plus.ext.mes.pojo.bean.MesShiftProdCenterPm; +import cn.estsh.i3plus.ext.mes.pojo.repository.MesAssistOutAndEnterRepository; +import cn.estsh.i3plus.ext.mes.pojo.repository.MesShiftProdCenterPmRepository; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.impp.framework.boot.util.SpringContextsUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import java.util.List; +import java.util.Map; + +/** + * @Author : wangjie + * @CreateDate : 2022-02-15 + * @Modify: + **/ +@Slf4j +public class JxCenterWorkingBoardProxyAssistService implements IJxCenterWorkingBoardService { + + private MesAssistOutAndEnterRepository assistOutAndEnterRepository; + + public JxCenterWorkingBoardProxyAssistService() { + this.assistOutAndEnterRepository = (MesAssistOutAndEnterRepository) SpringContextsUtil.getBean("mesAssistOutAndEnterRepository"); + } + + @Override + public Map queryCenterWorkingBoardData(Map dataMap) { + + String organizeCode = (String) dataMap.get(MesExtConstWords.ORGANIZE_CODE); + String workCenterCode = (String) dataMap.get(MesExtConstWords.WORK_CENTER_CODE); + String startTime = (String) dataMap.get(MesExtConstWords.START_TIME); + String endTime = (String) dataMap.get(MesExtConstWords.END_TIME); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.timeBuilder(startTime, endTime, MesExtConstWords.WORK_TIME, true, true, packBean); + List assistOutAndEnterList = assistOutAndEnterRepository.findByHqlWhere(packBean); + + if (CollectionUtils.isEmpty(assistOutAndEnterList)) return dataMap; + + dataMap.put(MesAssistOutAndEnter.class.getSimpleName(), assistOutAndEnterList); + + return dataMap; + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxySpcPmService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxySpcPmService.java index 3354aba..b22bb04 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxySpcPmService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxySpcPmService.java @@ -23,15 +23,22 @@ import java.util.Map; @Slf4j public class JxCenterWorkingBoardProxySpcPmService implements IJxCenterWorkingBoardService { + private IJxCenterWorkingBoardService proxyService; + private MesShiftProdCenterPmRepository shiftProdCenterPmRepository; - public JxCenterWorkingBoardProxySpcPmService() { - this.shiftProdCenterPmRepository = (MesShiftProdCenterPmRepository) SpringContextsUtil.getBean("mesShiftProdCenterPmRepository"); + public JxCenterWorkingBoardProxySpcPmService() {} + public JxCenterWorkingBoardProxySpcPmService(IJxCenterWorkingBoardService proxyService) { + this.proxyService = proxyService; } @Override public Map queryCenterWorkingBoardData(Map dataMap) { + if (null != proxyService) proxyService.queryCenterWorkingBoardData(dataMap); + + this.shiftProdCenterPmRepository = (MesShiftProdCenterPmRepository) SpringContextsUtil.getBean("mesShiftProdCenterPmRepository"); + String organizeCode = (String) dataMap.get(MesExtConstWords.ORGANIZE_CODE); String workCenterCode = (String) dataMap.get(MesExtConstWords.WORK_CENTER_CODE); String workTime = (String) dataMap.get(MesExtConstWords.WORK_TIME);