From e731bf5f64d71ed93a570d505c52dc44d491175e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 11:21:33 +0800
Subject: [PATCH] fix(home): 修复首页采购品分布和出入库趋势数据统计问题

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   85 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index fac5842..82709f5 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -86,6 +86,48 @@
         </if>
     </select>
 
+    <!-- 鎶ュ簾鍝侀�夋枡锛氬彧鏌ヤ骇鍝佹爲銆屽嵄搴熷缃鐢熷嵄搴熴�嶅ぇ绫伙紙鍚叾鎵�鏈夊瓙鑺傜偣锛変笅鐨勫悎鏍煎簱瀛橈紝甯︽壒鍙枫��
+         澶х被鍚嶆寜涓氬姟鍙e緞鍐欐鍦ㄨ繖閲岋紝鏀瑰彛寰勫彧闇�鏀硅繖涓�澶勩��
+         璇ユ煡璇互 WITH 寮�澶达紝鑰屾暟鎹潈闄愭嫤鎴櫒鍙鐞� select 寮�澶寸殑 SQL锛屽洜姝や笉浼氳拷鍔� dept_id/create_user,
+         涓庛�屽簱瀛樻槸鍏辩敤鍩虹鏁版嵁銆侀�夋枡涓嶅簲鍙楀缓鍗曚汉闄愬埗銆嶇殑鍙e緞涓�鑷达紱淇濈暀 /*data_scope*/ 鏍囪璁╄繖涓剰鍥炬樉寮忓彲璇汇��
+         涓嶅奖鍝嶅師 pagestockInventory -->
+    <select id="selectScrapStockPage" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+        WITH RECURSIVE scrap_product_tree AS (
+            SELECT id
+            FROM product
+            WHERE product_name = '鍗卞簾澶勭疆娆$敓鍗卞簾'
+            UNION ALL
+            SELECT p.id
+            FROM product p
+            INNER JOIN scrap_product_tree t ON p.parent_id = t.id
+        )
+        select /*data_scope*/ si.id,
+        si.product_model_id,
+        si.batch_no,
+        si.qualitity,
+        COALESCE(si.locked_quantity, 0) as locked_quantity,
+        (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
+        si.remark,
+        si.version,
+        pm.model,
+        pm.unit,
+        p.product_name
+        from stock_inventory si
+        left join product_model pm on si.product_model_id = pm.id
+        left join product p on pm.product_id = p.id
+        where pm.product_id in (select id from scrap_product_tree)
+        <if test="ew.productModelId != null">
+            and si.product_model_id = #{ew.productModelId}
+        </if>
+        <if test="ew.batchNo != null and ew.batchNo != ''">
+            and si.batch_no like concat('%',#{ew.batchNo},'%')
+        </if>
+        <if test="ew.productName != null and ew.productName != ''">
+            and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
+        order by si.update_time desc
+    </select>
+
     <select id="pageListCombinedStockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
         WITH RECURSIVE product_tree AS (
         SELECT id
@@ -121,6 +163,13 @@
         product_name,
         product_id,
         'combined' as stockType,
+        (
+        select sir.tank_no
+        from stock_in_record sir
+        where sir.product_model_id = combined.product_model_id
+        order by sir.id desc
+        limit 1
+        ) as tank_no,
         (
         select sir.oil_product
         from stock_in_record sir
@@ -336,7 +385,15 @@
             unit,
             product_name,
             product_id,
-            'combined' as stockType
+            'combined' as stockType,
+            (
+            select sir.tank_no
+            from stock_in_record sir
+            where sir.product_model_id = combined.product_model_id
+            and (sir.batch_no = combined.batch_no or (combined.batch_no is null and sir.batch_no is null))
+            order by sir.id desc
+            limit 1
+            ) as tank_no
         from (
             select
             si.batch_no,
@@ -547,13 +604,25 @@
                 AND create_time &lt;= #{endDate}) AS combined_counts
     </select>
 
+    <!-- 鍑哄叆搴撹秼鍔匡細浜у搧鍒嗙被蹇呴』閫掑綊鍙栨暣妫靛瓙鏍戙��
+         浜у搧鏍戞槸銆屽ぇ绫� -> 鍝佺被 -> 鍏蜂綋浜у搧銆嶄笁灞傦紝浜у搧鍨嬪彿锛坧roduct_model锛夋寕鍦ㄥ彾瀛愪骇鍝佷笂锛�
+         鍙瘮瀵圭洿鎺ュ瓙鑺傜偣锛坧.parent_id = root锛夋案杩滃懡涓笉鍒板瀷鍙凤紝瓒嬪娍鍥炬亽涓虹┖銆�
+         閫掑綊 CTE 鍐欏湪鎷彿鍐咃紝璁╄鍙ヤ粛浠� SELECT 寮�澶达紝鏁版嵁鏉冮檺鎷︽埅鍣ㄧ収甯稿 stock_in_record 鐢熸晥 -->
     <select id="selectDailyStockInCounts" resultType="java.util.Map">
         SELECT DATE(sir.create_time) AS date,
                SUM(sir.stock_in_num) AS count
         FROM stock_in_record sir
                  JOIN product_model pm ON sir.product_model_id = pm.id
                  JOIN product p ON pm.product_id = p.id
-        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
+        WHERE p.id IN (WITH RECURSIVE product_tree AS (SELECT id
+                                                       FROM product
+                                                       WHERE id = #{rootCategoryId}
+                                                       UNION ALL
+                                                       SELECT p2.id
+                                                       FROM product p2
+                                                                JOIN product_tree pt ON p2.parent_id = pt.id)
+                       SELECT id
+                       FROM product_tree)
           AND sir.create_time &gt;= #{startDate}
           AND sir.create_time &lt;= #{endDate}
         GROUP BY DATE(sir.create_time)
@@ -566,7 +635,15 @@
         FROM stock_out_record sor
                  JOIN product_model pm ON sor.product_model_id = pm.id
                  JOIN product p ON pm.product_id = p.id
-        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
+        WHERE p.id IN (WITH RECURSIVE product_tree AS (SELECT id
+                                                       FROM product
+                                                       WHERE id = #{rootCategoryId}
+                                                       UNION ALL
+                                                       SELECT p2.id
+                                                       FROM product p2
+                                                                JOIN product_tree pt ON p2.parent_id = pt.id)
+                       SELECT id
+                       FROM product_tree)
           AND sor.create_time &gt;= #{startDate}
           AND sor.create_time &lt;= #{endDate}
         GROUP BY DATE(sor.create_time)
@@ -1126,7 +1203,7 @@
         product_name,
         product_id
         order by
-        batch_no
+        MAX(update_time) desc
     </select>
 
 </mapper>

--
Gitblit v1.9.3