From a3dfc8966bb702c4ccb20f2a2afda7b7c39bd98d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 06 十一月 2024 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 132 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 132 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 6c7950d..675f6c9 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -906,5 +906,137 @@
where modd.material_outbound_id = #{materialOutboundId}
</select>
+ <select id="getMaterialInventoryById" >
+ select
+ *
+ from mm.material_inventory mi
+ where mi.id = #{id}
+ </select>
+
+ <select id="getMaterialLogReport" >
+ select *
+ from mm.material_log ml
+ <where>
+ date(ml.operate_time)>=#{startDate} and date(ml.operate_time) <= #{endDate} and ml.operate_type=#{type}
+ <if test="materialLog.operateType != null and materialLog.operateType != ''">
+ and ml.operate_type regexp #{materialLog.operateType}
+ </if>
+ <if test="materialLog.operationOrderNumber != null and materialLog.operationOrderNumber != ''">
+ and ml.operation_order_number regexp #{materialLog.operationOrderNumber}
+ </if>
+ <if test="materialLog.operationNumber != null and materialLog.operationNumber != ''">
+ and ml.operation_number regexp #{materialLog.operationNumber}
+ </if>
+ <if test="materialLog.quantity != null and materialLog.quantity != ''">
+ and ml.quantity regexp #{materialLog.quantity}
+ </if>
+ <if test="materialLog.width != null and materialLog.width != ''">
+ and ml.width regexp REGEXP_REPLACE(#{materialLog.width},'\\.0+$','')
+ </if>
+ <if test="materialLog.height != null and materialLog.height != ''">
+ and ml.height regexp REGEXP_REPLACE(#{materialLog.height},'\\.0+$','')
+ </if>
+ <if test="materialLog.thickness != null and materialLog.thickness != ''">
+ and ml.thickness regexp REGEXP_REPLACE(#{materialLog.thickness},'\\.0+$','')
+ </if>
+
+ <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
+ and ml.inventoryId regexp #{materialLog.inventoryId}
+ </if>
+ <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
+ and ml.materialCode regexp #{materialLog.materialCode}
+ </if>
+ <if test="materialLog.materialName != null and materialLog.materialName != ''">
+ and ml.materialName regexp #{materialLog.materialName}
+ </if>
+ <if test="materialLog.producer != null and materialLog.producer != ''">
+ and ml.producer regexp #{materialLog.producer}
+ </if>
+ <if test="materialLog.unit != null and materialLog.unit != ''">
+ and ml.unit regexp #{materialLog.unit}
+ </if>
+ <if test="materialLog.singlePieceArea != null and materialLog.singlePieceArea != ''">
+ and ml.singlePieceArea regexp REGEXP_REPLACE(#{materialLog.singlePieceArea},'\\.0+$','')
+ </if>
+ <if test="materialLog.inventoryArea != null and materialLog.inventoryArea != ''">
+ and ml.inventoryArea regexp #{materialLog.inventoryArea}
+ </if>
+ <if test="materialLog.operator != null and materialLog.operator != ''">
+ and ml.operator regexp #{materialLog.operator}
+ </if>
+ <if test="materialLog.remarks != null and materialLog.remarks != ''">
+ and ml.remarks regexp #{materialLog.remarksr}
+ </if>
+ </where>
+ order by ml.id desc
+ limit #{offset},#{pageSize};
+ </select>
+
+
+ <select id="getMaterialLogReportTotal">
+ select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
+ count(ml.id) as 'total'
+ from mm.material_log ml
+ <where>
+ date(ml.operate_time)>=#{startDate} and date(ml.operate_time) <= #{endDate} and ml.operate_type=#{type}
+ <if test="materialLog.operateType != null and materialLog.operateType != ''">
+ and ml.operate_type regexp #{materialLog.operateType}
+ </if>
+ <if test="materialLog.operationOrderNumber != null and materialLog.operationOrderNumber != ''">
+ and ml.operation_order_number regexp #{materialLog.operationOrderNumber}
+ </if>
+ <if test="materialLog.operationNumber != null and materialLog.operationNumber != ''">
+ and ml.operation_number regexp #{materialLog.operationNumber}
+ </if>
+ <if test="materialLog.quantity != null and materialLog.quantity != ''">
+ and ml.quantity regexp #{materialLog.quantity}
+ </if>
+ <if test="materialLog.width != null and materialLog.width != ''">
+ and ml.width regexp REGEXP_REPLACE(#{materialLog.width},'\\.0+$','')
+ </if>
+ <if test="materialLog.height != null and materialLog.height != ''">
+ and ml.height regexp REGEXP_REPLACE(#{materialLog.height},'\\.0+$','')
+ </if>
+ <if test="materialLog.thickness != null and materialLog.thickness != ''">
+ and ml.thickness regexp REGEXP_REPLACE(#{materialLog.thickness},'\\.0+$','')
+ </if>
+
+ <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
+ and ml.inventoryId regexp #{materialLog.inventoryId}
+ </if>
+ <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
+ and ml.materialCode regexp #{materialLog.materialCode}
+ </if>
+ <if test="materialLog.materialName != null and materialLog.materialName != ''">
+ and ml.materialName regexp #{materialLog.materialName}
+ </if>
+ <if test="materialLog.producer != null and materialLog.producer != ''">
+ and ml.producer regexp #{materialLog.producer}
+ </if>
+ <if test="materialLog.unit != null and materialLog.unit != ''">
+ and ml.unit regexp #{materialLog.unit}
+ </if>
+ <if test="materialLog.singlePieceArea != null and materialLog.singlePieceArea != ''">
+ and ml.singlePieceArea regexp REGEXP_REPLACE(#{materialLog.singlePieceArea},'\\.0+$','')
+ </if>
+ <if test="materialLog.inventoryArea != null and materialLog.inventoryArea != ''">
+ and ml.inventoryArea regexp #{materialLog.inventoryArea}
+ </if>
+ <if test="materialLog.operator != null and materialLog.operator != ''">
+ and ml.operator regexp #{materialLog.operator}
+ </if>
+ <if test="materialLog.remarks != null and materialLog.remarks != ''">
+ and ml.remarks regexp #{materialLog.remarksr}
+ </if>
+ </where>
+ </select>
+
+
+ <select id="exportMaterialLogReport">
+ select * from mm.material_log ml
+ where date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) <= #{dates[1]} and ml.operate_type=#{type}
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0