From ec6912a62d8b833aaff3e87d5c71780ebe763e78 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 29 Sep 2025 11:28:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mapper):=20=E7=A7=BB=E9=99=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5=E5=89=8D=E7=BC=80C##AUCMA?= =?UTF-8?q?=5FMES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 GeneralReportMapper.xml 中的 BASE_PRODUCTLINE 和 BASE_MATERIALINFO 表连接语句 - 简化 PdaBindingMapper.xml 中的 BASE_ORDERINFO 表关联方式- 修改 PrintSupplementBarCodeMapper.xml 的 MATERIALINFO 表左连接路径 - 调整 RecordElectricalInspectionMapper.xml 中的物料信息及质检项表连接逻辑 - 优化 ReportQualityInspectionMapper.xml 中两个查询的 MATERIALINFO 和 PROCESS_STATION 关联配置 --- aucma-api/src/main/resources/mapper/PdaBindingMapper.xml | 2 +- .../main/resources/mapper/report/GeneralReportMapper.xml | 8 ++++---- .../mapper/report/PrintSupplementBarCodeMapper.xml | 2 +- .../mapper/report/RecordElectricalInspectionMapper.xml | 6 +++--- .../mapper/report/ReportQualityInspectionMapper.xml | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml index 23af058..cb04561 100644 --- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml +++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml @@ -8,7 +8,7 @@ diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index ca8aa13..e18f7f6 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -1201,9 +1201,9 @@ - + - + @@ -1237,9 +1237,9 @@ FROM c##AUCMA_SCADA.MATERIAL_COMPLETION mc LEFT JOIN - c##AUCMA_MES.BASE_PRODUCTLINE bp ON mc.PRODUCT_LINE_CODE = bp.PRODUCT_LINE_CODE + BASE_PRODUCTLINE bp ON mc.PRODUCT_LINE_CODE = bp.PRODUCT_LINE_CODE LEFT JOIN - c##AUCMA_MES.BASE_MATERIALINFO m ON mc.MATERIAL_CODE = m.MATERIAL_CODE + BASE_MATERIALINFO m ON mc.MATERIAL_CODE = m.MATERIAL_CODE AND ( diff --git a/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml b/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml index 1f1c438..534488e 100644 --- a/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/PrintSupplementBarCodeMapper.xml @@ -34,7 +34,7 @@ PB.PRODUCT_LINE_CODE, CASE WHEN PS.IS_PRINT = '1' THEN '已打印' ELSE '未打印' END IS_PRINT FROM C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE PS - LEFT JOIN C##AUCMA_MES.BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = PS.MATERIAL_CODE + LEFT JOIN BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = PS.MATERIAL_CODE LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = PS.MATERIAL_CODE diff --git a/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml index 750b5fb..985f841 100644 --- a/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/RecordElectricalInspectionMapper.xml @@ -44,7 +44,7 @@ NG.QUALITY_DEFECT_NAMES, ei.RECORDTIME FROM RECORD_ELECTRICALINSPECTION ei - LEFT JOIN C##AUCMA_MES.BASE_MATERIALINFO MI ON MI.MATERIAL_CODE = SUBSTR(ei.BARCODE, 8, 10) + LEFT JOIN BASE_MATERIALINFO MI ON MI.MATERIAL_CODE = SUBSTR(ei.BARCODE, 8, 10) LEFT JOIN (SELECT SD.UUID, LISTAGG(QI.QUALITY_DEFECT_NAME, ',') WITHIN GROUP (ORDER BY QI.QUALITY_DEFECT_NAME) AS QUALITY_DEFECT_NAMES @@ -59,7 +59,7 @@ FROM DETAIL_ELECTRICALINSPECTION DE WHERE DE.TESTRESULT = 'NG' ) SD - LEFT JOIN C##AUCMA_MES.BASE_QUALITY_INSPECTION_ITEM QI + LEFT JOIN BASE_QUALITY_INSPECTION_ITEM QI ON QI.QUALITY_DEFECT_CODE = SD.QUALITY_DEFECT_CODE GROUP BY SD.UUID) NG ON NG.UUID = ei.TESTDATA @@ -102,7 +102,7 @@ b.recordtime as sub_recordtime from record_electricalinspection a left join detail_electricalinspection b on b.uuid = a.testdata - LEFT JOIN C##AUCMA_MES.BASE_QUALITY_INSPECTION_ITEM QI + LEFT JOIN BASE_QUALITY_INSPECTION_ITEM QI ON QI.QUALITY_DEFECT_CODE = (CASE WHEN b.TESTRESULT = 'NG' AND b.PROJECTNAME = 'lvs' THEN '5001' diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml index f5849d4..923a97c 100644 --- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml @@ -220,8 +220,8 @@ 0 REWORK_NUMBER, 1 IS_FLAG FROM C##AUCMA_SCADA.PRINT_BARCODE PB - JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE - JOIN C##AUCMA_MES.BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2005%' + JOIN BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE + JOIN BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2005%' WHERE PB.MATERIAL_BARCODE = #{barcode} @@ -238,8 +238,8 @@ 0 REWORK_NUMBER, 1 IS_FLAG FROM C##AUCMA_SCADA.PRINT_BARCODE PB - JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE - JOIN C##AUCMA_MES.BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2105%' + JOIN BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE + JOIN BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2105%' WHERE PB.MATERIAL_BARCODE = #{barcode}