From 7071e6b8b3f144b80463b2c99684d4187bc2b79a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 09 七月 2025 11:50:19 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 27d6d8c..4322a81 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -397,7 +397,10 @@
concat(a.width," * " , a.height) as size,
b.area,
b.glass_child as glassChild,
- d.product_name as productName
+ d.product_name as productName,
+ d.building_number as buildingNumber,
+ d.remarks as remarks,
+ d.processing_note as processingNote
from pp.optimize_heat_detail as a
left join sd.order_glass_detail as b
on b.order_number = a.order_sort
--
Gitblit v1.8.0