From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 81deef7..2af4985 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -93,6 +93,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 +134,7 @@
a.child_width,
a.child_height,a.arc,
a.icon,
+ a.arch_rise,
a.area,
b.quantity,
a.process,
@@ -156,7 +158,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}
@@ -167,12 +170,15 @@
</update>
<select id="getDifferentSizeNumber">
- select if(count(id)>1,1,0) from (select
- id
+ select if(count(id)>0,1,0) from (select
+ a.id,a.child_width,b.width
from order_glass_detail as a
+ left join order_detail as b
+ on a.order_id = b.order_id and a.order_number = b.order_number
where a.order_id = #{orderId}
and a.order_number = #{orderNumber}
- group by child_width,child_height) as c
+ and(a.child_width != b.width or a.child_height != b.height)
+ ) as c
</select>
<select id="getOrderGlassDetailByProductIdGlassChild" >
@@ -199,4 +205,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