From d01fa9d49a8c8a723493aecb681d4e1f3e25fce5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 14:28:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
index 192e9fe..1a874fd 100644
--- a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
@@ -34,7 +34,7 @@
</resultMap>
- <select id="defaultfinishedGoodsInventory" resultMap="selectFinishedGoodsInventory">
+ <select id="defaultfinishedGoods" resultMap="selectFinishedGoodsInventory">
select od.order_number,
o.order_id,
o.project,
@@ -56,9 +56,35 @@
from finished_goods_inventory fgi
left join sd.order_detail od on fgi.order_number = od.order_number
inner join sd.`order` o on fgi.order_id = o.order_id
+ <where>
+ <if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
+ and od.width regexp #{finishedGoodsInventory.orderDetail.width}
+ </if>
+ </where>
order by fgi.id
+
limit #{offset},#{pageSize}
;
</select>
+
+
+ <select id="getPageTotal" >
+ select
+ CEILING(count(fgi.id)/#{pageSize})
+ from finished_goods_inventory fgi
+ left join sd.order_detail od on fgi.order_number = od.order_number
+ inner join sd.`order` o on fgi.order_id = o.order_id
+ <where>
+ <if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
+ and od.width regexp #{finishedGoodsInventory.orderDetail.width}
+ </if>
+
+ </where>
+
+ order by fgi.id desc
+ limit #{offset},#{pageSize}
+ ;
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0