From 5b334f63a33646b57a428c647bad9894cd3f3068 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 15:40:00 +0800
Subject: [PATCH] feat: 新增工艺路线、工艺路线绑定工序、工序新增参数
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51c11b4..76f2a97 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -4,25 +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.*, p.product_name,pm.product_id,pm.model,pb.bom_no
+ select
+ ps.*,
+ pm.product_name, pms.product_id, pms.model, pb.bom_no
from process_route ps
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
+ 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.model != null and c.model != ''">
- and pm.model like concat('%',#{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