Index: APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/GenericCSBSOVO.cls.xml
===================================================================
diff -u -r36086 -r36189
--- APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/GenericCSBSOVO.cls.xml	(.../GenericCSBSOVO.cls.xml)	(revision 36086)
+++ APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/GenericCSBSOVO.cls.xml	(.../GenericCSBSOVO.cls.xml)	(revision 36189)
@@ -3,6 +3,16 @@
 <Class name="APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.GenericCSBSOVO">
 <Super>%RegisteredObject</Super>
 
+<Method name="FormateerVeldRechts">
+<FormalSpec>Veld:%String,Lengte:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim result As %String = $Extract(Veld,1,Lengte)
+	Quit $Justify(result,12)
+]]></Implementation>
+</Method>
+
 <Method name="FormateerVeld">
 <FormalSpec>Veld:%String,Lengte:%Integer</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r36139 -r36189
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 36139)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 36189)
@@ -26,11 +26,15 @@
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
 
+	#dim ConverteerderMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
+	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
+	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
+
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
 	
-	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub)
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
 	
 	Do Ontvanger.Ontvang()
 
Index: APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBS044.cls.xml
===================================================================
diff -u -r36086 -r36189
--- APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBS044.cls.xml	(.../CSBS044.cls.xml)	(revision 36086)
+++ APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBS044.cls.xml	(.../CSBS044.cls.xml)	(revision 36189)
@@ -81,19 +81,19 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim result As %String = """44"
-	Set result = result _ ..FormateerVeld(..SpecialMarking1, 12)
+	Set result = result _ ..FormateerVeldRechts(..SpecialMarking1, 12)
 	Set result = result _ ..FormateerNumeriekVeld(..NumberOfParcels1, 5)
 	Set result = result _ ..FormateerNumeriekVeld(..PiecesPerParcels1, 7)
-	Set result = result _ ..FormateerVeld(..SpecialMarking2, 12)
+	Set result = result _ ..FormateerVeldRechts(..SpecialMarking2, 12)
 	Set result = result _ ..FormateerNumeriekVeld(..NumberOfParcels2, 5)
 	Set result = result _ ..FormateerNumeriekVeld(..PiecesPerParcels2, 7)
-	Set result = result _ ..FormateerVeld(..SpecialMarking3, 12)
+	Set result = result _ ..FormateerVeldRechts(..SpecialMarking3, 12)
 	Set result = result _ ..FormateerNumeriekVeld(..NumberOfParcels3, 5)
 	Set result = result _ ..FormateerNumeriekVeld(..PiecesPerParcels3, 7)
-	Set result = result _ ..FormateerVeld(..SpecialMarking4, 12)
+	Set result = result _ ..FormateerVeldRechts(..SpecialMarking4, 12)
 	Set result = result _ ..FormateerNumeriekVeld(..NumberOfParcels4, 5)
 	Set result = result _ ..FormateerNumeriekVeld(..PiecesPerParcels4, 7)
-	Set result = result _ ..FormateerVeld(..SpecialMarking5, 12)
+	Set result = result _ ..FormateerVeldRechts(..SpecialMarking5, 12)
 	Set result = result _ ..FormateerNumeriekVeld(..NumberOfParcels5, 5)
 	Set result = result _ ..FormateerNumeriekVeld(..PiecesPerParcels5, 7)
 	Set result = result _ ..FormateerVeld("""",1)
Index: vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(revision 36189)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Converteer">
+<FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Converteer",DELVRY03)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml
===================================================================
diff -u -r36055 -r36189
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 36055)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 36189)
@@ -8,6 +8,16 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Delvry03Converteerder">
+<Type>APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Bewaarder">
+<Type>APPS.AKP.AankoopControle.BLUM.impl.Bewaarder</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="FileAPI">
 <Type>TECH.File.FileAPI</Type>
 <Private>1</Private>
