From 973677d7792dbe440bd032ff4cc138458c89b06e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 15 一月 2026 17:00:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/resources/mapper/production/ProcessRouteMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index c5e09fc..51c11b4 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>

--
Gitblit v1.9.3