From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml |   21 ++++++++++++++++++++-
 1 files changed, 20 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 42b8df8..de24da0 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
@@ -6,9 +6,28 @@
 
     <select id="getSelectMaterialStore">
         select
-        *
+        m.id,m.type,m.json,m.create_time,bb.consume,bb.type as bomType,bb.price
         from
         mm.material_store m
+        left join sd.bom_base as bb 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="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}

--
Gitblit v1.8.0