From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/resources/mapper/production/ProductBomMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductBomMapper.xml b/src/main/resources/mapper/production/ProductBomMapper.xml
index ec06cd3..7ce0192 100644
--- a/src/main/resources/mapper/production/ProductBomMapper.xml
+++ b/src/main/resources/mapper/production/ProductBomMapper.xml
@@ -18,6 +18,7 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductBomDto">
select * from (select pb.*,
pm.model productModelName,
+ pm.material_code as materialCode,
p.product_name productName
from product_bom pb
left join product_model pm on pb.product_model_id = pm.id
@@ -35,6 +36,7 @@
<if test="c.version != null">
and version = #{c.version}
</if>
+ order by create_time desc
</select>
<select id="getById" resultType="com.ruoyi.production.dto.ProductBomDto">
select pb.*,
--
Gitblit v1.9.3