From 6121eaa7f8df0b8bf46d92d36e96991a6f4d23f1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 11:20:13 +0800
Subject: [PATCH] feat(stock): 增加顶级父产品id查询入库、出库记录功能

---
 src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java |    4 ++++
 src/main/resources/mapper/stock/StockOutRecordMapper.xml |   14 ++++++++++++++
 src/main/resources/mapper/stock/StockInRecordMapper.xml  |   16 +++++++++++++++-
 src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java  |    4 ++++
 4 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 9f47fd6..05c1960 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,6 +1,7 @@
 package com.ruoyi.stock.dto;
 
 import com.ruoyi.stock.pojo.StockInRecord;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 
@@ -26,4 +27,7 @@
     //鐜板瓨閲�
     private String currentStock;
 
+    @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+    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 3e3abf9..f09d78d 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -1,6 +1,7 @@
 package com.ruoyi.stock.dto;
 
 import com.ruoyi.stock.pojo.StockOutRecord;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,4 +26,7 @@
     private String timeStr;
 
     private String createBy;
+
+    @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+    private Long topParentProductId;
 }
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index d5c3f38..62f1d19 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,
@@ -25,6 +36,9 @@
             </if>
             <if test="params.recordType != null and params.recordType != ''">
                 and sir.record_type = #{params.recordType}
+            </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
@@ -56,4 +70,4 @@
         </where>
         order by sir.id desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index a441de9..8615294 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -18,6 +18,17 @@
     </resultMap>
 
     <select id="listPage" resultType="com.ruoyi.stock.dto.StockOutRecordDto">
+        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
         sor.*,
         p.product_name as productName,
@@ -41,6 +52,9 @@
             <if test="params.recordType != null and params.recordType != ''">
                 and sor.record_type = #{params.recordType}
             </if>
+            <if test="params.topParentProductId != null and params.topParentProductId > 0">
+                and p.id in (select id from product_tree)
+            </if>
         </where>
         order by sor.id desc
     </select>

--
Gitblit v1.9.3