From bb80ead86615da40c73ed60a04944461e52929e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 16:19:25 +0800
Subject: [PATCH] fix: 工艺路线查询未携带状态
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 76f2a97..d44a4bd 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -17,17 +17,42 @@
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
select
ps.*,
- pm.product_name, pms.product_id, pms.model, pb.bom_no
+ pb.bom_no,
+ sdd.dict_label AS dictLabel
from process_route ps
left join product_bom pb on ps.bom_id = pb.id
- left join product_material_sku pms on ps.product_model_id = pms.id
- left join product_material pm on pms.product_id = pm.id
- <where>
- <if test="c.model != null and c.model != ''">
- and pms.model like concat('%', #{c.model}, '%')
- </if>
- </where>
+ left join sys_dict_data sdd on sdd.dict_code = ps.dict_code
+ where 1= 1
+ <if test="c.dictCode != null">
+ and ps.dict_code = #{c.dictCode}
+ </if>
+ <if test="c.status != null">
+ and ps.status = #{c.status}
+ </if>
order by ps.id
</select>
+ <select id="latestTypeDate" resultType="com.ruoyi.production.pojo.ProcessRoute">
+ SELECT *
+ FROM process_route pr
+ WHERE
+ pr.status = 1
+ and
+ pr.dict_code = (SELECT d.dict_code
+ FROM sys_dict_data d
+ WHERE d.dict_label =
+ <choose>
+ <when test="strength != null and strength != ''">
+ CONCAT(#{productName}, '-', #{strength})
+ </when>
+ <otherwise>
+ #{productName}
+ </otherwise>
+ </choose>
+ AND d.dict_type = 'product_type'
+ LIMIT 1)
+ ORDER BY pr.create_time DESC
+ LIMIT 1
+ </select>
+
</mapper>
--
Gitblit v1.9.3