From 3abdd8c29b01efb2cb2114daf43aa62164babdf5 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 7 Aug 2024 17:08:47 +0800
Subject: [PATCH] =?UTF-8?q?2024-08-07=20OMS=E6=8A=A5=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/QcReportData.java    |  8 ++++++
 .../pms/service/Impl/QcServiceImpl.java       |  7 +++--
 .../resources/mapper/pms/QcReportMapper.xml   | 28 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java
index 6f6722f..9ec90b2 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java
@@ -284,4 +284,12 @@ public class QcReportData extends QueryPage {
      * 加工中心
      */
     private String workCenterNo;
+    /**
+     * 项目检验结论
+     */
+    private String itemResult;
+    /**
+     * 项目检验结论
+     */
+    private String itemResultDesc;
 }
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 28ca64b..1fb703a 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
@@ -4119,6 +4119,7 @@ public class QcServiceImpl implements QcService {
             QcFAIRecordData data = inData.getSubmitList().get(i);
             data.setState("待审核");
             data.setInspectionResult("合格");
+            data.setPassQty(data.getSamplingQty());
             qcMapper.updateIQCMasterRecord(data);
 
             // 修改明细记录信息
@@ -4220,9 +4221,9 @@ public class QcServiceImpl implements QcService {
             }
         }
 
-        for (QcFAIRecordData data : inData.getSubmitList()) {
-
-        }
+//        for (QcFAIRecordData data : inData.getSubmitList()) {
+//
+//        }
     }
 
     // 复制文件
diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml
index 3eee3e1..28b2168 100644
--- a/src/main/resources/mapper/pms/QcReportMapper.xml
+++ b/src/main/resources/mapper/pms/QcReportMapper.xml
@@ -50,6 +50,10 @@
             b.min_value,
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
+            b.item_result,
+            CASE WHEN b.item_result = 'Y' THEN '合格'
+            WHEN b.item_result = 'N' THEN '不合格'
+            END as itemResultDesc,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
             WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
@@ -127,6 +131,9 @@
             <if test = "query.refInfo5 != null and query.refInfo5 != ''">
                 AND a.ref_info5 LIKE #{query.refInfo5}
             </if>
+            <if test = "query.itemResult != null and query.itemResult != ''">
+                AND b.item_result LIKE #{query.itemResult}
+            </if>
         </where>
         ORDER BY
         CASE WHEN a.state = '待检验' THEN 1
@@ -178,6 +185,10 @@
             b.min_value,
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
+            b.item_result,
+            CASE WHEN b.item_result = 'Y' THEN '合格'
+            WHEN b.item_result = 'N' THEN '不合格'
+            END as itemResultDesc,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
             WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
@@ -234,6 +245,9 @@
             <if test="query.endDate2 != null">
                 AND #{query.endDate2} >= a.task_date
             </if>
+            <if test = "query.itemResult != null and query.itemResult != ''">
+                AND b.item_result LIKE #{query.itemResult}
+            </if>
         </where>
         ORDER BY
         CASE WHEN a.state = '待检验' THEN 1
@@ -286,6 +300,10 @@
             b.min_value,
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
+            b.item_result,
+            CASE WHEN b.item_result = 'Y' THEN '合格'
+            WHEN b.item_result = 'N' THEN '不合格'
+            END as itemResultDesc,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
             WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
@@ -349,6 +367,9 @@
             <if test = "query.orderRef5 != null and query.orderRef5 != ''">
                 AND a.order_ref5 LIKE #{query.orderRef5}
             </if>
+            <if test = "query.itemResult != null and query.itemResult != ''">
+                AND b.item_result LIKE #{query.itemResult}
+            </if>
         </where>
         ORDER BY
         CASE WHEN a.state = '待检验' THEN 1
@@ -401,6 +422,10 @@
             b.min_value,
             b.sampling_qty as itemSamplingQty,
             b.unqualified_quantity,
+            b.item_result,
+            CASE WHEN b.item_result = 'Y' THEN '合格'
+            WHEN b.item_result = 'N' THEN '不合格'
+            END as itemResultDesc,
             CASE WHEN b.value_type_db = 'T' THEN b.text_value
             WHEN b.value_type_db = 'N' THEN CONVERT(varchar, b.number_value, 126)
             END as textValue
@@ -464,6 +489,9 @@
             <if test = "query.orderRef5 != null and query.orderRef5 != ''">
                 AND a.order_ref5 LIKE #{query.orderRef5}
             </if>
+            <if test = "query.itemResult != null and query.itemResult != ''">
+                AND b.item_result LIKE #{query.itemResult}
+            </if>
         </where>
         ORDER BY
         CASE WHEN a.state = '待检验' THEN 1