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/ProductBomMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductBomMapper.xml b/src/main/resources/mapper/production/ProductBomMapper.xml
index ec06cd3..4bb8f1e 100644
--- a/src/main/resources/mapper/production/ProductBomMapper.xml
+++ b/src/main/resources/mapper/production/ProductBomMapper.xml
@@ -18,16 +18,20 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductBomDto">
select * from (select pb.*,
pm.model productModelName,
+ pm.drawing_number,
p.product_name productName
from product_bom pb
left join product_model pm on pb.product_model_id = pm.id
left join product p on pm.product_id = p.id)A
where 1=1
<if test="c.productModelName != null">
- and productModelName = #{c.productModelName}
+ and product_model_name = #{c.productModelName}
+ </if>
+ <if test="c.productModelId != null">
+ and product_model_id = #{c.productModelId}
</if>
<if test="c.productName != null">
- and productName = #{c.productName}
+ and product_name = #{c.productName}
</if>
<if test="c.bomNo != null">
and bom_no = #{c.bomNo}
@@ -39,7 +43,8 @@
<select id="getById" resultType="com.ruoyi.production.dto.ProductBomDto">
select pb.*,
pm.model productModelName,
- p.product_name productName
+ p.product_name productName,
+ pm.drawing_number
from product_bom pb
left join product_model pm on pb.product_model_id = pm.id
left join product p on pm.product_id = p.id
--
Gitblit v1.9.3