From 50efd9f19463da742e8c7b751bb4ab2c97acbf61 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 七月 2024 13:13:15 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 1f9e8ac..bb626f8 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -150,7 +150,7 @@
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)
values (
- #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
+ #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
#{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now()
)
@@ -888,7 +888,7 @@
</select>
<select id="getSelectOrderPrinting" >
- select od.order_id,od.product_id,od.product_name,sum(od.area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
+ select od.order_id,od.product_id,od.product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
order_detail od
<where>
<if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -901,20 +901,32 @@
<select id="getSelectDeliveryDetailPrinting" >
select od.order_id,
od.order_number,
- od.product_name,
+ p.remarks as product_name,
od.width,
od.height,
dd.quantity,
dd.money,
dd.area,
ifnull(od.processing_note,"") as processingNote,
- ifnull(od.buildingNumber,"") as buildingNumber,
- od.price
+ ifnull(od.building_number,"") as buildingNumber,
+ od.price,
+ od.other_columns
from delivery_detail dd
left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
+ left join product p on od.product_id = p.id
where delivery_id = #{deliveryId}
and od.order_id = #{orderId}
and od.product_id = #{productId}
+ </select>
+
+ <select id="getSelectotherMoney" >
+ select bom.alias,oom.price,#{value} as count,oom.price*#{value} as monery
+ from delivery_detail dd
+ left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
+ left join order_other_money oom on oom.order_id=dd.order_id and oom.column=#{key}
+ left join basic_other_money bom on bom.`column`=oom.`column`
+ where delivery_id = #{deliveryId}
+ and od.order_id = #{orderId}
</select>
<select id="getSelectOrderDetailPrinting" >
@@ -925,9 +937,9 @@
od.height,
od.quantity,
od.gross_amount,
- od.area,
+ od.compute_gross_area,
ifnull(od.processing_note,"") as processingNote,
- ifnull(od.remarks,"") as buildingNumber,
+ ifnull(od.building_number,"") as buildingNumber,
od.price
from order_detail od
where od.order_id = #{orderId}
--
Gitblit v1.8.0