From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index fc989ad..86a4862 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.production.mapper.ProcessRouteMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRoute">
+ <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProcessRoute">
<id property="id" column="id"/>
<result property="productModelId" column="product_model_id"/>
<result property="description" column="description"/>
@@ -12,13 +12,15 @@
<result property="updateTime" column="update_time"/>
</resultMap>
- <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, pm.speculative_trading_name,pm.product_id,pm.model
+ <select id="pageProcessRouteDto" resultType="com.ruoyi.production2.dto.ProcessRouteDto">
+ 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 and 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