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/QualityInspectMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 48fb369..63548cb 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -4,6 +4,7 @@
<select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
qi.*,
+ pm.uid_no,
<choose>
<when test="qualityInspect.inspectType == 0">
pl.purchase_contract_number as purchase_contract_no
@@ -23,6 +24,7 @@
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 != '' ">
@@ -48,8 +50,10 @@
<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 != '' ">
@@ -439,6 +443,23 @@
ORDER BY rn;
</select>
+ <select id="selectOneData" resultType="com.ruoyi.quality.pojo.QualityInspect">
+ select *,
+ 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
+ from quality_inspect
+ where id = #{id};
+ </select>
</mapper>
--
Gitblit v1.9.3