diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml index 80f3fc2..17eed96 100644 --- a/src/main/resources/mapper/pms/QcReportMapper.xml +++ b/src/main/resources/mapper/pms/QcReportMapper.xml @@ -216,7 +216,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -349,7 +349,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -478,7 +478,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -607,7 +607,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -1096,7 +1096,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -1181,7 +1181,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -1317,7 +1317,7 @@ AND a.part_no LIKE '%' + #{partNo} + '%' - AND d.part_desc LIKE '%' + #{partDesc} + '%' + AND d.PartDescription LIKE '%' + #{partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%' @@ -1524,7 +1524,7 @@ FROM qc_fai_sub_detail_record as c LEFT JOIN qc_fai_detailed_record as b on b.site = c.site AND b.bu_no = c.bu_no AND b.inspection_no = c.inspection_no and b.item_no = c.item_no Left JOIN qc_fai_record as a ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no - left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.part_no + left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.PartNo left join sys_user as u on a.inspector_no = u.username left join resource as r on a.site = r.site and a.resource_id = r.resource_id and a.work_center_no = r.work_center_no @@ -1540,7 +1540,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -1615,7 +1615,7 @@ a.resource_id, r.resource_desc, a.part_no, - d.part_desc, + d.PartDescription, d.Spec as spec, a.inspection_remark, a.roll_qty, @@ -1659,7 +1659,7 @@ FROM qc_fai_record as a inner JOIN qc_fai_detailed_record as b ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no inner JOIN qc_fai_sub_detail_record as c on b.site = c.site AND b.bu_no = c.bu_no AND b.inspection_no = c.inspection_no and b.item_no = c.item_no - left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.part_no + left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.PartNo left join sys_user as u on a.inspector_no = u.username left join resource as r on a.site = r.site and a.resource_id = r.resource_id and a.work_center_no = r.work_center_no left join UM as um on a.site = um.site and a.um_id = um.UMID @@ -1676,7 +1676,7 @@ AND a.part_no LIKE '%' + #{partNo} + '%' - AND d.part_desc LIKE '%' + #{partDesc} + '%' + AND d.PartDescription LIKE '%' + #{partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%' @@ -1813,7 +1813,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -1895,7 +1895,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -2030,7 +2030,7 @@ AND a.part_no LIKE '%' + #{partNo} + '%' - AND d.part_desc LIKE '%' + #{partDesc} + '%' + AND d.PartDescription LIKE '%' + #{partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%' @@ -2167,7 +2167,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -2249,7 +2249,7 @@ AND a.part_no LIKE '%' + #{query.partNo} + '%' - AND d.part_desc LIKE '%' + #{query.partDesc} + '%' + AND d.PartDescription LIKE '%' + #{query.partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%' @@ -2384,7 +2384,7 @@ AND a.part_no LIKE '%' + #{partNo} + '%' - AND d.part_desc LIKE '%' + #{partDesc} + '%' + AND d.PartDescription LIKE '%' + #{partDesc} + '%' AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%'