From 4dcb5e299757924aef0edc4d608d2305dbedc780 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 九月 2025 08:59:33 +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 | 3 ++-
1 files changed, 2 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..2fc6969 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,10 @@
<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}
--
Gitblit v1.8.0