From d2e11d8ef4eccf41ae0fadc2bd57317308ca0b64 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 12 二月 2025 16:54:13 +0800
Subject: [PATCH] 修改物料库存不分页
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 12ecb95..e3855d1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -102,8 +102,8 @@
</update>
<select id="getOrderList">
- select
- *,
+ select * from (select
+ o.*,
ifnull(sum(fgi.quantity_available),0) as goodsQuantity
from
sd.`order` as o
@@ -196,17 +196,17 @@
and o.processing_note REGEXP #{order.processingNote}
</if>
group by o.id
+ ) as acc
order by
- <if test="orderBy == 'null' or orderBy == null">
- o.id desc
- </if>
- <if test="!(orderBy == 'null' or orderBy == null) and orderBy == 'desc'">
- #{field} desc
+ <if test="orderBy == null ">
+ id desc
</if>
- <if test="!(orderBy == 'null' or orderBy == null) and orderBy == 'asc'">
- #{field} asc
+ <if test="orderBy == 'desc'">
+ ${field} desc
</if>
-
+ <if test="orderBy == 'asc'">
+ ${field}
+ </if>
limit #{offset},#{pageSize}
</select>
@@ -217,7 +217,7 @@
sum(o.quantity) as quantity,
sum(o.area) as area,
sum(o.money) as money,
- fgi.goodsQuantity,
+ ifnull(fgi.goodsQuantity ,0) as goodsQuantity ,
ROUND(sum(perimeter),2) as perimeter,
#{pageSize} as pageSize
from
--
Gitblit v1.8.0