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/stock/StockOutRecordMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 3c21f33..782f525 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -35,11 +35,15 @@
pm.model,
pm.unit,
pm.material_code as materialCode,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ pp.name as processName
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
+ LEFT JOIN production_product_main as ppm on sor.record_type = '3' and ppm.id = sor.record_id
+ LEFT JOIN product_process_route_item as ppri on ppri.id = ppm.product_process_route_item_id
+ LEFT JOIN product_process as pp on pp.id = ppri.process_id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
@@ -77,11 +81,15 @@
pm.model,
pm.unit,
pm.material_code as materialCode,
- u.nick_name as createBy
+ u.nick_name as createBy,
+ pp.name as processName
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
LEFT JOIN product as p on pm.product_id = p.id
LEFT JOIN sys_user as u on sor.create_user = u.user_id
+ LEFT JOIN production_product_main as ppm on sor.record_type = '3' and ppm.id = sor.record_id
+ LEFT JOIN product_process_route_item as ppri on ppri.id = ppm.product_process_route_item_id
+ LEFT JOIN product_process as pp on pp.id = ppri.process_id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
@@ -102,4 +110,4 @@
order by sor.id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3