From 5bea250f3d53b289e10d920ffd46aa6a0002cb7d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 15 一月 2026 17:05:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index cd9d931..51c11b4 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,9 +13,11 @@
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, pm.speculative_trading_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_model pm on ps.product_model_id = pm.id
+ 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>
<if test="c.model != null and c.model != ''">
and pm.model like concat('%',#{c.model},'%')
--
Gitblit v1.9.3