@@ -19,7 +29,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FileAPI:TECH.File.FileAPI="",FileUtils:TECH.File.FileUtils,XmlCorrelater:TECH.XMLCorrelater,Converteerder:APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder,Bewaarder:APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Bewaarder</FormalSpec>
+<FormalSpec>FileAPI:TECH.File.FileAPI="",FileUtils:TECH.File.FileUtils,XmlCorrelater:TECH.XMLCorrelater,Converteerder:APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder,Bewaarder:APPS.AKP.AankoopControle.BLUM.impl.Bewaarder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -28,6 +38,8 @@
 	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
 	Set ..FileUtils = $$$Inject(FileUtils,##class(TECH.File.impl.FileUtils).%New())
 	set ..XmlCorrelater = $$$Inject(XmlCorrelater,##class(TECH.XMLCorrelater).%New())
+	set ..Bewaarder = $$$Inject(Bewaarder,##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New())
+	set ..Delvry03Converteerder = $$$Inject(Converteerder,##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -37,10 +49,12 @@
 	
 	#Dim BestandenList = ..GeefTeVerwerkenBestanden()
 	#Dim BestandenListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(BestandenList)
+	
 	While BestandenListIterator.HasNext()
-	{
+	{		
 		Do ..VerwerkDespatchBestand(BestandenListIterator.Next().Name)
 	}
+	
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -49,18 +63,57 @@
 <FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	
 	try{
-		Do ..LeesXMLBestand(BestandVolledigeNaam)
+		w !,1		
+		Do ..BewaarCSBSO(..ConverteerDELVRY03(..LeesXMLBestand(BestandVolledigeNaam)))
+		w !,2
 		Do ..KopieerNaarArchiefMap(BestandVolledigeNaam)
-	} catch {
+		w !,3
+	} catch {		
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		
 		#dim BerichtVoorGebruiker As %String = "Een DESPATCH bericht van BLUM kon niet verwerkt worden. : " _BestandVolledigeNaam
 		Do ##class(vhLib.Logger).%New("").ErrorMail("VerwerkDESPATCHBestand",(BerichtVoorGebruiker _" " _Exceptie.ToString()))
 		Do ..KopieerNaarErrorMap(BestandVolledigeNaam)		
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="BewaarCSBSO">
+<FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	do ..Bewaarder.Bewaar(CSBSO)
+	w !,"Bewaard"
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerDELVRY03">
+<FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
+<Implementation><![CDATA[
+	w !,"Voor converteer"
+	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ..Delvry03Converteerder.Converteer(DELVRY03)
+	w !,"geconverteerd"
+	quit CSBSO
+]]></Implementation>
+</Method>
+
+<Method name="LeesXMLBestand">
+<FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</ReturnType>
+<Implementation><![CDATA[
+	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03).%ClassName(1)
+	#dim DELVRY03 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03 = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"DELVRY03")
+	w !,"bestand gelezen"
+	quit DELVRY03
+]]></Implementation>
+</Method>
+
 <Method name="KopieerNaarArchiefMap">
 <FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
 <Private>1</Private>
@@ -71,7 +124,7 @@
 <Method name="KopieerNaarErrorMap">
 <FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	do ..KopieerNaarMap(BestandVolledigeNaam,"Error")
+<Implementation><![CDATA[	;do ..KopieerNaarMap(BestandVolledigeNaam,"Error")
 ]]></Implementation>
 </Method>
 
@@ -83,23 +136,12 @@
 		#dim Bestandsnaam As %String = ##class(TECH.File).GeefBestandsnaam(BestandVolledigeNaam)
 		#dim NieuwBestandLocatie As %String = ##class(TECH.Files).AppendSubPath(..GeefBestandLocatie(),MapNaam) 
 		#dim NieuwBestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(NieuwBestandLocatie, Bestandsnaam)
-
 		Do ..FileUtils.CopyFile(BestandVolledigeNaam,NieuwBestandVolledigeNaam)
 		Do ..FileUtils.Delete(BestandVolledigeNaam)
 	} catch {}
 ]]></Implementation>
 </Method>
 
-<Method name="LeesXMLBestand">
-<FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</ReturnType>
-<Implementation><![CDATA[
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03).%ClassName(1)
-	Quit ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"DELVRY03")
-]]></Implementation>
-</Method>
-
 <Method name="GeefTeVerwerkenBestanden">
 <Private>1</Private>
 <Implementation><![CDATA[	Quit ..FileUtils.GetFileList(..GeefBestandLocatie(),"DESADV*.xml",0)
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/Bewaarder/Bewaar/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/Bewaarder/Bewaar/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/Bewaarder/Bewaar/Test.cls.xml	(revision 36189)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder.Bewaar.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Lock +^BLImp
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Lock -^BLImp
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test : Bewaar CSBSO header in BLImp">
+<Implementation><![CDATA[
+	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
+	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	
+	Do Bewaarder.Bewaar(CSBSODouble)
+	
+	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr)))
+	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr),"BAU300332\5005\CSB\SO\C\21-06-16\1200\5\\\1\")
+
+	Kill ^BLImp(Bewaarder.MsgNr)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Bewaar CSBSO11 in BLImp">
+<Implementation><![CDATA[
+	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
+	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	
+	Do Bewaarder.Bewaar(CSBSODouble)
+	
+	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,1)))
+	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,1),"""11300332Van Hoecke -XL      L                                """)
+
+	Kill ^BLImp(Bewaarder.MsgNr)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Bewaar CSBSO21 in BLImp">
+<Implementation><![CDATA[
+	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
+	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	
+	Do Bewaarder.Bewaar(CSBSODouble)
+	
+	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,2)))
+	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,2),"""21300332160621EP   000660000100000000000000020758.2000000.000000000.00212250""")
+
+	Kill ^BLImp(Bewaarder.MsgNr)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Bewaar CSBSO31 in BLImp">
+<Implementation><![CDATA[
+	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
+	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	
+	Do Bewaarder.Bewaar(CSBSODouble)
+	
+	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,3)))
+	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,3),"""3199999999160621160621W30000000496.700212250         212250""")
+
+	Kill ^BLImp(Bewaarder.MsgNr)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Bewaar CSBSO41 in BLImp">
+<Implementation><![CDATA[
+	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
+	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	
+	Do Bewaarder.Bewaar(CSBSODouble)
+	
+	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,4)))
+	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,4),"""4177946501000CE205834.01  0438123400010000001000000000496.7000000.001070692            830242STAT""")
+
+	Kill ^BLImp(Bewaarder.MsgNr)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Bewaar CSBSO44 in BLImp">
+<Implementation><![CDATA[
+	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
+	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	
+	Do Bewaarder.Bewaar(CSBSODouble)
+	
+	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,5)))
+	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,5),"""440.51.249    000010001000            000000000000            000000000000            000000000000            000000000000""")
+
+	Kill ^BLImp(Bewaarder.MsgNr)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml
===================================================================
diff -u -r36138 -r36189
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 36138)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 36189)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="ToeleveringInfoVerzamelaar">
 <Type>APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar</Type>
