From 2f44fc75c78e9291f07a0864199235cde689fa8d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:37 +0800
Subject: [PATCH] 订单明细报表新增楼层编号跟其他列
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 3972ee5..b67e7b1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -28,7 +28,9 @@
weight,
perimeter,
monolithic_perimeter,
- other_columns
+ other_columns,
+ file_name,
+ process_attribute
)
values
<foreach collection ="orderDetails" item="orderDetail" separator =",">
@@ -55,7 +57,9 @@
#{orderDetail.weight},
#{orderDetail.perimeter},
#{orderDetail.monolithicPerimeter},
- #{orderDetail.otherColumns}
+ #{orderDetail.otherColumns},
+ #{orderDetail.fileName},
+ #{orderDetail.processAttribute}
)
</foreach>
</insert>
@@ -316,13 +320,33 @@
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
</if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
+ </if>
+
+ <if test="orderDetail.width != null and orderDetail.width != '' and model==0">
and a.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
+ <if test="orderDetail.height != null and orderDetail.height != '' and model==0 ">
and a.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
</if>
+
+ <if test="orderDetail.width != null and orderDetail.width != '' and model==1">
+ and a.width >= REGEXP_REPLACE(#{orderDetail.width } - #{scope} ,'\\.0+$','')
+ and a.width <= REGEXP_REPLACE(#{orderDetail.width } + #{scope} ,'\\.0+$','')
+
+ </if>
+
+ <if test="orderDetail.height != null and orderDetail.height != '' and model==1 ">
+ and a.height > REGEXP_REPLACE(#{orderDetail.height } - #{scope} ,'\\.0+$','')
+ and a.height < REGEXP_REPLACE(#{orderDetail.height } + #{scope} ,'\\.0+$','')
+ </if>
+
+
+
+
+
<if test="orderDetail.quantity != null and orderDetail.quantity != ''">
and a.quantity like concat('%',#{orderDetail.quantity},'%')
@@ -456,6 +480,10 @@
<if test="orderDetail.orderNumber != null and orderDetail.orderNumber != ''">
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
+ </if>
+
+ <if test="orderDetail.buildingNumber != null and orderDetail.buildingNumber != ''">
+ and a.building_number like concat('%',#{orderDetail.buildingNumber},'%')
</if>
<if test="orderDetail.width != null and orderDetail.width != ''">
@@ -1050,7 +1078,9 @@
group by od.product_id,pd.detail
</select>
-
+ <delete id="deleteOrderFile" >
+ delete from sd.order_file where order_id = #{orderId}
+ </delete>
--
Gitblit v1.8.0