From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +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 | 66 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 30 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 019c31f..f825973 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -880,87 +880,87 @@
<where>
and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0
<if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
- and od.width like #{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 like #{finishedGoodsInventory.orderDetail.orderNumber}
+ and od.order_number regexp #{finishedGoodsInventory.orderDetail.orderNumber}
</if>
<if test="finishedGoodsInventory.orderDetail.productName != null and finishedGoodsInventory.orderDetail.productName != ''">
- and od.product_name like #{finishedGoodsInventory.orderDetail.productName}
+ and od.product_name regexp #{finishedGoodsInventory.orderDetail.productName}
</if>
<if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">
- and od.product_id like #{finishedGoodsInventory.orderDetail.productId}
+ and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}
</if>
<if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">
- and od.building_number like #{finishedGoodsInventory.orderDetail.buildingNumber}
+ and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}
</if>
<if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">
- and o.order_id like #{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 like #{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 like #{finishedGoodsInventory.order.orderType}
+ and o.order_type regexp #{finishedGoodsInventory.order.orderType}
</if>
<if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">
- and o.customer_id like #{finishedGoodsInventory.order.customerId}
+ and o.customer_id regexp #{finishedGoodsInventory.order.customerId}
</if>
<if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">
- and o.customer_name like #{finishedGoodsInventory.order.customerName}
+ and o.customer_name regexp #{finishedGoodsInventory.order.customerName}
</if>
<if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">
- and o.batch like #{finishedGoodsInventory.order.batch}
+ and o.batch regexp #{finishedGoodsInventory.order.batch}
</if>
<if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">
- and o.salesman like #{finishedGoodsInventory.order.salesman}
+ and o.salesman regexp #{finishedGoodsInventory.order.salesman}
</if>
<if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">
- and od.height like REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
+ and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.inventory != null and finishedGoodsInventory.inventory != ''">
- and fgi.inventory like #{finishedGoodsInventory.inventory}
+ and fgi.inventory regexp #{finishedGoodsInventory.inventory}
</if>
<if test="finishedGoodsInventory.quantityAvailable != null and finishedGoodsInventory.quantityAvailable != ''">
- and fgi.quantity_available like #{finishedGoodsInventory.quantityAvailable}
+ and fgi.quantity_available regexp #{finishedGoodsInventory.quantityAvailable}
</if>
<if test="finishedGoodsInventory.actualSignalArea != null and finishedGoodsInventory.actualSignalArea != ''">
- and fgi.actual_signal_area like REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
+ and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.computeArea != null and finishedGoodsInventory.computeArea != ''">
- and fgi.compute_area like REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
+ and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.computeGrossArea != null and finishedGoodsInventory.computeGrossArea != ''">
- and fgi.compute_gross_area like REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
+ and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.area != null and finishedGoodsInventory.area != ''">
- and fgi.area like REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
+ and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
- and fgi.warehouse_number like #{finishedGoodsInventory.warehouseNumber}
+ and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
</if>
<if test="finishedGoodsInventory.storageRegion != null and finishedGoodsInventory.storageRegion != ''">
- and fgi.storage_region like #{finishedGoodsInventory.storageRegion}
+ and fgi.storage_region regexp #{finishedGoodsInventory.storageRegion}
</if>
<if test="finishedGoodsInventory.status != null and finishedGoodsInventory.status != ''">
- and fgi.`status` like #{finishedGoodsInventory.status}
+ and fgi.`status` regexp #{finishedGoodsInventory.status}
</if>
<if test="finishedGoodsInventory.enterStorageTime != null and finishedGoodsInventory.enterStorageTime != ''">
- and fgi.enter_storage_time like #{finishedGoodsInventory.enterStorageTime}
+ and fgi.enter_storage_time regexp #{finishedGoodsInventory.enterStorageTime}
</if>
<if test="finishedGoodsInventory.updateTime != null and finishedGoodsInventory.updateTime != ''">
- and fgi.update_time like #{finishedGoodsInventory.updateTime}
+ and fgi.update_time regexp #{finishedGoodsInventory.updateTime}
</if>
<if test="finishedGoodsInventory.endTime != null and finishedGoodsInventory.endTime != ''">
- and fgi.end_time like #{finishedGoodsInventory.endTime}
+ and fgi.end_time regexp #{finishedGoodsInventory.endTime}
</if>
<if test="finishedGoodsInventory.remark != null and finishedGoodsInventory.remark != ''">
- and fgi.remark like #{finishedGoodsInventory.remark}
+ and fgi.remark regexp #{finishedGoodsInventory.remark}
</if>
<if test="finishedGoodsInventory.boxNo != null and finishedGoodsInventory.boxNo != ''">
- and fgi.box_no like #{finishedGoodsInventory.boxNo}
+ and fgi.box_no regexp #{finishedGoodsInventory.boxNo}
</if>
</where>
@@ -1036,10 +1036,10 @@
and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.computeArea != null and finishedGoodsInventory.computeArea != ''">
- and fgi.compute_area like REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
+ and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.computeGrossArea != null and finishedGoodsInventory.computeGrossArea != ''">
- and fgi.compute_gross_area like REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
+ and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')
</if>
<if test="finishedGoodsInventory.warehouseNumber != null and finishedGoodsInventory.warehouseNumber != ''">
and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}
@@ -1101,7 +1101,7 @@
#{orderDetail.grossArea},
#{orderDetail.quantity},null,"",
0,now(),now(),null,"",#{orderDetail.computeArea},
- #{orderDetail.computeGrossArea},
+ #{orderDetail.computeGrossArea}
)
</insert>
@@ -1242,4 +1242,10 @@
ORDER BY
od.order_number
</select>
+
+ <delete id="deleteFinishedGoodsInventoryDate" >
+ delete fgi from mm.finished_goods_inventory fgi left join sd.`order` o on o.order_id=fgi.order_id
+ where o.create_time < DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+ and o.delivery=2 and fgi.inventory=0
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0