@@ -24,18 +24,22 @@
 <FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
 <ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
 <Implementation><![CDATA[
+	w !,"begin converteer"
 	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()
 	#dim CSBSO11 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011).%New()
-
 	do ..VoegToeCSBSOHeader(CSBSO,DELVRY03)
+	w !,"Header toegevoegd"
 	do ..VoegToeCSBSO11(CSBSO11,DELVRY03)	
+	w !,"CSBSO11 teogevoegd"
 	do CSBSO.CSBSO11List.Insert(CSBSO11)
+	w !,"einde converteer"
 	quit CSBSO
 ]]></Implementation>
 </Method>
 
 <Method name="VoegToeCSBSOHeader">
 <FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	set CSBSO.CSBSOHeader.MIIDEF = "BAU" _ DELVRY03.IDOC.E1EDL20.GetAt(1).VBELN ; eigenlijk transportnr, en niet berichtnummer, maar beter is er niet voor handen.
 	Set CSBSO.CSBSOHeader.LEVNUR = "5005"
@@ -54,6 +58,7 @@
 
 <Method name="VoegToeCSBSO11">
 <FormalSpec>CSBSO11:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	
 	set CSBSO11.ShipmentID = DELVRY03.IDOC.E1EDL20.GetAt(1).VBELN
@@ -68,6 +73,7 @@
 
 <Method name="VoegToeCSBSO21">
 <FormalSpec>CSBSO21:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	#dim counter as %Integer = 1
 	#dim varnaam as %String
@@ -96,6 +102,7 @@
 
 <Method name="VoegToeCSBSO31">
 <FormalSpec>CSBSO31:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	set CSBSO31.InvoiceNr = "999999"
 	set CSBSO31.InvoiceType = "99"
