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/StockInRecordMapper.xml | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index a869ff2..5d5f6fa 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -3,6 +3,17 @@
<mapper namespace="com.ruoyi.stock.mapper.StockInRecordMapper">
<select id="listPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
+ WITH RECURSIVE product_tree AS (
+ SELECT id
+ FROM product
+ WHERE id = #{params.topParentProductId}
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id
+ )
SELECT
sir.*,
p.product_name AS product_name,
@@ -17,7 +28,6 @@
LEFT JOIN product p2 ON p.parent_id = p2.id
LEFT JOIN sys_user AS u ON sir.create_user = u.user_id
<where>
- AND p2.product_name != '鍗婃垚鍝�'
<if test="params.timeStr != null and params.timeStr != ''">
AND sir.create_time LIKE CONCAT('%', #{params.timeStr}, '%')
</if>
@@ -30,11 +40,31 @@
<if test="params.recordType != null and params.recordType != ''">
AND sir.record_type = #{params.recordType}
</if>
+ <if test="params.processCategory != null and params.processCategory != ''">
+ AND sir.process_category = #{params.processCategory}
+ </if>
+ <if test="params.voltage != null and params.voltage != ''">
+ AND sir.voltage = #{params.voltage}
+ </if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ AND p.id in (select id from product_tree)
+ </if>
</where>
ORDER BY
sir.id DESC
</select>
<select id="listStockInRecordExportData" resultType="com.ruoyi.stock.execl.StockInRecordExportData">
+ WITH RECURSIVE product_tree AS (
+ SELECT id
+ FROM product
+ WHERE id = #{params.topParentProductId}
+
+ UNION ALL
+
+ SELECT p.id
+ FROM product p
+ INNER JOIN product_tree pt ON p.parent_id = pt.id
+ )
SELECT
sir.*,
p.product_name as product_name,
@@ -58,6 +88,15 @@
</if>
<if test="params.recordType != null and params.recordType != ''">
and sir.record_type = #{params.recordType}
+ </if>
+ <if test="params.processCategory != null and params.processCategory != ''">
+ and sir.process_category = #{params.processCategory}
+ </if>
+ <if test="params.voltage != null and params.voltage != ''">
+ and sir.voltage = #{params.voltage}
+ </if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (select id from product_tree)
</if>
</where>
order by sir.id desc
@@ -86,4 +125,4 @@
ORDER BY
sir.id DESC
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3