From 3760bb766253ea2b2291e00d7bc5147bdee9bb44 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 六月 2024 16:58:09 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 cedcebe..1f9e8ac 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -887,6 +887,17 @@
group by od.order_id,od.product_name,od.product_id
</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
+ order_detail od
+ <where>
+ <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
+ and od.order_id like concat('%',#{orderDetail.orderId},'%')
+ </if>
+ </where>
+ group by od.product_name,od.product_id
+ </select>
+
<select id="getSelectDeliveryDetailPrinting" >
select od.order_id,
od.order_number,
@@ -897,7 +908,7 @@
dd.money,
dd.area,
ifnull(od.processing_note,"") as processingNote,
- ifnull(od.remarks,"") as buildingNumber,
+ ifnull(od.buildingNumber,"") as buildingNumber,
od.price
from delivery_detail dd
left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
@@ -906,6 +917,23 @@
and od.product_id = #{productId}
</select>
+ <select id="getSelectOrderDetailPrinting" >
+ select od.order_id,
+ od.order_number,
+ od.product_name,
+ od.width,
+ od.height,
+ od.quantity,
+ od.gross_amount,
+ od.area,
+ ifnull(od.processing_note,"") as processingNote,
+ ifnull(od.remarks,"") as buildingNumber,
+ od.price
+ from order_detail od
+ where od.order_id = #{orderId}
+ and od.product_id = #{productId}
+ </select>
+
<select id="exportDeliveryDetailReport">
select dd.id,
--
Gitblit v1.8.0