2024-08-28

采集优化（项目条件）

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;
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -5112,9 +5112,16 @@ public class QcServiceImpl implements QcService {
         List<SubDetailValues> subDetailList = new LinkedList<>();
         List<SysOssEntity> 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<SubDetailValues> subDetailList = new LinkedList<>();
         List<SysOssEntity> 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++) {

src/main/resources/mapper/pms/QcMapper.xml

@@ -3498,6 +3498,9 @@
         <if test='collectionMethod == "RS232"'>
             AND (inspection_no is null or inspection_no = '')
         </if>
+        <if test = "collectionDataContent != null and collectionDataContent != ''">
+            AND ${collectionSource} ${collectionDataContent}
+        </if>
         and batch_no = (select MAX(batch_no) from Equipment_data_detail where site = #{site} and bu_no = #{buNo} and equipment_no = #{equipmentNo})
     </select>
 

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