From 7bde96aaac4fcbd3afe4532e53f515f82c04a121 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 16 三月 2026 11:59:09 +0800
Subject: [PATCH] fix(production): 优化报工投入品数量计算及库存校验逻辑
---
src/main/resources/mapper/production/ProductStructureMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index f9faded..1dd30cd 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -10,6 +10,7 @@
<result property="demandedQuantity" column="demanded_quantity"/>
<result property="unit" column="unit"/>
<result property="tenantId" column="tenant_id"/>
+ <result property="materialType" column="material_type"/>
</resultMap>
<select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
@@ -25,4 +26,19 @@
where ps.bom_id = #{bomId}
order by ps.id
</select>
+ <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_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}
+ and ps.process_id=#{processId}
+ order by ps.id
+ </select>
</mapper>
--
Gitblit v1.9.3