From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/resources/mapper/stock/StockInRecordMapper.xml | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index 1dd3a52..5d5f6fa 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -3,36 +3,72 @@
<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,
+ p.product_name AS product_name,
pm.model,
pm.unit,
- u.nick_name as createBy
- FROM stock_in_record as sir
- LEFT JOIN product_model as pm on sir.product_model_id = pm.id
- LEFT JOIN product as p on pm.product_id = p.id
- LEFT JOIN sys_user as u on sir.create_user = u.user_id
+ pm.material_code AS materialCode,
+ u.nick_name AS createBy
+ FROM
+ stock_in_record AS sir
+ LEFT JOIN product_model AS pm ON sir.product_model_id = pm.id
+ LEFT JOIN product AS p ON pm.product_id = p.id
+ LEFT JOIN product p2 ON p.parent_id = p2.id
+ LEFT JOIN sys_user AS u ON sir.create_user = u.user_id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
- and sir.create_time like concat('%',#{params.timeStr},'%')
+ AND sir.create_time LIKE CONCAT('%', #{params.timeStr}, '%')
</if>
<if test="params.productName != null and params.productName != ''">
- and p.product_name like concat('%',#{params.productName},'%')
+ AND p.product_name LIKE CONCAT('%', #{params.productName}, '%')
</if>
<if test="params.type != null and params.type != ''">
- and sir.type = #{params.type}
+ AND sir.type = #{params.type}
</if>
<if test="params.recordType != null and params.recordType != ''">
- and sir.record_type = #{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
+ 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,
+ pm.material_code as materialCode,
pm.model,
pm.unit,
u.nick_name as createBy
@@ -52,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
@@ -64,6 +109,7 @@
p.product_name AS product_name,
pm.model,
pm.unit,
+ pm.material_code AS materialCode,
u.nick_name AS createBy
FROM
stock_in_record AS sir
@@ -79,4 +125,4 @@
ORDER BY
sir.id DESC
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3