From 554886463a4cb4a2d5c042f08e85d2dfcd6e9dcf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 12 十二月 2025 10:02:22 +0800
Subject: [PATCH] 修改义乌合片流程卡配置

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 2 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..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,6 +6,42 @@
 
     <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}
+            </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
         *
         from
         mm.material_store m
@@ -17,7 +53,11 @@
                 and m.type regexp #{materialStore.type}
             </if>
         </where>
-        limit #{offset},#{pageSize};
+        order by m.id desc
+    </select>
+
+    <select id="getSelectMaterialStoreById">
+        select * from mm.material_store m where id=#{id}
     </select>
 
     <select id="getSelectMaterialStorePageTotal">
@@ -30,7 +70,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 +93,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