From 973677d7792dbe440bd032ff4cc138458c89b06e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 15 一月 2026 17:00:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProductStructureMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index df5a966..1833487 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -9,11 +9,9 @@
<result property="unitQuantity" column="unit_quantity"/>
<result property="demandedQuantity" column="demanded_quantity"/>
<result property="unit" column="unit"/>
- <result property="diskQuantity" column="disk_quantity"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
-
- <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
p.product_name,
pp.name as process_name,
@@ -24,7 +22,22 @@
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.parent_id = #{productModelId}
+ where ps.bom_id = #{bomId}
+ order by ps.id
+ </select>
+ <select id="listByproductModelId" 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}
order by ps.id
</select>
</mapper>
--
Gitblit v1.9.3