From ffa9deb112fb21e6bbfd931bac9f3f40c63f6a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Thu, 9 Jan 2025 19:31:00 +0800 Subject: [PATCH] revert 7831a818223aa72ecdf8e1bb4eb67a4cc15503a3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert 44746 产量统计报表增加报工调整数据查询 --- .../report/IMesProductionRecordReportExtDao.java | 2 +- .../report/MesProductionRecordReportExtDao.java | 41 +++++++++------------- .../MesProductionRecordReportExtService.java | 19 ++++------ .../report/MesProductionRecordReportExtModel.java | 3 ++ 4 files changed, 27 insertions(+), 38 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesProductionRecordReportExtDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesProductionRecordReportExtDao.java index 0256419..38f5001 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesProductionRecordReportExtDao.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesProductionRecordReportExtDao.java @@ -15,6 +15,6 @@ import java.util.List; **/ public interface IMesProductionRecordReportExtDao { - ListPager queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager, List reportStatusList2Pr, List reportStatusList2Wo); + ListPager queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager, List reportStatusList); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesProductionRecordReportExtDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesProductionRecordReportExtDao.java index bfd47ae..14603b8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesProductionRecordReportExtDao.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesProductionRecordReportExtDao.java @@ -34,8 +34,7 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo private EntityManager entityManager; @Override - public ListPager queryProductionRecordUnionWorkOrderLogReport( - MesProductionRecordReportExtModel model, Pager pager, List reportStatusList2Pr, List reportStatusList2Wo) { + public ListPager queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager, List reportStatusList) { List resultList = new ArrayList<>(); @@ -49,7 +48,7 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo StringBuilder endHql = new StringBuilder(); StringBuilder limitHql = new StringBuilder(); - if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) { + if (!CollectionUtils.isEmpty(reportStatusList) && model.getIsQueryWo()) { unionQueryHql.append("SELECT " + " o.workCenterCode, " + " o.workCellCode, " + @@ -71,7 +70,7 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo countQueryHql.append("SELECT count(1) FROM ( "); } - if (!CollectionUtils.isEmpty(reportStatusList2Pr)) { + if (!CollectionUtils.isEmpty(reportStatusList)) { prQueryHql.append("" + " SELECT " + " a.work_center_code AS workCenterCode, " + @@ -93,7 +92,7 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo " AND a.is_valid = :isValid " + " AND a.complete_date_time >= :completeDateTimeStart " + " AND a.complete_date_time <= :completeDateTimeEnd "); - if (reportStatusList2Pr.size() == 1) { + if (reportStatusList.size() == 1) { prQueryHql.append(" AND a.report_status = :reportStatus "); } else { prQueryHql.append(" AND a.report_status in (:reportStatus) "); @@ -124,11 +123,11 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo } - if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) { + if (!CollectionUtils.isEmpty(reportStatusList) && model.getIsQueryWo()) { prQueryHql.append(" ) UNION ALL ( "); } - if (!CollectionUtils.isEmpty(reportStatusList2Wo)) { + if (model.getIsQueryWo()) { woQueryHql.append("" + " SELECT " + " b.work_center_code AS workCenterCode, " + @@ -169,7 +168,7 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo } - if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) { + if (!CollectionUtils.isEmpty(reportStatusList) && model.getIsQueryWo()) { endHql.append(" )) AS o "); } else { endHql.append(" ) AS o "); @@ -177,11 +176,11 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo limitHql.append(" LIMIT :startRow , :pageSize "); - if (!CollectionUtils.isEmpty(reportStatusList2Pr) && !CollectionUtils.isEmpty(reportStatusList2Wo)) { + if (!CollectionUtils.isEmpty(reportStatusList) && model.getIsQueryWo()) { queryHql.append(unionQueryHql).append(prQueryHql).append(woQueryHql).append(endHql).append(limitHql); countHql.append(countQueryHql).append(prQueryHql).append(woQueryHql).append(endHql); } else { - if (!CollectionUtils.isEmpty(reportStatusList2Pr)) { + if (!CollectionUtils.isEmpty(reportStatusList)) { queryHql.append(prQueryHql).append(limitHql); countHql.append(countQueryHql).append(prQueryHql).append(endHql); } else { @@ -194,9 +193,9 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo // log.info("countHql: --- {}", countHql.toString()); Query dataQuery = entityManager.createNativeQuery(queryHql.toString()); - setQueryParams(dataQuery, model, reportStatusList2Pr, reportStatusList2Wo, pager); + setQueryParams(dataQuery, model, reportStatusList, pager); Query countQuery = entityManager.createNativeQuery(countHql.toString()); - setQueryParams(countQuery, model, reportStatusList2Pr, reportStatusList2Wo, null); + setQueryParams(countQuery, model, reportStatusList, null); Object o = countQuery.getSingleResult(); @@ -232,26 +231,20 @@ public class MesProductionRecordReportExtDao implements IMesProductionRecordRepo } - private void setQueryParams(Query query, MesProductionRecordReportExtModel model, List reportStatusList2Pr, List reportStatusList2Wo, Pager pager) { + private void setQueryParams(Query query, MesProductionRecordReportExtModel model, List reportStatusList, Pager pager) { query.setParameter(MesExtConstWords.ORGANIZE_CODE, model.getOrganizeCode()); query.setParameter(MesExtConstWords.IS_DELETED, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); query.setParameter(MesExtConstWords.IS_VALID, CommonEnumUtil.IS_VAILD.VAILD.getValue()); query.setParameter(MesExtConstWords.COMPLETE_DATE_TIME_START, model.getCompleteDateTimeStart()); query.setParameter(MesExtConstWords.COMPLETE_DATE_TIME_END, model.getCompleteDateTimeEnd()); - if (!CollectionUtils.isEmpty(reportStatusList2Pr)) { - if (reportStatusList2Pr.size() == 1) { - query.setParameter(MesExtConstWords.REPORT_STATUS, reportStatusList2Pr.get(0)); + if (!CollectionUtils.isEmpty(reportStatusList)) { + if (reportStatusList.size() == 1) { + query.setParameter(MesExtConstWords.REPORT_STATUS, reportStatusList.get(0)); } else { - query.setParameter(MesExtConstWords.REPORT_STATUS, reportStatusList2Pr); - } - } - if (!CollectionUtils.isEmpty(reportStatusList2Wo)) { - if (reportStatusList2Pr.size() == 1) { - query.setParameter(MesExtConstWords.MESSAGE_TYPE, reportStatusList2Wo.get(0)); - } else { - query.setParameter(MesExtConstWords.MESSAGE_TYPE, reportStatusList2Wo); + query.setParameter(MesExtConstWords.REPORT_STATUS, reportStatusList); } } + if (model.getIsQueryWo()) query.setParameter(MesExtConstWords.MESSAGE_TYPE, MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT.getValue()); if (!StringUtils.isEmpty(model.getPartNo())) { query.setParameter(MesExtConstWords.PART_NO, model.getPartNo()); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java index aa62783..22f61e7 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java @@ -36,15 +36,11 @@ public class MesProductionRecordReportExtService implements IMesProductionRecord public ListPager queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager) { List reportStatusList = !StringUtils.isEmpty(model.getReportStatusList()) - ? Arrays.asList(model.getReportStatusList().split(MesExtConstWords.COMMA)).stream().map(Integer::parseInt).collect(Collectors.toList()) : - Stream.of(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_10.getValue(), - MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_20.getValue(), - MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_30.getValue(), - MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_40.getValue() - ).collect(Collectors.toList()); + ? Arrays.asList(model.getReportStatusList().split(MesExtConstWords.COMMA)).stream().map(Integer::parseInt).collect(Collectors.toList()) + : Stream.of(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_10.getValue(), + MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_20.getValue(), MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_30.getValue()).collect(Collectors.toList()); List reportStatusList2Pr = null; - List reportStatusList2Wo = null; if (reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_10.getValue())) { reportStatusList2Pr = new ArrayList<>(); reportStatusList2Pr.add(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue()); @@ -55,13 +51,10 @@ public class MesProductionRecordReportExtService implements IMesProductionRecord reportStatusList2Pr.add(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_20.getValue()); } - if (StringUtils.isEmpty(model.getWorkCellCode()) && StringUtils.isEmpty(model.getEquipmentCode())) { - reportStatusList2Wo = new ArrayList<>(); - if (reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_30.getValue())) reportStatusList2Wo.add(MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT.getValue()); - if (reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_40.getValue())) reportStatusList2Wo.add(MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT_ADJUST.getValue()); - } + if (StringUtils.isEmpty(model.getWorkCellCode()) && StringUtils.isEmpty(model.getEquipmentCode()) && + reportStatusList.contains(MesExtEnumUtil.PRODUCTION_RECORD_QUREY_REPORT_STATUS.REPORT_STATUS_30.getValue())) model.setIsQueryWo(true); - ListPager listPager = productionRecordReportExtDao.queryProductionRecordUnionWorkOrderLogReport(model, pager, reportStatusList2Pr, reportStatusList2Wo); + ListPager listPager = productionRecordReportExtDao.queryProductionRecordUnionWorkOrderLogReport(model, pager, reportStatusList2Pr); return listPager; diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesProductionRecordReportExtModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesProductionRecordReportExtModel.java index 93262bb..5a2a8fc 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesProductionRecordReportExtModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesProductionRecordReportExtModel.java @@ -59,6 +59,9 @@ public class MesProductionRecordReportExtModel implements Serializable { @ApiParam("汇报状态名称") private String reportStatusName; + @ApiParam("是否查询工单日志表") + private Boolean isQueryWo = false; + public MesProductionRecordReportExtModel() {} public MesProductionRecordReportExtModel(Object workCenterCode, Object workCellCode, Object partNo, Object partName, Object shiftCode, Object equipmentCode, Object equipmentName, Object reportStatus, Object dataSource, Object qty) {