From 7762642aceaf3ba55ee6ec37a2d99ad3c827e5ff Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 16:29:21 +0800
Subject: [PATCH] 在制品报表汇总修改
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 6 +++++-
1 files changed, 5 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 2af4985..8cae8a7 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -23,7 +23,11 @@
od.order_id,
od.order_number,
pd.glass_sort,
- if(pd.glass_sort=1,'(澶�)',if(pd2.glass_sort=pd.glass_sort,'(鍐�)','')),
+ if(pd.glass_sort=1 or pd2.glass_sort=pd.glass_sort,
+ 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!='',
round(od.width*
--
Gitblit v1.8.0