From b8202fa27280e1fc0ff962c874e94e625abeb7b8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 03 七月 2025 16:22:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   19 +++++++++++++++++++
 1 files changed, 19 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 0a1965e..ca674b4 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -1231,4 +1231,23 @@
           AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) &lt;= #{endDate}
           and ml.operate_type=#{type}
     </select>
+
+
+    <select id="getSelectMaterialInventoryMes">
+        select
+            mi.id,
+            mi.material_code AS materialCode,
+            mi.producer,
+            sum(mi.available_quantity) AS availableQuantity,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.width')) AS width,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.height')) AS height,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.thickness')) AS thickness,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.name')) AS name,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.model')) AS model,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.unit')) AS unit
+        from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
+        where mi.available_quantity>0
+        group by mi.material_code
+        order by mi.id desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0