From 78286a5422d2180df5cd66a85570a7a3cd2f4d71 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 10:36:21 +0800
Subject: [PATCH] fix: 新增工艺路线与子集去除绑定产品,改为工序与产品类型
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51aa322..48d0708 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -4,23 +4,29 @@
<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
+ select
+ ps.*,
+ pb.bom_no,
+ sdd.dict_label AS dictLabel
from process_route ps
- left join product_model pm on ps.product_model_id = pm.id
- <where>
- <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
- and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
- </if>
- </where>
- order by ps.id asc
+ left join product_bom pb on ps.bom_id = pb.id
+ left join sys_dict_data sdd on sdd.dict_code = ps.dict_code
+ where 1= 1
+ <if test="c.dictCode != null">
+ and ps.dict_code = #{c.dictCode}
+ </if>
+ order by ps.id
</select>
+
</mapper>
--
Gitblit v1.9.3