From 9bad4cfca9b9f51f433bf0caf5b5d166d1fc55a7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 03 四月 2026 10:20:59 +0800
Subject: [PATCH] fix: 库存查询添加有效期
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 503b7b3..d7fdb89 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,6 +16,8 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ qu.production_date,
+ pm.uid_no,
CASE
WHEN qu.model = pm.id THEN pm.model
ELSE qu.model
@@ -25,7 +27,7 @@
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 ">
@@ -46,8 +48,10 @@
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
SELECT
- *
- FROM quality_unqualified
+ qu.*,
+ pm.uid_no
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.model
where
1=1
<if test="qualityUnqualified.inspectType != null">
@@ -75,6 +79,8 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ qu.production_date,
+ qu.batch_no,
CASE
WHEN qu.model = pm.id THEN pm.model
ELSE qu.model
@@ -89,4 +95,11 @@
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