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/MaterialStore.xml | 18 ++++++++++++++++++
1 files changed, 18 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 2fc6969..de24da0 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
@@ -22,6 +22,24 @@
limit #{offset},#{pageSize};
</select>
+ <select id="getSelectProductBOM">
+ select
+ m.id,m.type,m.json,m.create_time,bb.consume,bb.type as bomType,bb.price,bb.id as tabId
+ from
+ sd.bom_base as bb
+ left join mm.material_store m on bb.material_id=m.id
+ <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
+ limit #{offset},#{pageSize};
+ </select>
+
<select id="getSelectMaterialStores">
select
*
--
Gitblit v1.8.0