From 625517857d8401e75808c51804d20263d36c32d0 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 28 Aug 2024 17:55:08 +0800 Subject: [PATCH] =?UTF-8?q?2024-08-28=20=E9=87=87=E9=9B=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=88=E9=A1=B9=E7=9B=AE=E6=9D=A1=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/EquipmentDataAcquisitionData.java | 1 + .../pms/service/Impl/QcServiceImpl.java | 14 +++++++++++ src/main/resources/mapper/pms/QcMapper.xml | 3 +++ .../resources/mapper/pms/QcReportMapper.xml | 24 +++++++++---------- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EquipmentDataAcquisitionData.java b/src/main/java/com/xujie/sys/modules/pms/data/EquipmentDataAcquisitionData.java index 9f2dec2e..bd8a6429 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EquipmentDataAcquisitionData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EquipmentDataAcquisitionData.java @@ -22,4 +22,5 @@ public class EquipmentDataAcquisitionData { private String actionBy; private String collectionMethod; private Integer subDetailValueType; + private String collectionDataContent; } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 7dcdf6f1..fa07a584 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -5112,9 +5112,16 @@ public class QcServiceImpl implements QcService { List subDetailList = new LinkedList<>(); List fileList = new ArrayList<>(); for (EquipmentDataAcquisitionData acquisitionData : noList) { + // 查检验项目的过滤条件 + SubDetailValues values = new SubDetailValues(); + values.setSite(acquisitionData.getSite()); + values.setBuNo(acquisitionData.getBuNo()); + values.setItemNo(acquisitionData.getItemNo()); + String collectionDataContent = qcMapper.getItemCollectionDataContent(values); // 临时对象 EquipmentDataAcquisitionData tempAcquisitionData = new EquipmentDataAcquisitionData(); BeanUtils.copyProperties(acquisitionData,tempAcquisitionData); + tempAcquisitionData.setCollectionDataContent(collectionDataContent); // 循环数据采集来源 int type = 0; for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) { @@ -5297,9 +5304,16 @@ public class QcServiceImpl implements QcService { List subDetailList = new LinkedList<>(); List fileList = new ArrayList<>(); for (EquipmentDataAcquisitionData acquisitionData : noList) { + // 查检验项目的过滤条件 + SubDetailValues values = new SubDetailValues(); + values.setSite(acquisitionData.getSite()); + values.setBuNo(acquisitionData.getBuNo()); + values.setItemNo(acquisitionData.getItemNo()); + String collectionDataContent = qcMapper.getItemCollectionDataContent(values); // 临时对象 EquipmentDataAcquisitionData tempAcquisitionData = new EquipmentDataAcquisitionData(); BeanUtils.copyProperties(acquisitionData,tempAcquisitionData); + tempAcquisitionData.setCollectionDataContent(collectionDataContent); // 循环数据采集来源 int type = 0; for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) { diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 7cd25825..486ead61 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -3498,6 +3498,9 @@ AND (inspection_no is null or inspection_no = '') + + AND ${collectionSource} ${collectionDataContent} + and batch_no = (select MAX(batch_no) from Equipment_data_detail where site = #{site} and bu_no = #{buNo} and equipment_no = #{equipmentNo}) diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml index 1953cab8..7c20c931 100644 --- a/src/main/resources/mapper/pms/QcReportMapper.xml +++ b/src/main/resources/mapper/pms/QcReportMapper.xml @@ -596,9 +596,9 @@ c.sub_detail_value_c, c.sub_detail_value_d, c.sub_detail_value_e - FROM qc_iqc_sub_detail_record as c - LEFT JOIN qc_iqc_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_iqc_record as a ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no + FROM qc_iqc_record as a + inner JOIN qc_iqc_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_iqc_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 view_Supplier as s on a.site = s.site and a.supplier_no = s.SupplierID left join sys_user as u on a.inspector_no = u.username @@ -806,9 +806,9 @@ c.sub_detail_value_c, c.sub_detail_value_d, c.sub_detail_value_e - FROM qc_iqc_sub_detail_record as c - LEFT JOIN qc_iqc_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_iqc_record as a ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no + FROM qc_iqc_record as a + inner JOIN qc_iqc_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_iqc_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 view_Supplier as s on a.site = s.site and a.supplier_no = s.SupplierID left join sys_user as u on a.inspector_no = u.username @@ -943,9 +943,9 @@ c.sub_detail_value_c, c.sub_detail_value_d, c.sub_detail_value_e - FROM qc_ipqc_sub_detail_record as c - LEFT JOIN qc_ipqc_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_ipqc_record as a ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no + FROM qc_ipqc_record as a + inner JOIN qc_ipqc_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_ipqc_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 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 @@ -1156,9 +1156,9 @@ c.sub_detail_value_c, c.sub_detail_value_d, c.sub_detail_value_e - FROM qc_ipqc_sub_detail_record as c - LEFT JOIN qc_ipqc_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_ipqc_record as a ON a.site = b.site AND a.bu_no = b.bu_no AND a.inspection_no = b.inspection_no + FROM qc_ipqc_record as a + inner JOIN qc_ipqc_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_ipqc_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 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