From a8557c74bba5f4f7ff9b2f3c9d84db5d24bb43cd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 十二月 2024 10:33:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 14 ++++++++++++--
1 files changed, 12 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 d79c469..81deef7 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}
@@ -189,4 +191,12 @@
and ogd.glass_child=#{glassChild}
</select>
+ <select id="getMinIdByGroup" >
+ select min(id) 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