@@ -122,7 +129,7 @@
 				set CSBSO41.ABLijnNr = ..GeefABLnNr(E1EDL44)
 				set CSBSO41.OrderLineCompletion = "C"
 				set CSBSO41.SetCode = "E"
-				set CSBSO41.OrderLineCustomer = E1EDL44.VBELN _ "." _ E1EDL44.POSNR
+				set CSBSO41.OrderLineCustomer = ..GeefOrderlineCustomer(E1EDL44)
 				set CSBSO41.IdentNr = E1EDL44.KDMAT
 				set CSBSO41.Weigth = 0
 				set CSBSO41.CustomsClassification = "830242"
@@ -139,7 +146,7 @@
 			do ..VoorzieCSBSO44(CSBSO41)
 			for index=1:1:5{
 				if $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = ""{
-					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = E1EDL37.EXIDV2
+					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = $E( E1EDL37.EXIDV,*-9,*-0)
 					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"NumberOfParcels"_ index) = ..GeefNrOfPackages(E1EDL44)
 					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"PiecesPerParcels"_ index) = ..GeefPiecesPerPackage(E1EDL44)					
 					quit
@@ -270,6 +277,7 @@
 
 <Method name="GeefShipmentDateYYMMDD">
 <FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
@@ -292,6 +300,7 @@
 
 <Method name="VoegToeMIOTCR">
 <FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	
 	#dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
@@ -309,7 +318,6 @@
 		}
 	}
 	
