From 7d6b1cb01d8340c6d86fbf98fd34fe4ca822f57d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 28 六月 2026 20:36:55 +0800
Subject: [PATCH] feat: 新增报废入库
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index a721a30..584ee1c 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,12 +16,17 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ pm.thickness,
CASE
WHEN qu.model = pm.id THEN pm.model
ELSE qu.model
- END AS model
+ END AS model,
+ CASE
+ WHEN qu.model = pm.id 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.product_model_id = pm.id
where
1=1
<if test="qualityUnqualified.inspectType != null ">
@@ -39,6 +44,7 @@
<if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
</if>
+ order by check_time desc
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
SELECT
@@ -56,4 +62,40 @@
AND product_name = #{qualityUnqualified.productName}
</if>
</select>
+ <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,
+ CASE
+ WHEN qu.model = pm.id THEN pm.model
+ ELSE qu.model
+ END AS model,
+ CASE
+ WHEN qu.model = pm.id THEN true
+ ELSE false
+ END AS method
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.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>
</mapper>
--
Gitblit v1.9.3