From eb196866b6b82289fa4fbb90639e23616dcfb82f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 22 八月 2025 15:09:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 ad2341a..54ff11c 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -893,15 +893,18 @@
</where>
order by fgi.update_time desc
- limit #{offset},#{pageSize};
+ <!-- limit #{offset},#{pageSize}-->
+ ;
</select>
<select id="getPageTotal">
select
- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
+ 1 as 'pageTotal',
+ <!-- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal', -->
+
count(fgi.id) as 'total'
- from finished_goods_inventory fgi
+ 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
left join sd.`order` o on fgi.order_id = o.order_id
<where>
@@ -987,7 +990,7 @@
</where>
order by fgi.update_time desc
- limit #{offset},#{pageSize}
+ <!-- limit #{offset},#{pageSize} as 'pageTotal', -->
;
</select>
@@ -1071,11 +1074,11 @@
<select id="getPrintTitleByBox">
select kkk.*,
rw.teams_groups_name as teams_groups_name2
- from(select o.order_id,
+ from(select #{orderId} as order_id,
o.customer_name,
o.customer_id,
o.project,
- o.batch,
+ (select batch from sd.`order` pp1 where pp1.order_id =#{orderId} ) as batch,
fol.box_no as 'remarks',
SUM(fol.quantity_available) as quantity,
ROUND( sum(od.width * od.height * fol.quantity_available) / 1000000, 2 ) as area,
--
Gitblit v1.8.0