From a27ce393f9924c044dfe743b220f0300f33e79d3 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期二, 06 八月 2024 15:47:14 +0800
Subject: [PATCH] 合并相关文件
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 2b2d990..e79a190 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -154,11 +154,11 @@
<insert id="insertDeliveryDetail" useGeneratedKeys="true" >
insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
- area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price)
+ area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money)
values (
#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
- #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price}
+ #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}
)
</insert>
@@ -183,6 +183,7 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ od.area,
od.gross_area,
od.compute_area,
od.compute_gross_area,
@@ -372,6 +373,7 @@
od.height,
od.shape,
fgi.actual_signal_area,
+ od.area,
od.gross_area,
od.compute_area,
od.compute_gross_area,
--
Gitblit v1.8.0