From 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期二, 04 十一月 2025 14:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 65a1c44..8fff2e2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -1387,4 +1387,13 @@
         where id=#{materialInventoryId}
     </update>
 
+    <select id="selectGetStockList">
+        select mi.*, ms.json
+        from mm.material_inventory mi
+        left join mm.material_store ms
+            on mi.material_code=ms.id
+        where inventory_quantity>0
+        order by mi.id desc
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0