Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator.cls.xml
===================================================================
diff -u -r71881 -r71900
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator.cls.xml	(.../HoofdDataGenerator.cls.xml)	(revision 71881)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator.cls.xml	(.../HoofdDataGenerator.cls.xml)	(revision 71900)
@@ -4,8 +4,8 @@
 <Abstract>1</Abstract>
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="BatchPitchExportedRepository">
-<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository</Type>
+<Property name="BatchPitchExportedService">
+<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService</Type>
 <Private>1</Private>
 </Property>
 
@@ -30,13 +30,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>BatchPitchExportedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository="",OrderApi:DOM.VKP.OrderAPI="",PartijApi:DOM.PARTIJ.PartijAPI="",LegacyPartijApi:DOM.PARTIJ.LegacyPartijAPI="",Logger:vhLib.Logger=""</FormalSpec>
+<FormalSpec>BatchPitchExportedService:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService="",OrderApi:DOM.VKP.OrderAPI="",PartijApi:DOM.PARTIJ.PartijAPI="",LegacyPartijApi:DOM.PARTIJ.LegacyPartijAPI="",Logger:vhLib.Logger=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..BatchPitchExportedRepository = $$$Inject(BatchPitchExportedRepository, ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New())
+	Set ..BatchPitchExportedService = $$$Inject(BatchPitchExportedService, ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New())
 	Set ..OrderApi = $$$Inject(OrderApi, ##class(DOM.VKP.impl.DataM.DataMOrderAPI).%New())
 	Set ..PartijApi = $$$Inject(PartijApi, ##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	Set ..LegacyPartijApi = $$$Inject(LegacyPartijApi, ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI())
@@ -103,7 +103,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim Rangorde As %String = ""
-	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.dto.BatchPitchExported = ..GeefBatchPitchExported(BatchId)
+	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.BatchPitchExported = ..GeefBatchPitchExported(BatchId)
 	
 	#dim Volgnummer As %String = BatchPitchExported.Volgnummer
 	Set Rangorde = Volgnummer _ "_" _ ..PrependNul(SequentieNummerToelevering)
@@ -117,7 +117,7 @@
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.dto.BatchPitchExported = ..GeefBatchPitchExported(BatchId)	
+	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.BatchPitchExported = ..GeefBatchPitchExported(BatchId)	
 	Quit BatchPitchExported.LijnNummer
 ]]></Implementation>
 </Method>
@@ -127,23 +127,24 @@
 <FormalSpec>Batch:APPS.Halux.common.Batch,Toelevering:DOM.AKP.Toelevering</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefAantalLades">
 <Abstract>1</Abstract>
 <FormalSpec>Batch:APPS.Halux.common.Batch,Toelevering:DOM.AKP.Toelevering</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefBatchPitchExported">
 <FormalSpec>BatchId:%String</FormalSpec>
 <Private>1</Private>
-<ReturnType>APPS.Halux.Planning.Pitching.dto.BatchPitchExported</ReturnType>
+<ReturnType>APPS.Halux.Planning.Pitching.BatchPitchExported</ReturnType>
 <Implementation><![CDATA[
-	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.dto.BatchPitchExported = ""
-	#dim BatchPitchExportedIterator As TECH.Iterator = ..BatchPitchExportedRepository.ZoekViaBatchId(BatchId)
-	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(BatchPitchExportedIterator)
+	#dim BatchPitchExported As APPS.Halux.Planning.Pitching.BatchPitchExported = ""
+	#dim BatchPitchExportedLijst As %ListOfObjects = ..BatchPitchExportedService.ZoekViaBatchId(BatchId)
 	
 	If (BatchPitchExportedLijst.Size = 1) {
 		Set BatchPitchExported = BatchPitchExportedLijst.GetAt(1)