From be43a6e71f665ce97c9fbf973bf43d24fdb24a54 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 28 一月 2026 10:51:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 3cf81dc..20b60e7 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
@@ -183,5 +184,9 @@
         pm.unit,
         p.product_name
     </select>
+    <select id="selectTotal" resultType="java.math.BigDecimal">
+        select ifnull(sum(qualitity),0)
+        from stock_inventory
+    </select>
 
 </mapper>

--
Gitblit v1.9.3