From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位，审核
---
src/main/resources/mapper/production/ProductStructureMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index aae9668..edabbfa 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -26,6 +26,9 @@
left join product_bom pb on ps.bom_id = pb.id
left join product_process pp on ps.process_id = pp.id
where ps.bom_id = #{bomId}
+ <if test="isParent">
+ and ps.parent_id is not null
+ </if>
order by ps.id
</select>
<select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">
@@ -36,12 +39,11 @@
pm.model,
pm.drawing_number
from
- product_structure ps
+ product_structure_record 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}
+ where ps.process_id=#{processId}
order by ps.id
</select>
</mapper>
--
Gitblit v1.9.3