diff --git a/src/main/java/com/heai/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/heai/modules/pms/data/QcFAIRecordData.java index edcd8f9..f9183f3 100644 --- a/src/main/java/com/heai/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/heai/modules/pms/data/QcFAIRecordData.java @@ -273,6 +273,8 @@ public class QcFAIRecordData extends QueryPage { private String sopNum; private String eamObjectId; + private Integer imageDetailNum; + public String getTemplateName() { return templateName; } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index a10fe12..a37d3f3 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -1753,7 +1753,12 @@ dbo.qc_get_fai_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum, c.method_no, c.method_name, - c.method_remark + c.method_remark, + ( + SELECT COUNT(*) + FROM sys_oss + WHERE order_ref1 = a.site and order_ref2 = a.inspection_no and order_ref3 = a.item_no and order_ref4 = a.bu_no + ) AS imageDetailNum FROM qc_fai_detailed_record as a LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no @@ -2115,7 +2120,12 @@ dbo.qc_get_ipqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum, c.method_no, c.method_name, - c.method_remark + c.method_remark, + ( + SELECT COUNT(*) + FROM sys_oss + WHERE order_ref1 = a.site and order_ref2 = a.inspection_no and order_ref3 = a.item_no and order_ref4 = a.bu_no + ) AS imageDetailNum FROM qc_ipqc_detailed_record as a LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no @@ -2511,7 +2521,12 @@ c.method_no, c.method_name, c.method_remark, - a.sampling_qty + a.sampling_qty, + ( + SELECT COUNT(*) + FROM sys_oss + WHERE order_ref1 = a.site and order_ref2 = a.inspection_no and order_ref3 = a.item_no and order_ref4 = a.bu_no + ) AS imageDetailNum FROM qc_iqc_detailed_record as a LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no @@ -2902,7 +2917,12 @@ dbo.qc_get_fqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum, c.method_no, c.method_name, - c.method_remark + c.method_remark, + ( + SELECT COUNT(*) + FROM sys_oss + WHERE order_ref1 = a.site and order_ref2 = a.inspection_no and order_ref3 = a.item_no and order_ref4 = a.bu_no + ) AS imageDetailNum FROM qc_fqc_detailed_record as a LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no @@ -3774,6 +3794,7 @@ operatorName as adminName FROM operator + site = #{site} AND operator_id LIKE '%' + #{adminID} + '%'