From 6c95c2f6a3602fe6f92898dd322c20bbe955e69d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 18:03:20 +0800
Subject: [PATCH] feat: 成品入库增加审批环节,原材质检后提交入库时增加一个审批环节

---
 src/main/resources/mapper/quality/QualityInspectMapper.xml |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 0ccfbea..d4fcf5c 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -6,10 +6,12 @@
         qi.*,
         <choose>
             <when test="qualityInspect.inspectType == 0">
-                pl.purchase_contract_number as purchase_contract_no
+                pl.purchase_contract_number as purchase_contract_no,
+                pm.thickness
             </when>
             <otherwise>
-                pwo.work_order_no
+                pwo.work_order_no,
+                pm.thickness
             </otherwise>
         </choose>
         FROM
@@ -17,10 +19,12 @@
         <choose>
             <when test="qualityInspect.inspectType == 0 ">
                 LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
+                LEFT JOIN product_model pm ON pm.id = qi.product_model_id
             </when>
             <otherwise>
                 LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
                 LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+                LEFT JOIN product_model pm ON pm.id = qi.product_model_id
             </otherwise>
         </choose>
         WHERE
@@ -43,7 +47,13 @@
         <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
             AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
         </if>
-        ORDER BY qi.check_time DESC
+        <if test="qualityInspect.approvalStatus != null">
+            AND qi.approval_status = #{qualityInspect.approvalStatus}
+        </if>
+        <if test="qualityInspect.approveUserIds != null and qualityInspect.approveUserIds != '' ">
+            AND qi.approve_user_ids like concat('%',#{qualityInspect.approveUserIds},'%')
+        </if>
+        ORDER BY qi.id DESC
     </select>
 
     <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
@@ -64,6 +74,12 @@
         <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
             AND product_name = #{qualityInspect.productName}
         </if>
+        <if test="qualityInspect.approvalStatus != null">
+            AND approval_status = #{qualityInspect.approvalStatus}
+        </if>
+        <if test="qualityInspect.approveUserIds != null and qualityInspect.approveUserIds != '' ">
+            AND approve_user_ids like concat('%',#{qualityInspect.approveUserIds},'%')
+        </if>
     </select>
 
     <delete id="deleteByProductMainIds">

--
Gitblit v1.9.3