From ce06fcc3113dc45647910deef0e4adeaa97bfa3f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 15 十月 2025 13:32:40 +0800
Subject: [PATCH] 语言修改
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 40aaeda..6a504f0 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,9 @@
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,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.position')),
+ ''),
pd.detail,
if( od.bend_radius!='',
round(od.width*
@@ -93,6 +95,7 @@
<result column="child_width" property="childWidth"/>
<result column="child_height" property="childHeight"/>
<result column="arc" property="arc"/>
+ <result column="arch_rise" property="archRise"/>
<result column="icon" property="icon"/>
<result column="process" property="process"/>
<result column="area" property="area"/>
@@ -133,6 +136,7 @@
a.child_width,
a.child_height,a.arc,
a.icon,
+ a.arch_rise,
a.area,
b.quantity,
a.process,
@@ -156,7 +160,8 @@
a.total_area = #{item.area}*b.quantity,
a.icon = #{item.icon},
a.process = #{item.process},
- a.arc = #{item.arc}
+ a.arc = #{item.arc},
+ a.arch_rise = #{item.archRise}
where
a.order_id = b.order_id
and a.order_id = #{item.orderId}
@@ -220,7 +225,7 @@
</select>
<select id="getMaxTechnologyNumberByGroup" >
- select min(technology_number) from sd.order_glass_detail as a
+ select max(technology_number) from sd.order_glass_detail as a
where a.order_id = #{orderId}
and a.order_number = #{orderNumber}
and a.`group` = #{group}
--
Gitblit v1.8.0