From 68d7be0814e89ef811c2e7c435dff7af64ea60c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 十二月 2024 10:11:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 246 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 237 insertions(+), 9 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 b1b74f6..0e3466d 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -58,9 +58,10 @@
ms.json
from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
<where>
- date(mi.create_time)>=#{startDate} and date(mi.create_time) <= #{endDate} and mi.available_quantity>0
+ and mi.available_quantity>0
</where>
+ order by mi.id desc
limit #{offset},#{pageSize};
</select>
@@ -71,7 +72,7 @@
from
mm.material_inventory mi
<where>
- date(mi.create_time)>=#{startDate} and date(mi.create_time) <= #{endDate} and mi.available_quantity>0
+ and mi.available_quantity>0
</where>
limit #{offset},#{pageSize};
@@ -105,6 +106,7 @@
date(ou.create_time)>=#{startDate} and date(ou.create_time) <= #{endDate}
</where>
+ order by ou.id desc
limit #{offset},#{pageSize};
</select>
@@ -547,16 +549,36 @@
delete from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
</delete>
+ <delete id="deleteMaterialLog" >
+ delete from mm.material_log where operation_order_number=#{materialOutboundId}
+ </delete>
+
<delete id="deleteReturningWarehouseDetail" >
delete from mm.returning_warehouse_detail where returning_id=#{returningId}
</delete>
+ <delete id="deleteReturningWarehouse" >
+ delete from mm.returning_warehouse where returning_id=#{returningId}
+ </delete>
+
<select id="getMaximum" >
- select count(*) from mm.material_outbound where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(material_outbound_id,8)) from 7),0)
+ from
+ mm.material_outbound as a
+ where
+ date(a.create_time) = curdate()
+
</select>
<select id="getMaximums" >
- select count(*) from mm.returning_warehouse where date(create_time)=CURDATE()
+ select
+ ifnull(SUBSTR(max(right(returning_id,8)) from 7),0)
+ from
+ mm.returning_warehouse as a
+ where
+ date(a.create_time) = curdate()
+
</select>
<select id="getMaterialOutboundCount" >
@@ -607,6 +629,17 @@
#{materialOutbound.orderId},#{materialOutbound.outboundType},#{materialOutbound.warehouseManager},#{materialOutbound.materialRequisitionDate},
0,now()
)
+ </insert>
+
+ <insert id="updateMaterialOutbound" >
+ update mm.material_outbound
+ set material_requisition_personnel=#{materialOutbound.materialRequisitionPersonnel},
+ material_requisition_team=#{materialOutbound.materialRequisitionTeam},
+ order_id=#{materialOutbound.orderId},
+ outbound_type=#{materialOutbound.outboundType},
+ warehouse_manager=#{materialOutbound.warehouseManager},
+ material_requisition_date=#{materialOutbound.materialRequisitionDate}
+ where material_outbound_id = #{number}
</insert>
<insert id="insertMaterialOutboundDetail" useGeneratedKeys="true" >
@@ -734,13 +767,19 @@
<update id="updateMaterialInventory" >
update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
- total_area=total_area+#{totalArea}
+ total_area=single_piece_area*inventory_quantity
where material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
</update>
+ <update id="updateMaterialInventoryNull" >
+ update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
+ available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
+ total_area=single_piece_area*inventory_quantity
+ where material_code=#{materialCode}
+ </update>
+
<update id="updateMaterialInventoryReturning" >
- update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
- total_area=total_area+#{totalArea}
+ update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
where material_code=#{materialCode} and
date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture}
@@ -748,8 +787,7 @@
</update>
<update id="updateMaterialInventoryReturningNull" >
- update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
- total_area=total_area+#{totalArea}
+ update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
where material_code=#{materialCode} and
date_of_manufacture is null
@@ -849,5 +887,195 @@
update mm.surplus_materials set quantity=quantity+#{surplusMaterials.quantity} where id=#{surplusMaterials.id}
</update>
+ <select id="getPrintCreateOutbound" >
+ select id,
+ material_outbound_id,
+ material_requisition_personnel,
+ material_requisition_team,
+ order_id,
+ outbound_type,
+ warehouse_manager,
+ date(material_requisition_date) as material_requisition_date,
+ reviewed,
+ date(reviewed_time) as reviewed_time,
+ reviewed_state,
+ date(create_time) as create_time
+ from mm.material_outbound
+ where material_outbound_id = #{materialOutboundId}
+ </select>
+
+ <select id="getPrintCreateOutboundDetail" >
+ select
+ ou.project_no as projectNo,
+ modd.inventory_id as id,
+ modd.inventory_organization as inventoryOrganization,
+ modd.material_code as materialCode,
+ modd.material_name as materialName,
+ modd.producer,
+ modd.width,
+ modd.height,
+ modd.thickness,
+ modd.unit,
+ modd.outbound_quantity as outboundQuantity,
+ date(modd.date_of_manufacture) as dateOfManufacture,
+ modd.single_piece_area as singlePieceArea,
+ modd.inventory_area as inventoryArea,
+ modd.remarks,
+ ou.use_count as inventoryQuantity,
+ if(mo.reviewed_state!=1,modd.outbound_quantity+ou.not_use_count,ou.not_use_count) as availableQuantity,
+ ms.json,
+ modd.producer
+ from mm.material_outbound_detail modd left join pp.optimize_use ou on modd.use_id=ou.id
+ left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
+ left join mm.material_store ms on modd.material_code=ms.id
+ 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>
+
+ <select id="deleteMaterialInventory">
+ delete from
+ mm.material_inventory mi
+ <where>
+ <if test="ids != null and ids != ''">
+ and mi.id in
+ <foreach item="id" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+
+ </where>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0