From 4f258638d62ccaae0050f1ed6c7231941b66fb50 Mon Sep 17 00:00:00 2001
From: deslrey <deslre0381@gmail.com>
Date: 星期六, 10 一月 2026 11:29:04 +0800
Subject: [PATCH] 【物料属性】的回显及查询
---
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index fa58164..a5bc457 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -18,7 +18,11 @@
io.laboratory,
io.ifs_inventory_id,
iiq.is_copper,
- ip.son_laboratory
+ iiq.material_prop,
+ ip.son_laboratory,
+ iiq.update_batch_no,
+ iiq.part_desc,
+ iiq.supplier_name
from ins_report ir
left join ins_order io on io.id = ir.ins_order_id
LEFT JOIN ifs_inventory_quantity iiq ON iiq.id = io.ifs_inventory_id
@@ -29,23 +33,21 @@
left join ins_product ip on ip.ins_sample_id = is2.id
where 1=1
and ir.is_pass = 1
- <if test="createOrderUser != null and createOrderUser != ''">
- and (ir.write_user_id = #{createOrderUser} or ir.examine_user_id = #{createOrderUser} or ir.ratify_user_id = #{createOrderUser})
+ <if test="createOrderUser != null">
+ and (ir.write_user_id = #{createOrderUser} or ir.examine_user_id = #{createOrderUser} or ir.ratify_user_id =
+ #{createOrderUser})
</if>
<if test="laboratory!=null and laboratory!=''">
- and laboratory=#{laboratory}
+ and io.laboratory=#{laboratory}
</if>
<if test="queryStatus != null and queryStatus != ''">
- <!-- 寰呮彁浜�-->
- <if test='queryStatus == 0'>
+ <if test='queryStatus == "0"'>
and ir.state = 0
</if>
- <!-- 寰呭鎵�-->
- <if test='queryStatus == 1'>
+ <if test='queryStatus == "1"'>
and ir.state = 1 and (ir.is_examine != 1 or ir.is_examine is null)
</if>
- <!-- 寰呮壒鍑�-->
- <if test='queryStatus == 2'>
+ <if test='queryStatus == "2"'>
and ir.state = 1 and ir.is_examine = 1 and (ir.is_ratify != 1 or ir.is_ratify is null)
</if>
</if>
@@ -56,11 +58,14 @@
</if>
ORDER BY a.create_time DESC
</select>
+
+
<select id="getLaboratoryByName" resultType="java.lang.String">
- select s.address from seal s
- left join laboratory l on s.lab_id = l.id
+ select s.address
+ from seal s
+ left join laboratory l on s.lab_id = l.id
where l.laboratory_name = #{name}
- and s.type = #{type}
+ and s.type = #{type}
order by s.create_time desc
limit 1
</select>
@@ -68,24 +73,24 @@
<!-- 鎶ュ憡鎶ヨ〃瀵煎嚭 -->
<select id="reportAllExport" resultType="com.ruoyi.inspect.dto.InsReportExport">
select code,
- case when type_source = 0 then '鎴愬搧涓嬪崟' else '鍘熸潗鏂欎笅鍗�' end type_source,
+ case when type_source = 0 then '鎴愬搧涓嬪崟' else '鍘熸潗鏂欎笅鍗�' end type_source,
case
when order_type = '鎶芥' then '鎶芥'
when order_type = 'Customer-ordered test' then '濮旀墭妫�楠�'
when order_type = '杩涘巶妫�楠�' then '杩涘巶妫�楠�'
when order_type = 'Quarterly inspection' then '瀛ｅ害妫�楠�'
- else '' end order_type,
- DATE_FORMAT(create_Time, '%Y-%m-%d %H:%i:%s') create_Time,
+ else '' end order_type,
+ DATE_FORMAT(create_Time, '%Y-%m-%d %H:%i:%s') create_Time,
write_user_name,
- DATE_FORMAT(write_time, '%Y-%m-%d %H:%i:%s') write_time,
- case when state = 0 then '寰呮彁浜�' when state = 1 then '宸叉彁浜�' else '' end state,
+ DATE_FORMAT(write_time, '%Y-%m-%d %H:%i:%s') write_time,
+ case when state = 0 then '寰呮彁浜�' when state = 1 then '宸叉彁浜�' else '' end state,
examine_user,
- DATE_FORMAT(examine_time, '%Y-%m-%d %H:%i:%s') examine_time,
+ DATE_FORMAT(examine_time, '%Y-%m-%d %H:%i:%s') examine_time,
case when is_examine = 0 then '涓嶉�氳繃' when is_examine = 1 then '閫氳繃' else '' end is_examine,
examine_tell,
ratify_user,
- DATE_FORMAT(ratify_time, '%Y-%m-%d %H:%i:%s') ratify_time,
- case when is_ratify = 0 then '涓嶆壒鍑�' when is_ratify = 1 then '鎵瑰噯' else '' end is_ratify,
+ DATE_FORMAT(ratify_time, '%Y-%m-%d %H:%i:%s') ratify_time,
+ case when is_ratify = 0 then '涓嶆壒鍑�' when is_ratify = 1 then '鎵瑰噯' else '' end is_ratify,
ratify_tell
from (
select
@@ -111,7 +116,8 @@
where 1=1
and ir.is_pass = 1
<if test="createOrderUser != null and createOrderUser != ''">
- and (ir.write_user_id = #{createOrderUser} or ir.examine_user_id = #{createOrderUser} or ir.ratify_user_id = #{createOrderUser})
+ and (ir.write_user_id = #{createOrderUser} or ir.examine_user_id = #{createOrderUser} or ir.ratify_user_id =
+ #{createOrderUser})
</if>
<if test="queryStatus != null and queryStatus != ''">
<!-- 寰呮彁浜�-->
--
Gitblit v1.9.3