From 9f5bdfe8c33150e844330e7057aee0578a2a287d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 12 Dec 2023 13:54:33 +0800
Subject: [PATCH] =?UTF-8?q?2023-12-12=20=E6=A3=80=E9=AA=8C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=A3=80=E9=AA=8C=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/QcFAIRecordData.java |  30 +++
 .../pms/service/Impl/QcServiceImpl.java       |  10 +-
 src/main/resources/mapper/pms/QcMapper.xml    | 248 ++++++++++--------
 3 files changed, 169 insertions(+), 119 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index 6614abce..a6d986d7 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -169,6 +169,36 @@ public class QcFAIRecordData extends QueryPage {
     private String active;
     // 卷数
     private BigDecimal rollCount;
+    // 检验方法编码
+    private String methodNo;
+    // 检验方法名称
+    private String methodName;
+    // 检验方法说明
+    private String methodRemark;
+
+    public String getMethodNo() {
+        return methodNo;
+    }
+
+    public void setMethodNo(String methodNo) {
+        this.methodNo = methodNo;
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public void setMethodName(String methodName) {
+        this.methodName = methodName;
+    }
+
+    public String getMethodRemark() {
+        return methodRemark;
+    }
+
+    public void setMethodRemark(String methodRemark) {
+        this.methodRemark = methodRemark;
+    }
 
     public BigDecimal getRollCount() {
         return rollCount;
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 93790ebe..d1780727 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
@@ -1864,7 +1864,7 @@ public class QcServiceImpl implements QcService {
             subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
             subDetailValues.get(i).setItemNo(data.getItemNo());
             // 如果该项目维护了上下限且实测值类型为数值
-            if ("N".equals(data.getValueTypeDb())) {
+            if ("N".equals(data.getValueTypeDb()) && (data.getMaxValue() != null || data.getMinValue() != null)) {
                 // 如果实际填入值为数值
                 if (isNumberString(subDetailValues.get(i).getSubDetailValue())) {
                     // 实测值
@@ -2284,7 +2284,7 @@ public class QcServiceImpl implements QcService {
             subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
             subDetailValues.get(i).setItemNo(data.getItemNo());
             // 如果该项目维护了上下限且实测值类型为数值
-            if ("N".equals(data.getValueTypeDb())) {
+            if ("N".equals(data.getValueTypeDb()) && (data.getMaxValue() != null || data.getMinValue() != null)) {
                 // 如果实际填入值为数值
                 if (isNumberString(subDetailValues.get(i).getSubDetailValue())) {
                     BigDecimal value = new BigDecimal(subDetailValues.get(i).getSubDetailValue());
@@ -2742,7 +2742,7 @@ public class QcServiceImpl implements QcService {
             subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
             subDetailValues.get(i).setItemNo(data.getItemNo());
             // 如果该项目维护了上下限且实测值类型为数值
-            if ("N".equals(data.getValueTypeDb())) {
+            if ("N".equals(data.getValueTypeDb()) && (data.getMaxValue() != null || data.getMinValue() != null)) {
                 // 如果实际填入值为数值
                 if (isNumberString(subDetailValues.get(i).getSubDetailValue())) {
                     BigDecimal value = new BigDecimal(subDetailValues.get(i).getSubDetailValue());
@@ -3151,7 +3151,7 @@ public class QcServiceImpl implements QcService {
             subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
             subDetailValues.get(i).setItemNo(data.getItemNo());
             // 如果该项目维护了上下限且实测值类型为数值
-            if ("N".equals(data.getValueTypeDb())) {
+            if ("N".equals(data.getValueTypeDb()) && (data.getMaxValue() != null || data.getMinValue() != null)) {
                 // 如果实际填入值为数值
                 if (isNumberString(subDetailValues.get(i).getSubDetailValue())) {
                     BigDecimal value = new BigDecimal(subDetailValues.get(i).getSubDetailValue());
@@ -3500,7 +3500,7 @@ public class QcServiceImpl implements QcService {
                                 countMap.put(task.getItemNo(), 0);
                             }
                             // 如果该项目的实测值类型为数值
-                            if ("N".equals(itemDataList.get(0).getValueTypeDb())) {
+                            if ("N".equals(itemDataList.get(0).getValueTypeDb()) && (itemDataList.get(0).getMaxValue() != null || itemDataList.get(0).getMinValue() != null)) {
                                 // 如果实际填入值为数值
                                 if (isNumberString(task.getSubDetailValue())) {
                                     BigDecimal value = new BigDecimal(task.getSubDetailValue());
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index a28c31e1..cf202873 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1549,35 +1549,40 @@
     <!-- FAI明细记录查询 -->
     <select id="faiDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT
-            site,
-            inspection_no,
-            order_no,
-            template_id,
-            sampling_level_no,
-            sampling_level_desc,
-            sampling_programme_no,
-            sampling_programme_desc,
-            AQL,
-            AC,
-            RE,
-            item_no,
-            item_desc,
-            object_id,
-            object_desc,
-            default_value,
-            min_value,
-            max_value,
-            text_value,
-            number_value,
-            value_type_db,
-            value_type,
-            case when item_result = '' or item_result is null then 'Y' else item_result end as itemResult,
-            is_submit,
-            isnull(unqualified_quantity,0) as unqualifiedQuantity,
-            sampling_qty,
-            dbo.qc_get_fai_sub_record_num(site, inspection_no, item_no) as subDetailRecordNum
-        FROM  qc_fai_detailed_record
-        WHERE inspection_no = #{inspectionNo} and site = #{site}
+            a.site,
+            a.inspection_no,
+            a.order_no,
+            a.template_id,
+            a.sampling_level_no,
+            a.sampling_level_desc,
+            a.sampling_programme_no,
+            a.sampling_programme_desc,
+            a.AQL,
+            a.AC,
+            a.RE,
+            a.item_no,
+            a.item_desc,
+            a.object_id,
+            a.object_desc,
+            a.default_value,
+            a.min_value,
+            a.max_value,
+            a.text_value,
+            a.number_value,
+            a.value_type_db,
+            a.value_type,
+            case when a.item_result = '' or a.item_result is null then 'Y' else a.item_result end as itemResult,
+            a.is_submit,
+            isnull(a.unqualified_quantity,0) as unqualifiedQuantity,
+            a.sampling_qty,
+            dbo.qc_get_fai_sub_record_num(a.site, a.inspection_no, a.item_no) as subDetailRecordNum,
+            c.method_no,
+            c.method_name,
+            c.method_remark
+        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
+        LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no
+        WHERE a.inspection_no = #{inspectionNo} and a.site = #{site}
     </select>
 
     <!-- 修改FAI主记录信息 -->
@@ -1832,35 +1837,40 @@
     <!-- IPQC明细记录查询 -->
     <select id="ipqcDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT
-            site,
-            inspection_no,
-            order_no,
-            template_id,
-            sampling_level_no,
-            sampling_level_desc,
-            sampling_programme_no,
-            sampling_programme_desc,
-            AQL,
-            AC,
-            RE,
-            item_no,
-            item_desc,
-            object_id,
-            object_desc,
-            default_value,
-            min_value,
-            max_value,
-            text_value,
-            number_value,
-            value_type_db,
-            value_type,
-            case when item_result = '' or item_result is null then 'Y' else item_result end as itemResult,
-            is_submit,
-            isnull(unqualified_quantity,0) as unqualifiedQuantity,
-            sampling_qty,
-            dbo.qc_get_ipqc_sub_record_num(site, inspection_no, item_no) as subDetailRecordNum
-        FROM  qc_ipqc_detailed_record
-        WHERE inspection_no = #{inspectionNo} and site = #{site}
+            a.site,
+            a.inspection_no,
+            a.order_no,
+            a.template_id,
+            a.sampling_level_no,
+            a.sampling_level_desc,
+            a.sampling_programme_no,
+            a.sampling_programme_desc,
+            a.AQL,
+            a.AC,
+            a.RE,
+            a.item_no,
+            a.item_desc,
+            a.object_id,
+            a.object_desc,
+            a.default_value,
+            a.min_value,
+            a.max_value,
+            a.text_value,
+            a.number_value,
+            a.value_type_db,
+            a.value_type,
+            case when a.item_result = '' or a.item_result is null then 'Y' else a.item_result end as itemResult,
+            a.is_submit,
+            isnull(a.unqualified_quantity,0) as unqualifiedQuantity,
+            a.sampling_qty,
+            dbo.qc_get_ipqc_sub_record_num(a.site, a.inspection_no, a.item_no) as subDetailRecordNum,
+            c.method_no,
+            c.method_name,
+            c.method_remark
+        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
+        LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no
+        WHERE a.inspection_no = #{inspectionNo} and a.site = #{site}
     </select>
 
     <!-- 删除IPQC检验记录 -->
@@ -2144,33 +2154,38 @@
     <!-- IQC明细记录查询 -->
     <select id="iqcDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT
-            site,
-            inspection_no,
-            template_id,
-            sampling_level_no,
-            sampling_level_desc,
-            sampling_programme_no,
-            sampling_programme_desc,
-            AQL,
-            AC,
-            RE,
-            item_no,
-            item_desc,
-            object_id,
-            object_desc,
-            default_value,
-            min_value,
-            max_value,
-            text_value,
-            number_value,
-            value_type_db,
-            value_type,
-            case when item_result = '' or item_result is null then 'Y' else item_result end as itemResult,
-            is_submit,
-            isnull(unqualified_quantity,0) as unqualifiedQuantity,
-            dbo.qc_get_iqc_sub_record_num(site, inspection_no, item_no) as subDetailRecordNum
-        FROM  qc_iqc_detailed_record
-        WHERE inspection_no = #{inspectionNo} and site = #{site}
+            a.site,
+            a.inspection_no,
+            a.template_id,
+            a.sampling_level_no,
+            a.sampling_level_desc,
+            a.sampling_programme_no,
+            a.sampling_programme_desc,
+            a.AQL,
+            a.AC,
+            a.RE,
+            a.item_no,
+            a.item_desc,
+            a.object_id,
+            a.object_desc,
+            a.default_value,
+            a.min_value,
+            a.max_value,
+            a.text_value,
+            a.number_value,
+            a.value_type_db,
+            a.value_type,
+            case when a.item_result = '' or a.item_result is null then 'Y' else a.item_result end as itemResult,
+            a.is_submit,
+            isnull(a.unqualified_quantity,0) as unqualifiedQuantity,
+            dbo.qc_get_iqc_sub_record_num(a.site, a.inspection_no, a.item_no) as subDetailRecordNum,
+            c.method_no,
+            c.method_name,
+            c.method_remark
+        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
+        LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no
+        WHERE a.inspection_no = #{inspectionNo} and a.site = #{site}
     </select>
 
     <!-- 查询IQC的子明细 -->
@@ -2445,35 +2460,40 @@
     <!-- FQC明细记录查询 -->
     <select id="fqcDetailSearch" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT
-            site,
-            inspection_no,
-            order_no,
-            template_id,
-            sampling_level_no,
-            sampling_level_desc,
-            sampling_programme_no,
-            sampling_programme_desc,
-            AQL,
-            AC,
-            RE,
-            item_no,
-            item_desc,
-            object_id,
-            object_desc,
-            default_value,
-            min_value,
-            max_value,
-            text_value,
-            number_value,
-            value_type_db,
-            value_type,
-            case when item_result = '' or item_result is null then 'Y' else item_result end as itemResult,
-            is_submit,
-            isnull(unqualified_quantity,0) as unqualifiedQuantity,
-            sampling_qty,
-            dbo.qc_get_fqc_sub_record_num(site, inspection_no, item_no) as subDetailRecordNum
-        FROM  qc_fqc_detailed_record
-        WHERE inspection_no = #{inspectionNo} and site = #{site}
+            a.site,
+            a.inspection_no,
+            a.order_no,
+            a.template_id,
+            a.sampling_level_no,
+            a.sampling_level_desc,
+            a.sampling_programme_no,
+            a.sampling_programme_desc,
+            a.AQL,
+            a.AC,
+            a.RE,
+            a.item_no,
+            a.item_desc,
+            a.object_id,
+            a.object_desc,
+            a.default_value,
+            a.min_value,
+            a.max_value,
+            a.text_value,
+            a.number_value,
+            a.value_type_db,
+            a.value_type,
+            case when a.item_result = '' or a.item_result is null then 'Y' else a.item_result end as itemResult,
+            a.is_submit,
+            isnull(a.unqualified_quantity,0) as unqualifiedQuantity,
+            a.sampling_qty,
+            dbo.qc_get_fqc_sub_record_num(a.site, a.inspection_no, a.item_no) as subDetailRecordNum,
+            c.method_no,
+            c.method_name,
+            c.method_remark
+        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
+        LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no
+        WHERE a.inspection_no = #{inspectionNo} and a.site = #{site}
     </select>
 
     <!-- 删除FQC检验记录 -->