From 4d724fb8ae435d114e2091cbab3071a4a40785fd Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 14 Jul 2025 14:48:24 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=202025=E6=8A=A5=E8=A1=A8=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityDefectsStatisticalAnalysis.java | 15 +++ .../impl/ProductionReportServiceImpl.java | 16 +++ .../impl/QualityReportServiceImpl.java | 15 +-- .../mapper/report/GeneralReportMapper.xml | 104 ++++++++++++------ .../RecordElectricalInspectionMapper.xml | 1 + 5 files changed, 108 insertions(+), 43 deletions(-) diff --git a/aucma-report/src/main/java/com/aucma/report/domain/QualityDefectsStatisticalAnalysis.java b/aucma-report/src/main/java/com/aucma/report/domain/QualityDefectsStatisticalAnalysis.java index effca50..0a1dbfc 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/QualityDefectsStatisticalAnalysis.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/QualityDefectsStatisticalAnalysis.java @@ -48,6 +48,13 @@ public class QualityDefectsStatisticalAnalysis extends BaseEntity { @JsonProperty("REWORK_NUMBER") private Long REWORK_NUMBER; + /** + * 合计数量 + */ + @Excel(name = "合计数量") + @JsonProperty("INSPECTION_NUMBER") + private Long INSPECTION_NUMBER; + /** * 合格率(%) */ @@ -55,6 +62,14 @@ public class QualityDefectsStatisticalAnalysis extends BaseEntity { @JsonProperty("RATE") private String RATE; + public Long getINSPECTION_NUMBER() { + return INSPECTION_NUMBER; + } + + public void setINSPECTION_NUMBER(Long INSPECTION_NUMBER) { + this.INSPECTION_NUMBER = INSPECTION_NUMBER; + } + public String getFACTORY_NAME() { return FACTORY_NAME; } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java index 9ece00f..f037676 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java @@ -122,6 +122,22 @@ public class ProductionReportServiceImpl implements IProductionReportService { * */ public List materialReportList(Map hashMap){ List Materials = reportMapper.materialReportList(hashMap); + if (Materials.size() > 0){ + MaterialReport materialReport = new MaterialReport(); + materialReport.setMES_SN_BINDING_COUNT(0); + materialReport.setFINISHED_PRODUCT_SCAN_COUNT(0); + materialReport.setFINISHED_PRODUCT_PALLETIZING_COUNT(0); + materialReport.setMATERIAL_NAME("合计"); + for (MaterialReport material : Materials) { + Integer mesSnBindingCount = materialReport.getMES_SN_BINDING_COUNT() + material.getMES_SN_BINDING_COUNT(); + Integer finishedProductScanCount = materialReport.getFINISHED_PRODUCT_SCAN_COUNT() + material.getFINISHED_PRODUCT_SCAN_COUNT(); + Integer finishedProductPalletizingCount = materialReport.getFINISHED_PRODUCT_PALLETIZING_COUNT() + material.getFINISHED_PRODUCT_PALLETIZING_COUNT(); + materialReport.setMES_SN_BINDING_COUNT(mesSnBindingCount); + materialReport.setFINISHED_PRODUCT_SCAN_COUNT(finishedProductScanCount); + materialReport.setFINISHED_PRODUCT_PALLETIZING_COUNT(finishedProductPalletizingCount); + } + Materials.add(materialReport); + } return Materials; } } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java index 22173df..2824ed9 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java @@ -161,6 +161,12 @@ public class QualityReportServiceImpl implements IQualityReportService { */ @Override public List repairRateReportList(Map hashMap) { +// if (hashMap.containsKey("PRODUCT_LINE_CODE")) { +// String productLineCode = String.valueOf(hashMap.get("PRODUCT_LINE_CODE")); +// if (productLineCode.equals("MF_01")){ +// hashMap.put("PRODUCT_LINE_CODE", "CX_02"); +// } +// } if (hashMap.containsKey("stationCodeList")) { String[] stationCodeLists = String.valueOf(hashMap.get("stationCodeList")).split(","); hashMap.put("stationCodeList", stationCodeLists); @@ -182,8 +188,6 @@ public class QualityReportServiceImpl implements IQualityReportService { } //周 else if (hashMap.get("month").equals("2")){ - - Object year = String.valueOf(hashMap.get("year")); String beginTime = year + "-01-01"; String endTime = year + "-12-31"; @@ -194,9 +198,8 @@ public class QualityReportServiceImpl implements IQualityReportService { List collect = repairRateReports.stream().collect(Collectors.collectingAndThen( Collectors.toCollection(()->new TreeSet<>(Comparator.comparing(RepairRateReport::getCOLUMN_A))),ArrayList::new )); - List repairRateReportsSumWeek = new ArrayList<>(); - for (int i = 0; i < collect.size(); i++){ + for (int i = 0; i < collect.size(); i++){ for (int j=0;j ) - SELECT - ROW_NUMBER() OVER (ORDER BY RATE) AS SEQ, + SELECT ROW_NUMBER() OVER (ORDER BY RATE) AS SEQ, SD.QUALITY_DEFECT_NAME, + SD.MATERIAL_MODEL, SD.DEFECT_NUMBER, RATE - FROM ( - SELECT - DA.QUALITY_DEFECT_NAME, - COUNT(*) AS DEFECT_NUMBER, + FROM (SELECT DA.QUALITY_DEFECT_NAME, + DA.MATERIAL_MODEL, + COUNT(*) AS DEFECT_NUMBER, TO_CHAR(ROUND(COUNT(*) / TD.ALL_DEFECT * 100, 2), 'FM99990.00') || '%' AS RATE - FROM ( - SELECT - RQI.QUALITY_DEFECT_NAME, + FROM (SELECT RQI.QUALITY_DEFECT_NAME, RQI.BAR_CODE, + GET_MATERIAL_TYPE(RQI.MATERIAL_NAME) MATERIAL_MODEL, RQI.QUALITY_DEFECT_CODE - FROM - REPORT_QUALITY_INSPECTION RQI - WHERE - RQI.TREATMENT_MEASURE = 1 + FROM REPORT_QUALITY_INSPECTION RQI + WHERE RQI.TREATMENT_MEASURE = 1 AND RQI.STATION_CODE = #{stationCode} AND TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') BETWEEN #{beginBeginTime} AND #{endBeginTime} - GROUP BY - RQI.QUALITY_DEFECT_NAME, RQI.BAR_CODE, RQI.QUALITY_DEFECT_CODE - ) DA + GROUP BY RQI.QUALITY_DEFECT_NAME, RQI.BAR_CODE, GET_MATERIAL_TYPE(RQI.MATERIAL_NAME), + RQI.QUALITY_DEFECT_CODE) DA CROSS JOIN TotalDefects TD - GROUP BY - DA.QUALITY_DEFECT_NAME, TD.ALL_DEFECT - ) SD - ORDER BY DEFECT_NUMBER DESC + GROUP BY DA.QUALITY_DEFECT_NAME, DA.MATERIAL_MODEL, TD.ALL_DEFECT) SD + ORDER BY SD.MATERIAL_MODEL, DEFECT_NUMBER DESC