From b499a7e1dbcc4b9dbcdcaa46bbf5c24271bf6698 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 11 八月 2025 16:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 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 34d5198..a28adf5 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -1147,44 +1147,40 @@
</select>
- <select id="getSelectDeliveryPrintingMoneySpecifications" resultMap="selectDeliveryDetailOrderDetail" >
- select dd.delivery_id,
- od.order_id,
- IF(#{type} = 'product_abbreviation', pt.remarks, od.product_name) as product_name,
- dd.price,
+ <select id="getSelectDeliveryPrintingMoneySpecifications" >
+ select od.order_id,
+ od.building_number,
+ od.width,
+ od.height,
+ od.product_name,
sum(dd.area) as area,
sum(dd.money) as money,
sum(dd.quantity) as quantity,
- o.contract_id,
- od.width,
- od.height
+ dd.price
from delivery_detail dd
- left join (select product_name,order_id,product_id,order_number,width,height
- from order_detail) as od on dd.order_id = od.order_id and dd.order_number = od.order_number
- left join product pt on pt.id = od.product_id
- left join sd.`order` o on o.order_id = dd.order_id
- where dd.delivery_id like concat('%', #{deliveryId}, '%')
-
- group by od.order_id, od.product_name,od.width,od.height, dd.price
+ 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}
+ group by od.width,od.height, dd.price
</select>
- <select id="getSelectDeliveryPrintingNoMoneySpecifications" resultMap="selectDeliveryDetailOrderDetail" >
- select dd.delivery_id,
- od.order_id,
- IF(#{type} = 'product_abbreviation', pt.remarks, od.product_name) as product_name,
- sum(dd.area) as area,
- sum(dd.quantity) as quantity,
- o.contract_id,
+ <select id="getSelectDeliveryPrintingNoMoneySpecifications" >
+ select od.order_id,
+ od.building_number,
od.width,
- od.height
+ od.height,
+ od.product_name,
+ sum(dd.area) as area,
+ sum(dd.quantity) as quantity
from delivery_detail dd
- left join (select product_name,order_id,product_id,order_number,width,height
- from order_detail) as od on dd.order_id = od.order_id and dd.order_number = od.order_number
- left join product pt on pt.id = od.product_id
- left join sd.`order` o on o.order_id = dd.order_id
- where dd.delivery_id like concat('%', #{deliveryId}, '%')
-
- group by od.order_id, od.product_name, width, height
+ 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}
+ group by od.width,od.height
</select>
<select id="getSelectOrderPrinting" >
@@ -1206,6 +1202,7 @@
dd.area,
ifnull(od.processing_note,"") as processingNote,
ifnull(od.building_number,"") as buildingNumber,
+ dd.box_no,
dd.price,
od.other_columns,
od.remarks
--
Gitblit v1.8.0