From fca78824eee77245214021e8fe28d3e47cd4bf48 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 07 七月 2024 18:01:50 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 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 aa75b65..833d4d9 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -371,7 +371,8 @@
od.compute_gross_area,
od.processing_note,
od.edging_type,
- od.perimeter
+ od.perimeter,
+ od.other_columns
from sd.order_detail od
left join sd.`order` o on od.order_id = o.order_id
left join mm.finished_goods_inventory fgi
@@ -890,7 +891,7 @@
</select>
<select id="getSelectOrderPrinting" >
- select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
+ select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as gross_amount ,sum(od.quantity) as quantity from
order_detail od left join product p on od.product_id=p.id
<where>
@@ -929,7 +930,7 @@
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}
+ and od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
</select>
<select id="getSelectOrderotherMoney" >
@@ -937,7 +938,7 @@
from order_detail od
left join order_other_money oom on oom.order_id=od.order_id and oom.column=#{key}
left join basic_other_money bom on bom.`column`=oom.`column`
- where od.order_id = #{orderId}
+ where od.order_id = #{orderId} and od.order_number=#{orderNumber} and (od.other_columns!='{}' or od.other_columns!=null)
</select>
<select id="getSelectOrderDetailPrinting" >
--
Gitblit v1.8.0