From e0c8edd1d949fae5883a60019d02a9c5f7cb7a29 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 09:08:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 8cbd91e..76f2a97 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -4,23 +4,30 @@
<resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRoute">
- <id property="id" column="id"/>
- <result property="productModelId" column="product_model_id"/>
- <result property="description" column="description"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
+ <id property="id" column="id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="description" column="description"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="status" column="status"/>
</resultMap>
+
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, pm.speculative_trading_name,pm.product_id,pm.model
+ select
+ ps.*,
+ pm.product_name, pms.product_id, pms.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_material_sku pms on ps.product_model_id = pms.id
+ left join product_material pm on pms.product_id = pm.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 pms.model like concat('%', #{c.model}, '%')
</if>
</where>
- order by ps.id asc
+ order by ps.id
</select>
+
</mapper>
--
Gitblit v1.9.3