From 59ef6e9b5b8aff7614711c2afdba23a460ac1c56 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 27 三月 2024 08:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/sd/OrderMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
index b294546..770d133 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
@@ -17,7 +17,7 @@
<update id="updateOrderParameter">
update `order` o
left join
- (select a.order_id,sum(a.perimeter) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
+ (select a.order_id,round(sum(a.perimeter),2) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
from sd.order_detail as a group by a.order_id) od
on o.order_id = od.order_id
set
@@ -31,9 +31,12 @@
<select id="getOrderList">
select
- *
+ *,
+ sum(fgi.quantity_available) as goodsQuantity
from
`order` as o
+ left join mm.finished_goods_inventory as fgi
+ on o.order_id = fgi.order_id
where date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
<if test="orderType!= null and orderType != ''">
@@ -91,7 +94,7 @@
<if test="order.deliveryAddress != null and order.deliveryAddress != ''">
and o.delivery_address REGEXP #{order.deliveryAddress}
</if>
-
+ group by o.id
order by o.id desc
limit #{offset},#{pageSize}
</select>
--
Gitblit v1.8.0