refactor(mapper): 移除数据库链接前缀C##AUCMA_MES

- 更新 GeneralReportMapper.xml 中的 BASE_PRODUCTLINE 和 BASE_MATERIALINFO 表连接语句
- 简化 PdaBindingMapper.xml 中的 BASE_ORDERINFO 表关联方式- 修改 PrintSupplementBarCodeMapper.xml 的 MATERIALINFO 表左连接路径
- 调整 RecordElectricalInspectionMapper.xml 中的物料信息及质检项表连接逻辑
- 优化 ReportQualityInspectionMapper.xml 中两个查询的 MATERIALINFO 和 PROCESS_STATION 关联配置
master
zangch@mesnac.com 3 months ago
parent b90442c89c
commit ec6912a62d

@ -8,7 +8,7 @@
<select id="selectBoxNameByCode" resultType="string"> <select id="selectBoxNameByCode" resultType="string">
SELECT BO.MATERIAL_NAME SELECT BO.MATERIAL_NAME
FROM C##AUCMA_SCADA.PRINT_BARCODE PB FROM C##AUCMA_SCADA.PRINT_BARCODE PB
LEFT JOIN C##AUCMA_MES.BASE_ORDERINFO BO ON BO.ORDER_CODE = PB.ORDER_CODE LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = PB.ORDER_CODE
WHERE PB.MATERIAL_BARCODE = #{boxCode} WHERE PB.MATERIAL_BARCODE = #{boxCode}
GROUP BY BO.MATERIAL_NAME GROUP BY BO.MATERIAL_NAME
</select> </select>

@ -1201,9 +1201,9 @@
<!-- FROM--> <!-- FROM-->
<!-- c##AUCMA_SCADA.MATERIAL_COMPLETION mc--> <!-- c##AUCMA_SCADA.MATERIAL_COMPLETION mc-->
<!-- LEFT JOIN--> <!-- 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--> <!-- 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-->
<!-- <where>--> <!-- <where>-->
<!-- <if test="productLineName != null and productLineName != ''">--> <!-- <if test="productLineName != null and productLineName != ''">-->
<!-- AND bp.PRODUCT_LINE_NAME = #{productLineName}--> <!-- AND bp.PRODUCT_LINE_NAME = #{productLineName}-->
@ -1237,9 +1237,9 @@
FROM FROM
c##AUCMA_SCADA.MATERIAL_COMPLETION mc c##AUCMA_SCADA.MATERIAL_COMPLETION mc
LEFT JOIN 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 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
<where> <where>
<if test="productLineName != null and productLineName != ''"> <if test="productLineName != null and productLineName != ''">
AND ( AND (

@ -34,7 +34,7 @@
PB.PRODUCT_LINE_CODE, PB.PRODUCT_LINE_CODE,
CASE WHEN PS.IS_PRINT = '1' THEN '已打印' ELSE '未打印' END IS_PRINT CASE WHEN PS.IS_PRINT = '1' THEN '已打印' ELSE '未打印' END IS_PRINT
FROM C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE PS 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 LEFT JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = PS.MATERIAL_CODE
</sql> </sql>

@ -44,7 +44,7 @@
NG.QUALITY_DEFECT_NAMES, NG.QUALITY_DEFECT_NAMES,
ei.RECORDTIME ei.RECORDTIME
FROM RECORD_ELECTRICALINSPECTION ei 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, LEFT JOIN (SELECT SD.UUID,
LISTAGG(QI.QUALITY_DEFECT_NAME, ',') LISTAGG(QI.QUALITY_DEFECT_NAME, ',')
WITHIN GROUP (ORDER BY QI.QUALITY_DEFECT_NAME) AS QUALITY_DEFECT_NAMES WITHIN GROUP (ORDER BY QI.QUALITY_DEFECT_NAME) AS QUALITY_DEFECT_NAMES
@ -59,7 +59,7 @@
FROM DETAIL_ELECTRICALINSPECTION DE FROM DETAIL_ELECTRICALINSPECTION DE
WHERE DE.TESTRESULT = 'NG' WHERE DE.TESTRESULT = 'NG'
) SD ) 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 ON QI.QUALITY_DEFECT_CODE = SD.QUALITY_DEFECT_CODE
GROUP BY SD.UUID) NG ON NG.UUID = ei.TESTDATA GROUP BY SD.UUID) NG ON NG.UUID = ei.TESTDATA
</sql> </sql>
@ -102,7 +102,7 @@
b.recordtime as sub_recordtime b.recordtime as sub_recordtime
from record_electricalinspection a from record_electricalinspection a
left join detail_electricalinspection b on b.uuid = a.testdata 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 ON QI.QUALITY_DEFECT_CODE = (CASE
WHEN b.TESTRESULT = 'NG' AND b.PROJECTNAME = 'lvs' WHEN b.TESTRESULT = 'NG' AND b.PROJECTNAME = 'lvs'
THEN '5001' THEN '5001'

@ -220,8 +220,8 @@
0 REWORK_NUMBER, 0 REWORK_NUMBER,
1 IS_FLAG 1 IS_FLAG
FROM C##AUCMA_SCADA.PRINT_BARCODE PB FROM C##AUCMA_SCADA.PRINT_BARCODE PB
JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE JOIN 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_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2005%'
WHERE PB.MATERIAL_BARCODE = #{barcode} WHERE PB.MATERIAL_BARCODE = #{barcode}
</select> </select>
@ -238,8 +238,8 @@
0 REWORK_NUMBER, 0 REWORK_NUMBER,
1 IS_FLAG 1 IS_FLAG
FROM C##AUCMA_SCADA.PRINT_BARCODE PB FROM C##AUCMA_SCADA.PRINT_BARCODE PB
JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE JOIN 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_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2105%'
WHERE PB.MATERIAL_BARCODE = #{barcode} WHERE PB.MATERIAL_BARCODE = #{barcode}
</select> </select>

Loading…
Cancel
Save