From 7f54cd99dfaf0cd391eaed930872460f85cd7a8e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 七月 2024 10:36:57 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 978b893..b47b6df 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -796,10 +796,14 @@
b.delivery,
b.create_time,
b.update_time,
- d.type_name as level_one, e.type_name as level_two
+ d.type_name as level_one,
+ e.type_name as level_two,
+ f.customer_abbreviation
from sd.order_detail as a
left join sd.`order` as b
on b.order_id = a.order_id
+ left join sd.customer as f
+ on f.id = b.customer_id
left join sd.product as c
on c.id = a.product_id
left join sd.basic_glass_type as d
@@ -863,6 +867,15 @@
order by id;
</select>
+ <select id="getOrderProductByProductIds">
+ select *
+ from sd.order_detail od
+ left join sd.product_detail pd on od.product_id = pd.prod_id
+ where od.order_id = #{orderId} and od.product_id=#{productId}
+ and pd.detail_type = 'glass'
+ group by od.product_id,pd.detail
+ </select>
+
--
Gitblit v1.8.0