From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 4911316..6125485 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,12 @@
and m.type regexp #{materialStore.type}
</if>
</where>
+ order by m.id desc
limit #{offset},#{pageSize};
+ </select>
+
+ <select id="getSelectMaterialStoreById">
+ select * from mm.material_store m where id=#{id}
</select>
<select id="getSelectMaterialStorePageTotal">
@@ -30,7 +35,9 @@
<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>
limit #{offset},#{pageSize};
</select>
@@ -51,6 +58,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