From 253c24495ebc405492a40123bf42c74670979a7d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 25 三月 2026 15:15:36 +0800
Subject: [PATCH] feat(production): 添加uidNo字段并优化API路径配置

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 7fe1f4f..9013be3 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -64,6 +64,7 @@
         pm.model,
         si.remark,
         pm.unit,
+        pm.uidNo,
         p.product_name
         from stock_inventory si
         left join product_model pm on si.product_model_id = pm.id
@@ -94,6 +95,7 @@
         select sir.*,si.qualitity as current_stock,
         pm.model,
         pm.unit,
+        pm.uidNo,
         p.product_name,
         su.nick_name as create_by
         from
@@ -199,14 +201,16 @@
     </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