From 94ec4e9e9214cb5dc28aef4a7f38be462cfda728 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 16:50:09 +0800
Subject: [PATCH] fix(product): 产品型号复制功能的进行勾选复制

---
 src/main/resources/mapper/quality/QualityInspectMapper.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index c271bc9..d86ab8e 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -4,17 +4,20 @@
     <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
         SELECT
         qi.*,
+        pm.material_code as materialCode,
         (qi.quantity - qi.defective_quantity) as qualifiedQuantity,
         <choose>
             <when test="qualityInspect.inspectType == 0">
                 pl.purchase_contract_number as purchase_contract_no
             </when>
             <otherwise>
-                pwo.work_order_no
+                pwo.work_order_no,
+                po.batch_no
             </otherwise>
         </choose>
         FROM
         quality_inspect qi
+        LEFT JOIN product_model pm ON qi.product_model_id = pm.id
         <choose>
             <when test="qualityInspect.inspectType == 0 ">
                 LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
@@ -22,10 +25,11 @@
             <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_order po ON pwo.product_order_id = po.id
             </otherwise>
         </choose>
         WHERE
-        inspect_type=#{qualityInspect.inspectType}
+        inspect_type = #{qualityInspect.inspectType}
         <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
             AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
         </if>
@@ -44,14 +48,16 @@
         <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
+        ORDER BY qi.create_time DESC
     </select>
 
     <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
         SELECT
         *,
+        pm.material_code as materialCode,
         (quantity - defective_quantity) as qualifiedQuantity
-        FROM quality_inspect
+        FROM quality_inspect qi
+        LEFT JOIN product_model pm ON qi.product_model_id = pm.id
         where
         inspect_type=#{qualityInspect.inspectType}
         <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">

--
Gitblit v1.9.3