-	
 	/* ofwel 
 	#dim ISDD as %String = DELVRY03.IDOC.E1EDL20.GetAt(1).E1EDT13.GetAt(1).ISDD
 	set CSBSO.CSBSOHeader.MIOTCR = $EXTRACT(ISDD,7,8) _"-" _$EXTRACT(ISDD,5,6) _"-" _$EXTRACT(ISDD,3,4)
Index: APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBSOHeader.cls.xml
===================================================================
diff -u -r35998 -r36189
--- APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBSOHeader.cls.xml	(.../CSBSOHeader.cls.xml)	(revision 35998)
+++ APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBSOHeader.cls.xml	(.../CSBSOHeader.cls.xml)	(revision 36189)
@@ -21,7 +21,7 @@
 <Description>
 Property MIINTY As %String;</Description>
 <Type>%String</Type>
-<InitialExpression>"COA"</InitialExpression>
+<InitialExpression>"CSBSO"</InitialExpression>
 </Property>
 
 <Property name="MIINTS">
@@ -63,13 +63,13 @@
 </Property>
 
 <Property name="MINNRE">
-<Description>
-Naam ontvanger</Description>
 <Type>%String</Type>
+<InitialExpression>"XML Conversie"</InitialExpression>
 </Property>
 
 <Property name="MIACRQ">
 <Description>
+Naam ontvanger
 indien 1 te bevestigen</Description>
 <Type>%String</Type>
 </Property>
@@ -98,6 +98,50 @@
 	Quit result
 ]]></Implementation>
 </Method>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>CSBSOHeaderState</State>
+<StreamLocation>^APPS.AKP.Aanko2CB6.CSBSOHeaderS</StreamLocation>
+<Data name="CSBSOHeaderState">
+<Value name="1">
+<Value>MIIDEF</Value>
+</Value>
+<Value name="2">
+<Value>LEVNUR</Value>
+</Value>
+<Value name="3">
+<Value>MIINTY</Value>
+</Value>
+<Value name="4">
+<Value>MIINTS</Value>
+</Value>
+<Value name="5">
+<Value>MINETC</Value>
+</Value>
+<Value name="6">
+<Value>MIOTCR</Value>
+</Value>
+<Value name="7">
+<Value>MITICR</Value>
+</Value>
+<Value name="8">
+<Value>MICOUN</Value>
+</Value>
+<Value name="9">
+<Value>MINNCR</Value>
+</Value>
+<Value name="10">
+<Value>MINNRE</Value>
+</Value>
+<Value name="11">
+<Value>MIACRQ</Value>
+</Value>
+<Value name="12">
+<Value>MESPRO</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: vhTest/Utils/APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFactuur/CSBSO.cls.xml
===================================================================
diff -u -r36137 -r36189
--- vhTest/Utils/APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFactuur/CSBSO.cls.xml	(.../CSBSO.cls.xml)	(revision 36137)
+++ vhTest/Utils/APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFactuur/CSBSO.cls.xml	(.../CSBSO.cls.xml)	(revision 36189)
@@ -7,8 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
 <Implementation><![CDATA[
-	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()
-	
+	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()	
 	do CSBSO.CSBSO11List.Insert(##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011).%New())
 	do CSBSO.CSBSO11List.GetAt(1).CSBSO21List.Insert(##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021).%New())
 	do CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.Insert(##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031).%New())
@@ -74,7 +73,23 @@
 	set CSBSO.CSBSO11List.GetAt(1).TransportationMode = "L"
 	set CSBSO.CSBSO11List.GetAt(1).TruckNumberPart = ""
 	set CSBSO.TransmissieNummer = ""
+	set CSBSO.CSBSOHeader = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSOHeader).%New()
+	set CSBSO.CSBSOHeader.LEVNUR = "5005"
+	set CSBSO.CSBSOHeader.MESPRO = ""
+	set CSBSO.CSBSOHeader.MIACRQ = "1"
+	set CSBSO.CSBSOHeader.MICOUN = "0"
+	set CSBSO.CSBSOHeader.MIIDEF = "BAU300332"
+	set CSBSO.CSBSOHeader.MIINTS = "SO"
+	set CSBSO.CSBSOHeader.MIINTY = "CSB"
+	set CSBSO.CSBSOHeader.MINETC = "C"
+	set CSBSO.CSBSOHeader.MINNCR = ""
+	set CSBSO.CSBSOHeader.MINNRE = ""
+	set CSBSO.CSBSOHeader.MIOTCR = "21-06-16"
+	set CSBSO.CSBSOHeader.MITICR = "1200"
+
 	
+	
+	
 	/*
 	
 	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()
Index: APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml
===================================================================
diff -u -r36148 -r36189
--- APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml	(.../ToeleveringInfoVerzamelaar.cls.xml)	(revision 36148)
+++ APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml	(.../ToeleveringInfoVerzamelaar.cls.xml)	(revision 36189)
@@ -32,16 +32,10 @@
 	#dim ToeleveringLijnID As %Integer = ToeleveringLijnNr * 100
 	#dim ToeleveringLijn As DOM.AKP.impl.DataM.DataMProductToeleveringLijn = Toelevering.GeefToeleveringLijn(ToeleveringLijnID)	
 	set CSBSO41.ProductNrCustomer = ToeleveringLijn.GeefProductID()
-	Do ##class(Tools.Wlip).%New(207).String("Product " _ CSBSO41.ProductNrCustomer)	
 	#dim Product as DOM.PM.Product = ..ProductAPI.GeefProduct(CSBSO41.ProductNrCustomer)	
 	;Theoretischge prijs volgens toelevering. 
 	;eventuele prijs volgens BLUM uit COA bericht zit in ^BLTO
 	set CSBSO41.Value = CSBSO41.QuantityInvoiced * Product.GeefBrutoAankoopPrijs() / $Select(Product.GeefGrootteOrdeAankoop()="M":1000,Product.GeefGrootteOrdeAankoop()="H":100,1:1 )
-	
-	Do ##class(Tools.Wlip).%New(207).String("Aantal " _ ToeleveringLijn.GeefAantal())	
-	Do ##class(Tools.Wlip).%New(207).String("BrutoPrijs " _ Product.GeefBrutoAankoopPrijs())
-	Do ##class(Tools.Wlip).%New(207).String("GrootteOrde " _ Product.GeefGrootteOrdeAankoop())
-	Do ##class(Tools.Wlip).%New(207).String("Waarde " _ CSBSO41.Value)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml
===================================================================
diff -u -r36137 -r36189
--- APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 36137)
+++ APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 36189)
@@ -17,8 +17,8 @@
 <Method name="Bewaar">
 <FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</FormalSpec>
 <Implementation><![CDATA[
-	Do ..ZetMsgNr()
 
+	Do ..ZetMsgNr()
 	#dim RecordCount As %Integer = 0
 	#dim CSBSO11Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO.CSBSO11List)
 	while CSBSO11Iterator.HasNext(){
@@ -37,20 +37,21 @@
 				#dim CSBSO31 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = CSBSO31Iterator.Next()
 				Do ..SchrijfRecord(CSBSO31.ToString())
 				Set RecordCount = RecordCount + 1
-
-				#dim CSBSO41Iterator As TECH.ArrayIterator = ##class(TECH.ArrayIterator).%New(CSBSO31.CSBSO41Array)
-				while CSBSO41Iterator.HasNext(){
-					#dim CSBSO41 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = CSBSO41Iterator.Next()
-					Do ..SchrijfRecord(CSBSO41.ToString())
-					Set RecordCount = RecordCount + 1
-
-					#dim CSBSO44Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO41.CSBSO44List)
-					while CSBSO44Iterator.HasNext(){
-						#dim CSBSO44 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = CSBSO44Iterator.Next()
-						Do ..SchrijfRecord(CSBSO44.ToString())
+				#dim arrindex as %String = ""
+				do {
+					#dim CSBSO41 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = CSBSO31.CSBSO41Array.GetNext(.arrindex)
+					if arrindex '= "" {
+						Do ..SchrijfRecord(CSBSO41.ToString())
 						Set RecordCount = RecordCount + 1
+
+						#dim CSBSO44Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO41.CSBSO44List)
+						while CSBSO44Iterator.HasNext(){
+							#dim CSBSO44 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = CSBSO44Iterator.Next()
+							Do ..SchrijfRecord(CSBSO44.ToString())
+							Set RecordCount = RecordCount + 1
+						}
 					}
-				}
+				} While(arrindex'="")
 			}
 		}
 	}
@@ -63,6 +64,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set ..MsgNr = +$O(^BLImp(..MsgNr),-1) + 1
+	w !,"BLImp bericht " _ ..MsgNr
  	Kill ^BLImp(..MsgNr)
  	Do ..SchrijfHeader("")
 ]]></Implementation>
Index: vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(revision 36189)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder</Super>
+
+<Method name="Converteer">
+<FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBS031.cls.xml
===================================================================
diff -u -r36086 -r36189
--- APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBS031.cls.xml	(.../CSBS031.cls.xml)	(revision 36086)
+++ APPS/AKP/AankoopControle/BLUM/TXT/TransportEnFaktuur/CSBS031.cls.xml	(.../CSBS031.cls.xml)	(revision 36189)
@@ -55,7 +55,7 @@
 	Set result = result _ ..FormateerVeld(..Currency, 3)
 	Set result = result _ ..FormateerNumeriekVeld(..NetValue, 12,2)
 	Set result = result _ ..FormateerVeld(..Tax, 1)
-	Set result = result _ ..FormateerVeld(..DeliveryCustomerNr, 15)
+	Set result = result _ ..FormateerVeldRechts(..DeliveryCustomerNr, 15)
 	Set result = result _ ..FormateerVeld(..InvoicingCustomerNr, 6)
 	Set result = result _ ..FormateerVeld("""",1)
 	Quit result
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r36148 -r36189
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 36148)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 36189)
@@ -32,6 +32,7 @@
 	#dim CSBSO41 as  APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).CSBSO41Array.GetAt("0438123420583401")	
 	
 	;do ##class(Tools.ObjectDumper.CodeCreator).%New(CSBSO).Dump()
+	;do ##class(Tools.ObjectDumper.CodeCreator).%New(CSBSO.CSBSOHeader).Dump()
 	
 	do $$$AssertIsObject(CSBSO41)
 	do $$$AssertEquals(CSBSO41.ABNr,"779465")
@@ -43,7 +44,8 @@
 	do $$$AssertEquals(CSBSO41.QuantityShipped,"1000")
 	do $$$AssertEquals(CSBSO41.QuantityInvoiced,"1000")
 	do $$$AssertEquals(CSBSO41.ProductNrCustomer,"1070692")
-	Do $$$AssertEquals(CSBSO41.Value,496.7)
+	Do $$$AssertEquals(CSBSO41.Value,496.7)	
+	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).SpecialMarking1,"0034512494")
 	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).NumberOfParcels1,"00001")
 	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).PiecesPerParcels1,"0001000")
 ]]></Implementation>