From 3066a8f5c1f475997bfe23857ba4bae9395900c4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 13 八月 2026 10:19:24 +0800
Subject: [PATCH] fix: 领料功能修改，移除订单领料，添加工序领料功能，支持按工序查询物料与已领料记录
---
src/main/resources/mapper/technology/TechnologyBomStructureMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/technology/TechnologyBomStructureMapper.xml b/src/main/resources/mapper/technology/TechnologyBomStructureMapper.xml
index 536cdba..faa594a 100644
--- a/src/main/resources/mapper/technology/TechnologyBomStructureMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyBomStructureMapper.xml
@@ -16,6 +16,10 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <!--
+ 鎵佸钩 BOM 鏄庣粏锛氫竴琛� = 涓�涓墿鏂欒鏍� + 鍏舵秷鑰楀伐搴忋��
+ 鍘嗗彶鏁版嵁涓� BOM 鎴愬搧鏍硅妭鐐癸紙鏃犵埗鑺傜偣銆佹棤宸ュ簭涓旇鏍肩瓑浜� BOM 鎴愬搧瑙勬牸锛変笉鏄墿鏂欙紝闇�瑕佹帓闄ゃ��
+ -->
<select id="listByBomId" resultType="com.ruoyi.technology.bean.vo.TechnologyBomStructureVo">
select tbs.*,
p.product_name as productName,
@@ -24,10 +28,14 @@
top1.name as operationName,
pm.product_code as productCode
from technology_bom_structure tbs
+ inner join technology_bom tb on tbs.bom_id = tb.id
left join product_model pm on tbs.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join technology_operation top1 on tbs.operation_id = top1.id
where tbs.bom_id = #{bomId}
+ and not (tbs.parent_id is null
+ and tbs.operation_id is null
+ and tbs.product_model_id = tb.product_model_id)
order by tbs.id
</select>
</mapper>
--
Gitblit v1.9.3