From 97a25e0cf8fcedda488bce97cdd95d85ec829619 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 15:59:59 +0800
Subject: [PATCH] 修改实体类字段
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 127 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 125 insertions(+), 2 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 192e9fe..ee7221f 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/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,
@@ -52,13 +52,136 @@
fgi.`status`,
fgi.update_time,
fgi.enter_storage_time,
- fgi.end_time
+ fgi.end_time,
+ fgi.remark
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>
+ <if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
+ and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
+ </if>
+ <if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
+ and o.order_id regexp #{finishedGoodsInventory.order.orderId}
+ </if>
+ <if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
+ and o.project regexp #{finishedGoodsInventory.order.project}
+ </if>
+ <if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
+ and o.order_type regexp #{finishedGoodsInventory.order.orderType}
+ </if>
+ <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
+ and od.height regexp #{finishedGoodsInventory.orderDetail.height}
+ </if>
+ <if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
+ and fgi.inventory regexp #{finishedGoodsInventory.inventory}
+ </if>
+ <if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
+ and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
+ </if>
+ <if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
+ and fgi.actual_signal_area regexp #{finishedGoodsInventory.actualSignalArea}
+ </if>
+ <if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
+ and fgi.area regexp #{finishedGoodsInventory.area}
+ </if>
+ <if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
+ and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
+ </if>
+ <if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
+ and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
+ </if>
+ <if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
+ and fgi.`status` regexp #{finishedGoodsInventory.status}
+ </if>
+ <if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
+ and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
+ </if>
+ <if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
+ and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
+ </if>
+ <if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
+ and fgi.end_time regexp #{finishedGoodsInventory.endTime}
+ </if>
+ <if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
+ and fgi.remark regexp #{finishedGoodsInventory.remark}
+ </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>
+ <if test="finishedGoodsInventory.orderDetail.orderNumber != null and finishedGoodsInventory.orderDetail.orderNumber != ''">
+ and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
+ </if>
+ <if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
+ and o.order_id regexp #{finishedGoodsInventory.order.orderId}
+ </if>
+ <if test="finishedGoodsInventory.order.project != null and finishedGoodsInventory.order.project != ''">
+ and o.project regexp #{finishedGoodsInventory.order.project}
+ </if>
+ <if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">
+ and o.order_type regexp #{finishedGoodsInventory.order.orderType}
+ </if>
+ <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
+ and od.height regexp #{finishedGoodsInventory.orderDetail.height}
+ </if>
+ <if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
+ and fgi.inventory regexp #{finishedGoodsInventory.inventory}
+ </if>
+ <if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
+ and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
+ </if>
+ <if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
+ and fgi.actual_signal_area regexp #{finishedGoodsInventory.actualSignalArea}
+ </if>
+ <if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
+ and fgi.area regexp #{finishedGoodsInventory.area}
+ </if>
+ <if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
+ and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
+ </if>
+ <if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
+ and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
+ </if>
+ <if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
+ and fgi.`status` regexp #{finishedGoodsInventory.status}
+ </if>
+ <if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
+ and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
+ </if>
+ <if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
+ and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
+ </if>
+ <if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
+ and fgi.end_time regexp #{finishedGoodsInventory.endTime}
+ </if>
+ <if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
+ and fgi.remark regexp #{finishedGoodsInventory.remark}
+ </if>
+
+ </where>
+
+ order by fgi.id desc
+ limit #{offset},#{pageSize}
+ ;
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0