From f9a686b2bf16fcb2d1ffa31f4aac881c685d656a Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 08 四月 2026 10:31:12 +0800
Subject: [PATCH] feat(stock): 添加rootName字段支持产品树根名称查询

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 97dc81d..fd44dcd 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -52,6 +52,25 @@
         where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
     </update>
     <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+        WITH RECURSIVE cte AS (
+        SELECT id, product_name, parent_id, id AS current_id
+        FROM product
+
+        UNION ALL
+
+        SELECT c.id, c.product_name, p.parent_id, p.id
+        FROM cte c
+        JOIN product p ON c.parent_id = p.id
+        ),
+        root_map AS (
+        SELECT
+        c.id,
+        p.id AS root_id,
+        p.product_name AS root_name
+        FROM cte c
+        JOIN product p ON c.current_id = p.id
+        WHERE p.parent_id IS NULL
+        )
         select si.id,
         si.qualitity,
         COALESCE(si.locked_quantity, 0) as locked_quantity,
@@ -67,10 +86,14 @@
         p.product_name
         from stock_inventory si
         left join product_model pm on si.product_model_id = pm.id
+        LEFT JOIN root_map rm ON pm.product_id = rm.id
         left join product p on pm.product_id = p.id
         where 1 = 1
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
+        <if test="ew.rootName != null and ew.rootName != ''">
+            and rm.root_name = #{ew.rootName}
         </if>
     </select>
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -91,15 +114,17 @@
         </if>
     </select>
     <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
-        select sir.*,si.qualitity,
+        select sir.*,si.qualitity as current_stock,
         pm.model,
         pm.unit,
-        p.product_name
+        p.product_name,
+        su.nick_name as create_by
         from
         stock_in_record sir
         left join stock_inventory si on sir.product_model_id = si.product_model_id
         left join product_model pm on sir.product_model_id = pm.id
         left join product p on pm.product_id = p.id
+        left join sys_user su on sir.create_user = su.user_id
         <where>
             <if test="ew.reportDate != null">
                 and sir.create_time >= #{ew.reportDate}
@@ -188,22 +213,25 @@
         select ifnull(sum(qualitity), 0)
         from stock_inventory
     </select>
+
     <select id="selectTotalByDate" resultType="java.math.BigDecimal">
-        select sum(qualitity)
+        select IFNULL(sum(qualitity), 0)
         from stock_inventory
-        where
-           create_time &gt;= #{now} and create_time &lt; DATE_ADD(#{now}, INTERVAL 1 DAY)
+        where create_time &gt;= #{now}
+          and create_time &lt; DATE_ADD(#{now}, INTERVAL 1 DAY)
     </select>
 
     <select id="selectStorageProductCountByDate" resultType="int">
-        SELECT COUNT(*)
-        FROM (SELECT create_time
+        SELECT SUM(total_count)
+        FROM (SELECT COUNT(*) as total_count
               FROM stock_inventory
+              WHERE create_time &gt;= #{startDate}
+                AND create_time &lt;= #{endDate}
               UNION ALL
-              SELECT create_time
-              FROM stock_uninventory) combined
-        WHERE create_time &gt;= #{startDate}
-          AND create_time &lt;= #{endDate}
+              SELECT COUNT(*) as total_count
+              FROM stock_uninventory
+              WHERE create_time &gt;= #{startDate}
+                AND create_time &lt;= #{endDate}) AS combined_counts
     </select>
 
     <select id="selectDailyStockInCounts" resultType="java.util.Map">

--
Gitblit v1.9.3