From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 48d0708..d44a4bd 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -26,7 +26,33 @@
<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