From 2a891d0391bc9f2dfaaaee8f63fcb20ff0932202 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 七月 2024 15:11:40 +0800
Subject: [PATCH] 修改订单报表
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 595da54..22703db 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -108,6 +108,7 @@
<result column="creator" property="order.creator"/>
<result column="verifier" property="order.verifier"/>
<result column="customer_batch" property="order.customerBatch"/>
+ <result column="other_money" property="order.otherMoney"/>
</resultMap>
@@ -428,6 +429,7 @@
b.batch,
a.product_id,
a.product_name,
+ b.other_money,
sum(a.quantity) as quantity,
sum(a.gross_area) as gross_area,
sum(a.compute_gross_area) as compute_gross_area,
@@ -586,6 +588,10 @@
<if test="orderDetail.order!=null and orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
</if>
+
+ <if test="orderDetail.order!=null and orderDetail.order.otherMoney != null ">
+ and b.other_money regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
+ </if>
group by b.order_id,a.product_id
order by b.order_id desc
limit #{offset},#{pageSize}
@@ -731,6 +737,10 @@
<if test="orderDetail.order!=null and orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
</if>
+
+ <if test="orderDetail.order!=null and orderDetail.order.otherMoney != null ">
+ and b.other_money regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
+ </if>
group by b.order_id,a.product_id
) as ss
</select>
@@ -744,9 +754,7 @@
a.product_name,
a.price,
sum(a.quantity) as quantity,
- a.gross_amount,
- a.width,
- a.height,
+ sum(a.gross_amount) as gross_amount,
a.shape,
sum(a.area) as area,
sum(a.gross_area) as gross_area,
--
Gitblit v1.8.0