From a8301191af571f195984a24499905d843ee1638f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 18 二月 2025 12:42:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 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 5b496f1..2477586 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -1005,8 +1005,9 @@
(a.product_id) as 'productId',
a.product_name as 'productName',
+ p.remarks as 'remarks',
a.order_number as 'orderNumber'
- from order_detail as a
+ from order_detail as a left join sd.product p on a.product_id=p.id
where a.order_id = #{orderId}
group by a.product_id
</select>
@@ -1016,8 +1017,9 @@
(a.product_id) as 'productId',
a.product_name as 'productName',
+ p.remarks as 'remarks',
a.order_number as 'orderNumber'
- from order_detail as a
+ from sd.order_detail as a left join sd.product p on a.product_id=p.id
where a.order_id = #{orderId} and a.product_id IN
<foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
#{item}
--
Gitblit v1.8.0