From a5f66f55b2c176e8504b8a077e00acfe2dfb4b00 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 18 九月 2026 18:09:56 +0800
Subject: [PATCH] feat(生产报工): 报工完成按四类区分计数零件并分流质检入库

---
 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..01e3c28 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -13,9 +13,16 @@
         qu.unit,
         qu.quantity,
         qu.defective_phenomena,
+        qu.deal_type,
         qu.deal_result,
+        qu.repair_work_hour,
+        qu.regenerate_new_order,
+        qu.photo_urls,
         qu.deal_name,
         qu.deal_time,
+        qu.inspect_id,
+        qu.product_main_id,
+        ppm.product_no as report_no,
         CASE
         WHEN qu.model = pm.id THEN pm.model
         ELSE qu.model
@@ -26,23 +33,28 @@
         END AS method
         FROM quality_unqualified qu
         LEFT JOIN product_model pm ON qu.model = pm.id
-        where
-        1=1
-        <if test="qualityUnqualified.inspectType != null ">
-            AND inspect_type = #{qualityUnqualified.inspectType}
-        </if>
-        <if test="qualityUnqualified.inspectState != null ">
-            AND inspect_state = #{qualityUnqualified.inspectState}
-        </if>
-        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
-            AND product_name = #{qualityUnqualified.productName}
-        </if>
-        <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
-            AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
-        </if>
-        <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
-            AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
-        </if>
+        LEFT JOIN production_product_main ppm ON qu.product_main_id = ppm.id
+        <where>
+            <if test="qualityUnqualified.inspectType != null ">
+                AND inspect_type = #{qualityUnqualified.inspectType}
+            </if>
+            <if test="qualityUnqualified.inspectState != null ">
+                AND inspect_state = #{qualityUnqualified.inspectState}
+            </if>
+            <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
+                AND product_name = #{qualityUnqualified.productName}
+            </if>
+            <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
+                AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
+                AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
+            </if>
+            <if test="qualityUnqualified.reportNo != null and qualityUnqualified.reportNo != '' ">
+                AND ppm.product_no like concat('%',#{qualityUnqualified.reportNo},'%')
+            </if>
+        </where>
+        order by qu.create_time desc
     </select>
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
         SELECT
@@ -72,9 +84,16 @@
             qu.unit,
             qu.quantity,
             qu.defective_phenomena,
+            qu.deal_type,
             qu.deal_result,
+            qu.repair_work_hour,
+            qu.regenerate_new_order,
+            qu.photo_urls,
             qu.deal_name,
             qu.deal_time,
+            qu.inspect_id,
+            qu.product_main_id,
+            ppm2.product_no as report_no,
             CASE
                 WHEN qu.model = pm.id THEN pm.model
                 ELSE qu.model
@@ -84,7 +103,8 @@
                 ELSE false
                 END AS method
         FROM quality_unqualified qu
-                 LEFT JOIN product_model pm ON qu.model = pm.id
+                 LEFT JOIN product_model pm ON qu.product_model_id = pm.id
+                 LEFT JOIN production_product_main ppm2 ON qu.product_main_id = ppm2.id
         where
             1=1
         and qu.id = #{id}

--
Gitblit v1.9.3