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