From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 89b7247..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*
@@ -93,6 +97,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 +138,7 @@
a.child_width,
a.child_height,a.arc,
a.icon,
+ a.arch_rise,
a.area,
b.quantity,
a.process,
@@ -156,7 +162,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}
@@ -202,4 +209,29 @@
</select>
+ <select id="getMaxIdByGroup" >
+ select max(id) from sd.order_glass_detail as a
+ where a.order_id = #{orderId}
+ and a.order_number = #{orderNumber}
+ and a.`group` = #{group}
+
+ </select>
+
+
+ <select id="getMinTechnologyNumberByGroup" >
+ select min(technology_number) from sd.order_glass_detail as a
+ where a.order_id = #{orderId}
+ and a.order_number = #{orderNumber}
+ and a.`group` = #{group}
+
+ </select>
+
+ <select id="getMaxTechnologyNumberByGroup" >
+ 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}
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0