From 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 09:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 224eb5a..79b08cd 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -62,6 +62,7 @@
         si.version,
         (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
         pm.model,
+        si.remark,
         pm.unit,
         p.product_name
         from stock_inventory si
@@ -77,8 +78,8 @@
         pm.model,
         pm.unit,
         p.product_name,
-        si.warn_num,
-        si.locked_quantity,
+        coalesce(si.warn_num, 0) as warn_num,
+        coalesce(si.locked_quantity, 0) as locked_quantity,
         si.remark,
         si.update_time
         from stock_inventory si
@@ -183,5 +184,53 @@
         pm.unit,
         p.product_name
     </select>
+    <select id="selectTotal" resultType="java.math.BigDecimal">
+        select ifnull(sum(qualitity), 0)
+        from stock_inventory
+    </select>
+
+    <select id="selectTotalByDate" resultType="java.math.BigDecimal">
+        select IFNULL(sum(qualitity), 0)
+        from stock_inventory
+        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
+              FROM stock_inventory
+              UNION ALL
+              SELECT create_time
+              FROM stock_uninventory) combined
+        WHERE create_time &gt;= #{startDate}
+          AND create_time &lt;= #{endDate}
+    </select>
+
+    <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})
+          AND sir.create_time &gt;= #{startDate}
+          AND sir.create_time &lt;= #{endDate}
+        GROUP BY DATE(sir.create_time)
+        ORDER BY DATE(sir.create_time) ASC
+    </select>
+
+    <select id="selectDailyStockOutCounts" resultType="java.util.Map">
+        SELECT DATE(sor.create_time)  AS date,
+               SUM(sor.stock_out_num) AS count
+        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})
+          AND sor.create_time &gt;= #{startDate}
+          AND sor.create_time &lt;= #{endDate}
+        GROUP BY DATE(sor.create_time)
+        ORDER BY DATE(sor.create_time) ASC
+    </select>
 
 </mapper>

--
Gitblit v1.9.3