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/ProductStructureMapper.xml | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 1833487..18a4f89 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -11,33 +11,33 @@
<result property="unit" column="unit"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
- <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
- select ps.*,
- p.product_name,
- pp.name as process_name,
- pm.product_id,
- pm.model
- from
- product_structure ps
- 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_process pp on ps.process_id = pp.id
- where ps.bom_id = #{bomId}
- order by ps.id
+
+ <select id="listByBomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ SELECT ps.id,
+ ps.parent_id,
+ ps.bom_id,
+ ps.unit_quantity,
+ ps.process_id,
+ pp.name AS process_name,
+ pm.product_name AS productName,
+ pm.unit,
+ pms.model
+
+ FROM product_structure ps
+ LEFT JOIN product_process pp ON ps.process_id = pp.id
+ LEFT JOIN product_material_sku pms ON pms.id = ps.product_model_id
+ LEFT JOIN product_material pm ON pm.id = pms.product_id
+ WHERE ps.bom_id = #{bomId}
+ ORDER BY ps.id
</select>
- <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+
+ <select id="listByBomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
- p.product_name,
- pp.name as process_name,
- pm.product_id,
- pm.model
- from
- product_structure 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_process pp on ps.process_id = pp.id
- where pb.product_model_id = #{productModelId}
+ pp.name as process_name
+ from product_structure ps
+ left join product_process pp on ps.process_id = pp.id
+ where ps.bom_id = #{bomId}
+ and ps.process_id = #{processId}
order by ps.id
</select>
</mapper>
--
Gitblit v1.9.3