From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 93 ++++++++++++++++++++++------------------------
1 files changed, 45 insertions(+), 48 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 24747ca..a28adf5 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -1047,23 +1047,23 @@
CASE
WHEN width < 4000 AND width >= 3660 and width>height THEN
- '3660<W<4000'
+ '3660<H<4000'
WHEN width < 5000 AND width >= 4000 and width>height THEN
- '4000<W<5000'
+ '4000<H<5000'
WHEN width < 6000 AND width >= 5000 and width>height THEN
- '5000<W<6000'
+ '5000<H<6000'
WHEN width < 7000 AND width >= 6000 and width>height THEN
- '6000<W<7000'
+ '6000<H<7000'
WHEN width < 8000 AND width >= 7000 and width>height THEN
- '7000<W<8000'
+ '7000<H<8000'
WHEN width < 9000 AND width >= 8000 and width>height THEN
- '8000<W<9000'
+ '8000<H<9000'
WHEN width < 10000 AND width >= 9000 and width>height THEN
- '9000<W<10000'
+ '9000<H<10000'
WHEN width < 11000 AND width >= 10000 and width>height THEN
- '10000<W<11000'
+ '10000<H<11000'
WHEN width < 12000 AND width >= 11000 and width>height THEN
- '11000<W<12000'
+ '11000<H<12000'
ELSE
''
END width
@@ -1116,23 +1116,23 @@
CASE
WHEN width < 4000 AND width >= 3660 and width>height THEN
- '3660<W<4000'
+ '3660<H<4000'
WHEN width < 5000 AND width >= 4000 and width>height THEN
- '4000<W<5000'
+ '4000<H<5000'
WHEN width < 6000 AND width >= 5000 and width>height THEN
- '5000<W<6000'
+ '5000<H<6000'
WHEN width < 7000 AND width >= 6000 and width>height THEN
- '6000<W<7000'
+ '6000<H<7000'
WHEN width < 8000 AND width >= 7000 and width>height THEN
- '7000<W<8000'
+ '7000<H<8000'
WHEN width < 9000 AND width >= 8000 and width>height THEN
- '8000<W<9000'
+ '8000<H<9000'
WHEN width < 10000 AND width >= 9000 and width>height THEN
- '9000<W<10000'
+ '9000<H<10000'
WHEN width < 11000 AND width >= 10000 and width>height THEN
- '10000<W<11000'
+ '10000<H<11000'
WHEN width < 12000 AND width >= 11000 and width>height THEN
- '11000<W<12000'
+ '11000<H<12000'
ELSE
''
END width
@@ -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