From b4f7aad050011dac37f5cc6e1bc6ea0c4bd56ef6 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 26 Jun 2024 19:36:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=BC=80=E6=A8=A1=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1job=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busi/IMesProdMouldStatisticsService.java | 3 +++ .../daoimpl/MesProdMouldStatisticsDaoImpl.java | 2 +- .../busi/MesProdMouldStatisticsServiceImpl.java | 24 +++++++++------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdMouldStatisticsService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdMouldStatisticsService.java index 1e8c256..502cd5f 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdMouldStatisticsService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProdMouldStatisticsService.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.ext.mes.pcn.api.busi; +import io.swagger.annotations.ApiOperation; + /** * @Description : 生产开模统计 * @Reference : @@ -9,5 +11,6 @@ package cn.estsh.i3plus.ext.mes.pcn.api.busi; **/ public interface IMesProdMouldStatisticsService { + @ApiOperation("汇总生产开模统计") void doSumMesProdMouldStatistics(String organizeCode, Integer pageSize, String userName); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProdMouldStatisticsDaoImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProdMouldStatisticsDaoImpl.java index 443f126..691d479 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProdMouldStatisticsDaoImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProdMouldStatisticsDaoImpl.java @@ -56,7 +56,7 @@ public class MesProdMouldStatisticsDaoImpl implements IMesProdMouldStatisticsDao query.setParameter("organizeCode", organizeCode); query.setParameter("isValid", CommonEnumUtil.VALID); query.setParameter("isDeleted", CommonEnumUtil.FALSE); - query.setParameter("ids", idList); + query.setParameter("idList", idList); query.setParameter("moduleStatisticsStatus", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("modifyUser", userName); if (updateSyncStatus) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProdMouldStatisticsServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProdMouldStatisticsServiceImpl.java index 633a66d..1b1a661 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProdMouldStatisticsServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProdMouldStatisticsServiceImpl.java @@ -62,17 +62,11 @@ public class MesProdMouldStatisticsServiceImpl implements IMesProdMouldStatistic return; } Map> undStatisticsMesProdMouldRecordMap = undStatisticsMesProdMouldRecordList.stream().collect(Collectors.groupingBy(MesProdMouldRecord::getEquipmentCode)); - //查询加工记录表 - Map> productionRecordMap = getProductionRecordMap(organizeCode, undStatisticsMesProdMouldRecordList.stream().map(MesProdMouldRecord::getId).collect(Collectors.toList())); //数据处理 - List mesProductionRecordList = new ArrayList<>(); for (MesMouldMappingCfg mesMouldMappingCfg : getMesMouldMappingCfgs(organizeCode, new ArrayList<>(undStatisticsMesProdMouldRecordMap.keySet()))) { List mesProdMouldRecords = undStatisticsMesProdMouldRecordMap.get(mesMouldMappingCfg.getEquipmentCode()); //更新开模记录数据 mesProdMouldRecords.forEach(mesProdMouldRecord -> { - if (!Objects.isNull(productionRecordMap) && productionRecordMap.containsKey(mesProdMouldRecord.getId())) { - mesProductionRecordList.addAll(productionRecordMap.get(mesProdMouldRecord.getId())); - } mesProdMouldRecord.setAssetNum(mesMouldMappingCfg.getAssetNum()); mesProdMouldRecord.setMeterName(mesMouldMappingCfg.getMeterName()); mesProdMouldRecord.setSystemSyncStatus(CommonEnumUtil.FALSE); @@ -83,6 +77,13 @@ public class MesProdMouldStatisticsServiceImpl implements IMesProdMouldStatistic saveMesProdMouldStatistics(organizeCode, userName, mesMouldMappingCfg, mesProdMouldRecords); } //更新加工记录表状态 + updateMesProductionRecord(organizeCode, userName, undStatisticsMesProdMouldRecordList.stream().map(MesProdMouldRecord::getId).collect(Collectors.toList())); + } + + private void updateMesProductionRecord(String organizeCode, String userName, List idList) { + //查询加工记录表 + List mesProductionRecordList = getProductionRecordList(organizeCode, idList); + //更新加工记录表状态 if (!CollectionUtils.isEmpty(mesProductionRecordList)) { List noUpdateSyncStatusId = mesProductionRecordList.stream().filter(t -> MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue() == t.getReportStatus()).map(MesProductionRecord::getId).collect(Collectors.toList()); List updateSyncStatusId = mesProductionRecordList.stream().filter(t -> MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue() != t.getReportStatus()).map(MesProductionRecord::getId).collect(Collectors.toList()); @@ -132,17 +133,12 @@ public class MesProdMouldStatisticsServiceImpl implements IMesProdMouldStatistic private List getMesMouldMappingCfgs(String organizeCode, List equipmentCodeList) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(equipmentCodeList, "equipmentCode", packBean); - List mesMouldMappingCfgs = mesMouldMappingCfgRDao.findByHqlWhere(packBean); - return mesMouldMappingCfgs; + return mesMouldMappingCfgRDao.findByHqlWhere(packBean); } - private Map> getProductionRecordMap(String organizeCode, List idList) { + private List getProductionRecordList(String organizeCode, List idList) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(idList, "mouldRecordId", packBean); - List productionRecordList = mesProductionRecordRDao.findByHqlWhere(packBean); - if (!CollectionUtils.isEmpty(productionRecordList)) { - return productionRecordList.stream().collect(Collectors.groupingBy(MesProductionRecord::getMouldRecordId)); - } - return null; + return mesProductionRecordRDao.findByHqlWhere(packBean); } }