From 9f1c36a2ba4e13f9592bbf2e49afd95fd77cadfb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 13:29:55 +0800
Subject: [PATCH] fix:1.仓储物流区分原材料/成品 2.生产订单/报工领料优化

---
 src/main/resources/mapper/quality/QualityInspectMapper.xml |   96 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 0efab8c..c2bcab9 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -3,34 +3,57 @@
 <mapper namespace="com.ruoyi.quality.mapper.QualityInspectMapper">
     <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
         SELECT
-        *
-        FROM quality_inspect
-        where
+        qi.*,
+        pm.uid_no,
+        <choose>
+            <when test="qualityInspect.inspectType == 0">
+                pl.purchase_contract_number as purchase_contract_no
+            </when>
+            <otherwise>
+                pwo.work_order_no
+            </otherwise>
+        </choose>
+        FROM
+        quality_inspect qi
+        <choose>
+            <when test="qualityInspect.inspectType == 0 ">
+                LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_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
+            </otherwise>
+        </choose>
+        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 != '' ">
-            AND supplier like concat('%',#{qualityInspect.supplier},'%')
+            AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
         </if>
         <if test="qualityInspect.customer != null and qualityInspect.customer != '' ">
-            AND customer like concat('%',#{qualityInspect.customer},'%')
+            AND qi.customer like concat('%',#{qualityInspect.customer},'%')
         </if>
         <if test="qualityInspect.process != null and qualityInspect.process != '' ">
-            AND process like concat('%',#{qualityInspect.process},'%')
+            AND qi.process like concat('%',#{qualityInspect.process},'%')
         </if>
         <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
-            AND product_name like concat('%',#{qualityInspect.productName},'%')
+            AND qi.product_name like concat('%',#{qualityInspect.productName},'%')
         </if>
         <if test="qualityInspect.entryDateStart != null and qualityInspect.entryDateStart != '' ">
-            AND check_time &gt;= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d')
+            AND qi.check_time &gt;= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d')
         </if>
         <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
-            AND check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
+            AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
         </if>
-        ORDER BY check_time DESC
+        ORDER BY qi.check_time DESC
     </select>
+
     <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
         SELECT
-        *
-        FROM quality_inspect
+        qi.*,
+        pm.uid_no
+        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 != '' ">
@@ -420,6 +443,55 @@
         ORDER BY rn;
 
     </select>
+    <select id="selectOneData" resultType="com.ruoyi.quality.pojo.QualityInspect">
+        select id,
+               inspect_type,
+               check_time,
+               production_date,
+               supplier,
+               customer,
+               process,
+               check_name,
+               product_id,
+               product_name,
+               model,
+               unit,
+               quantity,
+               check_company,
+               check_result,
+               create_time,
+               create_user,
+               update_time,
+               update_user,
+               tenant_id,
+               inspect_state,
+               purchase_ledger_id,
+               product_main_id,
+               defective_phenomena,
+               product_model_id,
+               test_standard_id,
+               inspected_quantity,
+
+               case
+                   when inspect_material_condition = '妫�楠岀敤娑插墏鎯呭喌' then
+                       '鈽�'
+                   else
+                       '鈽�'
+                   end as inspect_material_condition_a,
+               case
+                   when inspect_material_condition = '妫�楠岀敤绮夊墏鎯呭喌' then
+                       '鈽�'
+                   else
+                       '鈽�'
+                   end as inspect_material_condition_b,
+
+               validity_date,
+               manufacturing_team,
+               batch_no
+
+        from quality_inspect
+        where id = #{id};
+    </select>
 
 
 </mapper>

--
Gitblit v1.9.3