From e13adb29e7b20fe06c17fc7c3a2c133219299967 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 06 三月 2025 15:47:48 +0800
Subject: [PATCH] 提交大小片和成品尺寸不相同时标签也显示
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 13 +++++++++----
1 files changed, 9 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 b73cec4..1685b1b 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -92,6 +92,7 @@
<result column="glass_child" property="glassChild"/>
<result column="child_width" property="childWidth"/>
<result column="child_height" property="childHeight"/>
+ <result column="arc" property="arc"/>
<result column="icon" property="icon"/>
<result column="process" property="process"/>
<result column="area" property="area"/>
@@ -130,7 +131,7 @@
a.total_area,
b.edging_type,
a.child_width,
- a.child_height,
+ a.child_height,a.arc,
a.icon,
a.area,
b.quantity,
@@ -154,7 +155,8 @@
a.area = #{item.area},
a.total_area = #{item.area}*b.quantity,
a.icon = #{item.icon},
- a.process = #{item.process}
+ a.process = #{item.process},
+ a.arc = #{item.arc}
where
a.order_id = b.order_id
and a.order_id = #{item.orderId}
@@ -166,11 +168,14 @@
<select id="getDifferentSizeNumber">
select if(count(id)>1,1,0) from (select
- id
+ a.id
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
+ and a.child_width != b.width
where a.order_id = #{orderId}
and a.order_number = #{orderNumber}
- group by child_width,child_height) as c
+ ) as c
</select>
<select id="getOrderGlassDetailByProductIdGlassChild" >
--
Gitblit v1.8.0