From 47eb3a7bb1e7901a6d45d9df8ea8b9c4fb28ae82 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 05 三月 2025 16:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 6 ++++--
1 files changed, 4 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 b73cec4..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}
--
Gitblit v1.8.0