From 7e8edd4b59fb22146b90d01ca38f75148f3fd774 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 20 四月 2026 17:57:18 +0800
Subject: [PATCH] feat(bom): 添加BOM管理功能模块,工序 管理,基础 - 新增CustomerPrivatePoolMapper.xml实现客户私池映射 - 添加SysLoginController支持登录验证和用户信息获取 - 创建TechnologyBomController提供BOM的增删改查接口 - 定义TechnologyBomDto数据传输对象 - 实现TechnologyBomMapper和相关XML映射文件 - 开发TechnologyBomService业务逻辑层 - 添加TechnologyBomStructure结构管理功能 - 集成Excel导入导出BOM数据功能 - 实现BOM结构树形展示和维护功能

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

diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51aa322..51c11b4 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,12 +13,14 @@
     </resultMap>
 
     <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
-        select ps.*, pm.speculative_trading_name,pm.product_id
+        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.speculativeTradingName != null || c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
+            <if test="c.model != null and c.model != ''">
+                and pm.model like concat('%',#{c.model},'%')
             </if>
         </where>
         order by ps.id asc

--
Gitblit v1.9.3