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/StockUninventoryMapper.xml | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 6c5d3be..9aed783 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -44,30 +44,37 @@
where product_model_id = #{ew.productModelId}
</update>
<select id="pageStockUninventory" resultType="com.ruoyi.stock.dto.StockUninventoryDto">
- select su.id,
+ SELECT
+ su.id,
su.qualitity,
- COALESCE(su.locked_quantity, 0) as locked_quantity,
+ COALESCE(su.locked_quantity, 0) AS locked_quantity,
su.product_model_id,
su.create_time,
su.update_time,
su.version,
- su.update_time,
- (su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
+ (su.qualitity - COALESCE(su.locked_quantity, 0)) AS un_locked_quantity,
pm.model,
pm.unit,
- p.product_name
- from stock_uninventory su
- left join product_model pm on su.product_model_id = pm.id
- left join product p on pm.product_id = p.id
- where 1 = 1
+ pm.material_code as materialCode,
+ p.product_name,
+ p2.product_name AS parent_name
+ FROM
+ stock_uninventory su
+ LEFT JOIN product_model pm ON su.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ LEFT JOIN product p2 ON p.parent_id = p2.id
+ WHERE
+ 1 = 1
+ AND (p2.product_name != '鍗婃垚鍝�' OR p2.product_name IS NULL)
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
</select>
- <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
+ <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
select su.*,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name
from stock_uninventory su
left join product_model pm on su.product_model_id = pm.id
--
Gitblit v1.9.3