From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
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