From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 6a504f0..8cae8a7 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -24,7 +24,9 @@
od.order_number,
pd.glass_sort,
if(pd.glass_sort=1 or pd2.glass_sort=pd.glass_sort,
- JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.position')),
+ if(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.position'))='',
+ if(pd.glass_sort=1,#{outside},#{inside})
+ ,JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.position'))),
''),
pd.detail,
if( od.bend_radius!='',
--
Gitblit v1.8.0