From d111849e6e78ed02a63661e31c81dadd65f53104 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 13:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 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 f3c61ee..6dee99b 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -27,7 +27,10 @@
arch_rise,
weight,
perimeter,
- other_columns
+ monolithic_perimeter,
+ other_columns,
+ file_name,
+ process_attribute
)
values
<foreach collection ="orderDetails" item="orderDetail" separator =",">
@@ -53,7 +56,10 @@
#{orderDetail.archRise},
#{orderDetail.weight},
#{orderDetail.perimeter},
- #{orderDetail.otherColumns}
+ #{orderDetail.monolithicPerimeter},
+ #{orderDetail.otherColumns},
+ #{orderDetail.fileName},
+ #{orderDetail.processAttribute}
)
</foreach>
</insert>
@@ -63,7 +69,8 @@
update order_detail as a
set
a.price = #{item.price},
- a.gross_amount = #{item.grossAmount}
+ a.gross_amount = #{item.grossAmount},
+ a.other_columns = #{item.otherColumns}
where
a.order_id = #{item.orderId} and
a.order_number = #{item.orderNumber}
@@ -94,6 +101,7 @@
<result column="levelTwo" property="levelTwo"/>
<result column="total_thickness" property="totalThickness"/>
<result column="createTime" property="createTime"/>
+ <result column="weights" property="weight"/>
<result column="order_type" property="order.orderType"/>
<result column="customer_name" property="order.customerName"/>
@@ -117,7 +125,7 @@
SELECT
*
from sd.`order` as b
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
<if test="order.orderType != null and order.orderType != ''">
and b.order_type like concat('%',#{order.orderType},'%')
</if>
@@ -187,7 +195,7 @@
CEILING(count(b.id)/#{pageSize}) as 'pageTotal',
count(b.id) as 'total'
from sd.`order` as b
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
<if test="order.orderType != null and order.orderType != ''">
and b.order_type like concat('%',#{order.orderType},'%')
</if>
@@ -255,7 +263,7 @@
<select id="exportOrderSummary" >
SELECT *
from sd.`order` as b
- where date(b.create_time)>=#{dates[0]} and date(b.create_time) <= #{dates[1]}
+ where date(b.create_time)>=#{dates[0]} and date(b.create_time) <= #{dates[1]} and b.order_review>0
order by b.id desc
</select>
@@ -263,10 +271,11 @@
<select id="getOrderReport" resultMap="orderMap">
SELECT
*,
+ round(a.weight*a.quantity,2) as weights,
a.create_time as createTime,
d.type_name as levelOne,
e.type_name as levelTwo
- from order_detail as a
+ from sd.order_detail as a
left join sd.`order` as b
on b.order_id = a.order_id
left join sd.product as c
@@ -275,7 +284,7 @@
on d.type_id = c.type_id
left join sd.basic_glass_type as e
on e.type_id = d.belong
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
@@ -311,13 +320,29 @@
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
</if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
+ <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},'%')
@@ -418,7 +443,7 @@
on d.type_id = c.type_id
left join sd.basic_glass_type as e
on e.type_id = d.belong
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
</if>
@@ -549,10 +574,12 @@
<select id="exportOrderReport" >
SELECT
*,
+ round(a.weight*a.quantity,2) as weights,
+ b.processing_note as processingNotes,
a.create_time as createTime,
d.type_name as level_one,
e.type_name as level_two
- from order_detail as a
+ from sd.order_detail as a
left join sd.`order` as b
on b.order_id = a.order_id
left join sd.product as c
@@ -561,7 +588,8 @@
on d.type_id = c.type_id
left join sd.basic_glass_type as e
on e.type_id = d.belong
- where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]}
+ where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]} and b.order_review>0
+ order by b.order_id desc
</select>
@@ -583,6 +611,7 @@
a.edging_type,
b.pack_type,
round(sum(a.perimeter),2) as perimeter,
+ round(sum(a.weight*a.quantity),2) as weights,
a.price,
sum(a.gross_amount ) as gross_amount,
b.al_type,
@@ -608,7 +637,7 @@
on d.type_id = c.type_id
left join sd.basic_glass_type as e
on e.type_id = d.belong
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
@@ -758,7 +787,7 @@
on d.type_id = c.type_id
left join sd.basic_glass_type as e
on e.type_id = d.belong
- where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate}
+ where date(b.create_time)>=#{startDate} and date(b.create_time) <= #{endDate} and b.create_order>0
<if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
</if>
@@ -911,7 +940,7 @@
a.remarks,
a.bend_radius,
a.edging_type,
- a.weight,
+ round(sum(a.weight*a.quantity),2) as weights,
a.perimeter,
a.other_columns,
a.warehouse_num,
@@ -941,7 +970,7 @@
b.delivery_address,
b.other_money,
b.other_money_remarks,
- b.processing_note,
+ b.processing_note as processingNotes,
b.other_remarks,
b.area,
b.quantity,
@@ -974,7 +1003,7 @@
left join sd.basic_glass_type as e
on e.type_id = d.belong
where date(b.create_time) >= #{dates[0]}
- and date(b.create_time) <= #{dates[1]}
+ and date(b.create_time) <= #{dates[1]} and b.order_review>0
group by b.order_id, a.product_id
order by b.order_id desc
</select>
@@ -1001,8 +1030,9 @@
(a.product_id) as 'productId',
a.product_name as 'productName',
+ p.remarks as 'remarks',
a.order_number as 'orderNumber'
- from order_detail as a
+ from order_detail as a left join sd.product p on a.product_id=p.id
where a.order_id = #{orderId}
group by a.product_id
</select>
@@ -1012,8 +1042,9 @@
(a.product_id) as 'productId',
a.product_name as 'productName',
+ p.remarks as 'remarks',
a.order_number as 'orderNumber'
- from order_detail as a
+ from sd.order_detail as a left join sd.product p on a.product_id=p.id
where a.order_id = #{orderId} and a.product_id IN
<foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
#{item}
@@ -1039,7 +1070,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