From 61e45a2a7c94d845de5b9ace90bfee4bc9af4fd2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 01 四月 2026 11:32:21 +0800
Subject: [PATCH] 显示料号
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index a721a30..001a27c 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,12 +16,15 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ qu.quarantine_lifted,
+ qu.model,
+ pm.material_code as materialCode,
CASE
- WHEN qu.model = pm.id THEN pm.model
- ELSE qu.model
- END AS model
+ WHEN qu.inspect_id is null THEN true
+ 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.model = pm.model
where
1=1
<if test="qualityUnqualified.inspectType != null ">
@@ -42,8 +45,10 @@
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
SELECT
- *
- FROM quality_unqualified
+ qu.*,
+ pm.material_code as materialCode
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.model
where
1=1
<if test="qualityUnqualified.inspectType != null">
@@ -56,4 +61,64 @@
AND product_name = #{qualityUnqualified.productName}
</if>
</select>
-</mapper>
+ <select id="getUnqualified" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
+ SELECT
+ qu.id,
+ qu.inspect_type,
+ qu.inspect_state,
+ qu.check_time,
+ qu.check_name,
+ qu.product_id,
+ qu.product_name,
+ qu.unit,
+ qu.quantity,
+ qu.defective_phenomena,
+ qu.deal_result,
+ qu.deal_name,
+ qu.deal_time,
+ qi.process,
+ qu.model,
+ pm.material_code as materialCode,
+ CASE
+ WHEN qu.inspect_id is null THEN true
+ ELSE false
+ END AS method
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.model
+ LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
+ where
+ 1=1
+ and qu.id = #{id}
+ </select>
+ <select id="getModelId" resultType="java.lang.Long">
+ select pm.id
+ from product_model pm
+ left join product p on pm.product_id=p.id
+ where pm.model=#{model}
+ and p.product_name=#{productName}
+ </select>
+ <select id="selectUnqualifiedByProcessNames" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
+ SELECT DISTINCT qu.*
+ FROM quality_unqualified qu
+ JOIN quality_inspect qi ON qu.inspect_id = qi.id
+ WHERE qi.process IN
+ <foreach collection="processNames" item="processName" open="(" separator="," close=")">
+ #{processName}
+ </foreach>
+ AND qu.deal_result = '闅旂'
+ AND qu.quarantine_lifted = false
+ </select>
+
+ <select id="selectUnqualifiedWithProductionOrder" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
+ SELECT
+ po.id as productOrderId,
+ po.nps_no as productOrderNpsNo
+ FROM quality_unqualified qu
+ LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
+ 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
+ WHERE po.id IS NOT NULL
+ GROUP BY po.id
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3