From 47eb3a7bb1e7901a6d45d9df8ea8b9c4fb28ae82 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 05 三月 2025 16:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

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

diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
index 1c3214b..42b8df8 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
@@ -17,7 +17,24 @@
                 and m.type regexp #{materialStore.type}
             </if>
         </where>
+        order by m.id desc
         limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialStores">
+        select
+        *
+        from
+        mm.material_store m
+        <where>
+            <if test="materialStore.id != null and materialStore.id != ''">
+                and m.id regexp #{materialStore.id}
+            </if>
+            <if test="materialStore.type != null and materialStore.type != ''">
+                and m.type regexp #{materialStore.type}
+            </if>
+        </where>
+        order by m.id desc
     </select>
 
     <select id="getSelectMaterialStoreById">
@@ -57,6 +74,14 @@
         delete from mm.material_store where id=#{id}
     </delete>
 
+    <select id="selectMaterialStore" >
+        select count(*) from mm.material_inventory where material_code=#{id}
+    </select>
+
+    <select id="selectMaterialStoreJson" >
+        select count(*) from mm.material_store where json=#{json}
+    </select>
+
 
 
 

--
Gitblit v1.8.0