From 9f5813763a54f7fde8b472b0da305d635a624e8f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 08 八月 2026 17:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index c5e09fc..3cf1322 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,8 +13,9 @@
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, p.product_name,pm.product_id,pm.model
+ select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
from process_route ps
+ left join product_bom pb on ps.bom_id = pb.id
left join product_model pm on ps.product_model_id = pm.id
left join product p on pm.product_id = p.id
<where>
@@ -22,6 +23,6 @@
and pm.model like concat('%',#{c.model},'%')
</if>
</where>
- order by ps.id asc
+ order by ps.process_route_code desc
</select>
</mapper>
--
Gitblit v1.9.3