From fb4f2c9223a17aaefaa27a59d1d2b61460157c7d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 25 六月 2026 11:22:08 +0800
Subject: [PATCH] fix: 库存修改为大类展示
---
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 2 ++
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 20 ++++++++++++++++++++
src/main/resources/mapper/stock/StockInRecordMapper.xml | 20 ++++++++++++++++++++
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 1 +
4 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 3e2390a..d055afd 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -40,4 +40,5 @@
*/
private BigDecimal thickness;
+ private Long topParentProductId;
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index 0b81981..42102a6 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -39,4 +39,6 @@
* 鍘氬害
*/
private BigDecimal thickness;
+
+ private Long topParentProductId;
}
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index c9ada77..63b0fe5 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -34,6 +34,16 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id FROM product WHERE id = #{params.topParentProductId}
+ UNION ALL
+ SELECT p2.id FROM product p2 INNER JOIN product_tree pt ON p2.parent_id = pt.id
+ )
+ SELECT id FROM product_tree
+ )
+ </if>
<if test="params.salesContractNo != null and params.salesContractNo != ''">
and (
(sir.record_type IN ('6', '7', '18', '19', '20') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
@@ -82,6 +92,16 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id FROM product WHERE id = #{params.topParentProductId}
+ UNION ALL
+ SELECT p2.id FROM product p2 INNER JOIN product_tree pt ON p2.parent_id = pt.id
+ )
+ SELECT id FROM product_tree
+ )
+ </if>
<if test="params.salesContractNo != null and params.salesContractNo != ''">
and (
(sir.record_type IN ('6', '7', '18', '19', '20') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index e5fc445..784e2b3 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -45,6 +45,16 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id FROM product WHERE id = #{params.topParentProductId}
+ UNION ALL
+ SELECT p2.id FROM product p2 INNER JOIN product_tree pt ON p2.parent_id = pt.id
+ )
+ SELECT id FROM product_tree
+ )
+ </if>
<if test="params.salesContractNo != null and params.salesContractNo != ''">
and (
(sor.record_type IN ('9', '16', '12') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
@@ -89,6 +99,16 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.topParentProductId != null and params.topParentProductId > 0">
+ and p.id in (
+ WITH RECURSIVE product_tree AS (
+ SELECT id FROM product WHERE id = #{params.topParentProductId}
+ UNION ALL
+ SELECT p2.id FROM product p2 INNER JOIN product_tree pt ON p2.parent_id = pt.id
+ )
+ SELECT id FROM product_tree
+ )
+ </if>
<if test="params.salesContractNo != null and params.salesContractNo != ''">
and (
(sor.record_type IN ('9', '16', '12') and pl.purchase_contract_number like concat('%',#{params.salesContractNo},'%'))
--
Gitblit v1.9.3