ERP_override.git

			@@ -549,8 +549,16 @@
			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" >
			@@ -747,13 +755,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}

			@@ -761,8 +775,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

			@@ -906,5 +919,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>