Index: APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml
===================================================================
diff -u -r52393 -r52400
--- APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml	(.../TransportdataVoorKlantBepaler.cls.xml)	(revision 52393)
+++ APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml	(.../TransportdataVoorKlantBepaler.cls.xml)	(revision 52400)
@@ -5,12 +5,12 @@
 
 <Method name="BepaalTransportData">
 <FormalSpec>KlantId:DOM.common.PartijID,BeginDatum:%Date,EindDatum:%Date</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
+<ReturnType>APPS.TRANSP.dto.NacalculatieLijst</ReturnType>
 <Implementation><![CDATA[
 	#dim RitId As %String = ""
 	#dim Rit As DOM.TRANSP.impl.DataM.DataMRit
 	#dim NacalculatieDto As APPS.TRANSP.dto.Nacalculatie
-	Set Resultaat = ##class(%ListOfDataTypes).%New()
+	Set Resultaat = ##class(APPS.TRANSP.dto.NacalculatieLijst).%New()
 	
 	For  { Set RitId = $Order(^TRANSP("D",RitId)) Quit:(RitId="")
 		Set Rit = ##class(DOM.TRANSP.impl.DataM.DataMRit).%New(RitId)
Index: vhTest/Mock/APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml
===================================================================
diff -u -r52393 -r52400
--- vhTest/Mock/APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml	(.../TransportdataVoorKlantBepaler.cls.xml)	(revision 52393)
+++ vhTest/Mock/APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml	(.../TransportdataVoorKlantBepaler.cls.xml)	(revision 52400)
@@ -10,7 +10,7 @@
 
 <Method name="BepaalTransportData">
 <FormalSpec>KlantId:DOM.common.PartijID,BeginDatum:%Date,EindDatum:%Date</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
+<ReturnType>APPS.TRANSP.dto.NacalculatieLijst</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("BepaalTransportData",KlantId,BeginDatum,EindDatum)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml
===================================================================
diff -u -r52396 -r52400
--- vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52396)
+++ vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52400)
@@ -8,21 +8,28 @@
 	#dim KlantId As %String = "K||2671"
 	#dim BeginDatum As %Date = $H-10
 	#dim EindDatum As %Date = $H
+	#dim GegenereerdAntwoord As APPS.TRANSP.dto.NacalculatieLijst
 	
+	Set GegenereerdAntwoord = ..GenereerAntwoordData(2)
 	Set TransportdataVoorKlantBepalerMock = ##class(vhTest.Mock.APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New()
-	Do TransportdataVoorKlantBepalerMock.VerwachtMethodCall("BepaalTransportData",KlantId,BeginDatum,EindDatum).ExactAantalKeer(1).DanReturn(..GenereerAntwoordData(2))
+	Do TransportdataVoorKlantBepalerMock.VerwachtMethodCall("BepaalTransportData",KlantId,BeginDatum,EindDatum).ExactAantalKeer(1).DanReturn(GegenereerdAntwoord)
 	
-	Set TransportService = ##class(APPS.TRANSP.impl.TransportService).%New(,,TransportdataVoorKlantBepalerMock)
+	Set RapportGeneratorMock = ##class(vhTest.Mock.APPS.common.Rapport.impl.BestandGeneratorTemplate).%New()
+	Do RapportGeneratorMock.VerwachtMethodCall("MaakBestand",$$$ElkeWaarde).ExactAantalKeer(1)
+	
+	Set TransportService = ##class(APPS.TRANSP.impl.TransportService).%New(,,TransportdataVoorKlantBepalerMock,RapportGeneratorMock)
 	Do TransportService.DoeNacalculatie(KlantId,BeginDatum,EindDatum)
 	
 	Do TransportdataVoorKlantBepalerMock.Verifieer()
+	Do RapportGeneratorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="GenereerAntwoordData">
 <FormalSpec>AantalLijnen:%Integer</FormalSpec>
+<ReturnType>APPS.TRANSP.dto.NacalculatieLijst</ReturnType>
 <Implementation><![CDATA[
-	#dim Resultaat As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim Resultaat As %ListOfDataTypes = ##class(APPS.TRANSP.dto.NacalculatieLijst).%New()
 	#dim teller As %Integer = 0
 	#dim Levering As DOM.TRANSP.impl.DataM.DataMLevering
 	While teller < AantalLijnen {
Index: vhTest/Fake/APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml
===================================================================
diff -u -r52393 -r52400
--- vhTest/Fake/APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml	(.../TransportdataVoorKlantBepaler.cls.xml)	(revision 52393)
+++ vhTest/Fake/APPS/TRANSP/impl/TransportService/TransportdataVoorKlantBepaler.cls.xml	(.../TransportdataVoorKlantBepaler.cls.xml)	(revision 52400)
@@ -9,7 +9,7 @@
 
 <Method name="BepaalTransportData">
 <FormalSpec>KlantId:DOM.common.PartijID,BeginDatum:%Date,EindDatum:%Date</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
+<ReturnType>APPS.TRANSP.dto.NacalculatieLijst</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/impl/TransportService.cls.xml
===================================================================
diff -u -r52394 -r52400
--- APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52394)
+++ APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52400)
@@ -18,8 +18,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="RapportGenerator">
+<Type>APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory,TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler</FormalSpec>
+<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory,TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -28,6 +33,7 @@
 	Set ..EmailVoorBevestigingBepaler = $$$Implementation(EmailVoorBevestigingBepaler,##class(APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler).%New())
 	Set ..VerpakkingEenheidFactory = $$$Inject(VerpakkingEenheidFactory, ##class(APPS.TRANSP.impl.VerpakkingEenheidFactory).%New())
 	Set ..TransportdataVoorKlantBepaler = $$$Inject(TransportdataVoorKlantBepaler, ##class(APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New())
+	Set ..RapportGenerator = $$$Inject(RapportGenerator, ##class(APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -243,13 +249,48 @@
 	#dim RitDataLijst = ##class(%ListOfDataTypes).%New()
 	Set RitDataLijst = ..TransportdataVoorKlantBepaler.BepaalTransportData(KlantId, BeginDatum, EindDatum)
 	
-	Do ##class(Tools.Wlip).%New(127).ObjToXML(RitDataLijst)
-	
 	//csv maken
+	#dim RapportData As APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased = ##class(APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased).%New()
+	
+	Set RapportData.DataVelden = ..GeefDataVelden()
+	Set RapportData.DataTransferObjecten = RitDataLijst
+	Set RapportData.BestandVolledigeNaam = "c:\tom.csv"
+	
+	Do ..RapportGenerator.MaakBestand(RapportData)
+	
 	//mailen
 	//csv verwijderen
 ]]></Implementation>
 </Method>
+
+<Method name="GeefDataVelden">
+<Private>1</Private>
+<ReturnType>TECH.KeyValue.List</ReturnType>
+<Implementation><![CDATA[
+	#dim KeyValueList As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
+	
+	Do ..VoegToeEigenschap(KeyValueList, "RitNummer")
+	Do ..VoegToeEigenschap(KeyValueList, "OphaalTijdstip")
+	Do ..VoegToeEigenschap(KeyValueList, "AantalEuroPallet")
+	Do ..VoegToeEigenschap(KeyValueList, "AantalHalveEuroPallet")
+	Do ..VoegToeEigenschap(KeyValueList, "LeveradresNaam")
+	Do ..VoegToeEigenschap(KeyValueList, "LeveradresStraat")
+	Do ..VoegToeEigenschap(KeyValueList, "LeveradresPostcode")
+	Do ..VoegToeEigenschap(KeyValueList, "LeveradresGemeente")
+	
+	Quit KeyValueList
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeEigenschap">
+<FormalSpec>KeyValueList:TECH.KeyValue.List,Eigenschap:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim DataClassName As %String = ##class(APPS.TRANSP.dto.Nacalculatie).%ClassName(1)
+	
+	Do KeyValueList.InsertKeyValue(DataClassName, Eigenschap)
+]]></Implementation>
+</Method>
 </Class>