Index: APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml
===================================================================
diff -u -r35171 -r35184
--- APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35171)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35184)
@@ -1,13 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar">
-<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+<Super>TECH.RegisteredObject</Super>
 
+<Parameter name="COMSO11">
+<Type>%String</Type>
+<Default>11</Default>
+</Parameter>
+
+<Parameter name="COMSO21">
+<Type>%String</Type>
+<Default>21</Default>
+</Parameter>
+
 <Method name="GeefCOMSO">
 <ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO).%New()
+<Implementation><![CDATA[
+	#Dim COMSO As APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO).%New()
+	#Dim Toelevering As APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering = ""
+	
+	#dim Key As %String = $Order(^BLExport(""))
+	While (Key '= "")
+	{
+		#dim BLExportLijn As %String = ^BLExport(Key)
+
+		If ($Extract(BLExportLijn,2,3) = ..#COMSO11)
+		{
+			Set Toelevering = ..MaakToelevering(BLExportLijn)
+			Do COMSO.ToeleveringList.Insert(Toelevering)
+		}
+		
+		if $IsObject(Toelevering) && ($Extract(BLExportLijn,2,3) = ..#COMSO21) 
+		{
+			Do Toelevering.ToeleveringDetail.Insert(..MaakToeleveringDetail(BLExportLijn))
+		}
+		
+		Set Key = $Order(^BLExport(Key))
+	}
+	
+	Quit COMSO
 ]]></Implementation>
 </Method>
+
+<Method name="MaakToelevering">
+<FormalSpec>BLExportLijn:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering</ReturnType>
+<Implementation><![CDATA[
+	Set Toelevering = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering).%New()
+	Set Toelevering.ToeleveringHeader = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringHeader).%New()
+	Set Toelevering.ToeleveringHeader.CustomerNumberForShipment = $Extract(BLExportLijn,4,9)
+	Set Toelevering.ToeleveringHeader.CustomerNumberForInvoice = $Extract(BLExportLijn,12,17)
+	Set Toelevering.ToeleveringHeader.CustomerOrderReference = $Extract(BLExportLijn,20,31)
+	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = $Extract(BLExportLijn,54,59)
+	Quit Toelevering
+]]></Implementation>
+</Method>
+
+<Method name="MaakToeleveringDetail">
+<FormalSpec>BLExportLijn:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail</ReturnType>
+<Implementation><![CDATA[
+	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail).%New()
+	Set ToeleveringDetail.OrderLineIdentificationCustomer = $Extract(BLExportLijn,4,14)
+	Set ToeleveringDetail.IdentNumberSupplierBAU = $Extract(BLExportLijn,20,27)
+	Set ToeleveringDetail.OrderQuantity = $Extract(BLExportLijn,28,34)
+	Set ToeleveringDetail.NetPrice = $Extract(BLExportLijn,35,44)
+	Set ToeleveringDetail.PriceDimension = $Extract(BLExportLijn,45,45) 
+	Set ToeleveringDetail.DeliveryDateAxBUA = $Extract(BLExportLijn,46,51)
+	Quit ToeleveringDetail
+]]></Implementation>
+</Method>
 </Class>