From e8ba2a1bec7ffbd78cb941521b31d000890e66de Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 二月 2024 14:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index e592948..ae59bd5 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -209,7 +209,8 @@
</select>
<select id="getSelectAllocatePageTotal" >
- select CEILING(count(zu.order_number)/#{pageSize}) from
+ select CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
+ count(zu.order_number) as 'total' from
(select fgi.order_number as order_number
from mm.finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
@@ -276,12 +277,14 @@
<select id="getseletdeliveryDetailPageTotal" >
- select CEILING(count(dd.id)/#{pageSize})
+ select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
+ count(dd.id) as 'total'
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id = d.delivery_id
left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
left join sd.`order` o on o.order_id = dd.order_id
<where>
+ and dd.delivery_detail_state=1
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
@@ -357,9 +360,10 @@
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id = d.delivery_id
left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
- left join sd.`order` o on o.order_id = dd.order_id where dd.delivery_detail_state=1
+ left join sd.`order` o on o.order_id = dd.order_id
<where>
+ and dd.delivery_detail_state=1
<if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">
and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}
</if>
@@ -591,7 +595,8 @@
limit #{offset},#{pageSize};
</select>
<select id="getseletwarehousingPageTotal" >
- select CEILING(count(zu.order_number)/#{pageSize}) from (
+ CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
+ count(zu.order_number) as 'total' from (
select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on
fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id
<where>
@@ -740,7 +745,8 @@
<select id="getPageTotal">
select
- CEILING(count(fgi.id)/#{pageSize})
+ CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
+ count(fgi.id) as 'total'
from finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
left join sd.`order` o on fgi.order_id = o.order_id
--
Gitblit v1.8.0