Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/DataVoorToeleveringGenerator/GenereerData/Test.cls.xml
===================================================================
diff -u -r71597 -r71755
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/DataVoorToeleveringGenerator/GenereerData/Test.cls.xml	(.../Test.cls.xml)	(revision 71597)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/DataVoorToeleveringGenerator/GenereerData/Test.cls.xml	(.../Test.cls.xml)	(revision 71755)
@@ -5,39 +5,38 @@
 
 <Method name="Test: Test standaardgedrag met conversie horolog">
 <Implementation><![CDATA[
-	#dim DummyHorolog As %String = "66704,63010"
+	#dim Horolog As %String = "66704,63010"
 	#dim VerwachtTijdstipGeformatteerd = "2023-08-18T17:30:10.000Z"
-	#dim DummyBatchId As %String = 12345
-	#dim DummyBatchPitchedId As %String = ""
-	#dim DummySequentieNummerToelevering As %Integer = 1
-	#dim DummyVerzendingWijze As %String = "OD3;1`OD3;3"
+	#dim BatchId As %String = 12345
+	#dim BatchPitchExportedVolgnummer As %String = 100
+	#dim SequentieNummerToelevering As %Integer = 1
+	#dim VerzendingWijze As %String = "OD3;1`OD3;3"
 	#dim VerwachteVerzendingWijzeGeformateerd = "OD3"
 	
 	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(2).DanReturn(DummyBatchId)
+	Do BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(2).DanReturn(BatchId)
 	Do BatchMock.VerwachtMethodCall("GeefLijn").ExactAantalKeer(1).DanDoeNiks()
 	
 	#dim ToeleveringMock As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).ToeleveringMetLijn()	
 	Do ToeleveringMock.VerwachtMethodCall("GeefAantalProducten").ExactAantalKeer(1).DanDoeNiks()
-	Do ToeleveringMock.VerwachtMethodCall("GeefDueOutTime").ExactAantalKeer(2).DanReturn(DummyHorolog)
+	Do ToeleveringMock.VerwachtMethodCall("GeefDueOutTime").ExactAantalKeer(2).DanReturn(Horolog)
 	Do ToeleveringMock.VerwachtMethodCall("GeefOrderID").ExactAantalKeer(1).DanReturn(1)
 	
 	Set DummyDocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
 	Set DummyDocumentReferenties.KlantOrderNummer = 5
 	
-	Set BatchPitched = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
-	Set BatchPitchedLijst = ##class(%ListOfObjects).%New()
-	Do BatchPitchedLijst.Insert(BatchPitched)
-	#dim BatchPitchedIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(BatchPitchedLijst)
+	Set BatchPitchExported = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitchExported).%New()
+	Set BatchPitchExported.Volgnummer = BatchPitchExportedVolgnummer
+	#dim BatchPitchExportedIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(BatchPitchExported)
 	
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(1).DanReturn(BatchPitchedIterator)
+	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", BatchId).ExactAantalKeer(1).DanReturn(BatchPitchExportedIterator)
 	
 	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
 	Do OrderMock.VerwachtMethodCall("GeefAxSalesId").ExactAantalKeer(1).DanDoeNiks()
 	Do OrderMock.VerwachtMethodCall("GeefOrderReferentie").ExactAantalKeer(1).DanDoeNiks()
 	Do OrderMock.VerwachtMethodCall("GeefCommissieReferentie").ExactAantalKeer(1).DanDoeNiks()
-	Do OrderMock.VerwachtMethodCall("GeefVerzendingWijze").ExactAantalKeer(1).DanReturn(DummyVerzendingWijze)
+	Do OrderMock.VerwachtMethodCall("GeefVerzendingWijze").ExactAantalKeer(1).DanReturn(VerzendingWijze)
 	Do OrderMock.VerwachtMethodCall("GeefDocumentReferenties").ExactAantalKeer(1).DanReturn(DummyDocumentReferenties)
 
 	#dim OrderApiMock As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
@@ -50,13 +49,13 @@
 	Set LegacyPartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
 	Do LegacyPartijApiMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID", "K||1234").ExactAantalKeer(1).DanDoeNiks()
 		
-	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.DataVoorToeleveringGenerator).%New(BatchPitchedRepositoryMock, OrderApiMock, PartijAPIMock, LegacyPartijApiMock)
-	#dim BatchNaarObjectiveData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = DataVoorToeleveringGenerator.GenereerData(BatchMock, ToeleveringMock, DummySequentieNummerToelevering)
+	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.DataVoorToeleveringGenerator).%New(BatchPitchExportedRepositoryMock, OrderApiMock, PartijAPIMock, LegacyPartijApiMock)
+	#dim BatchNaarObjectiveData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = DataVoorToeleveringGenerator.GenereerData(BatchMock, ToeleveringMock, SequentieNummerToelevering)
 	
 	Do $$$AssertEquals(BatchNaarObjectiveData.DueBefore, VerwachtTijdstipGeformatteerd)
 	Do $$$AssertEquals(BatchNaarObjectiveData.DueOut, VerwachtTijdstipGeformatteerd)
 	Do $$$AssertEquals(BatchNaarObjectiveData.Verzendwijze, VerwachteVerzendingWijzeGeformateerd)
-	Do $$$AssertEquals(BatchNaarObjectiveData.Rangorde, DummyBatchPitchedId _ "_0000" _ DummySequentieNummerToelevering)
+	Do $$$AssertEquals(BatchNaarObjectiveData.Rangorde, BatchPitchExportedVolgnummer _ "_0000" _ SequentieNummerToelevering)
 	Do $$$AssertEquals(BatchNaarObjectiveData.MultipersonalityKlant1, "null")
 	
 	Do BatchMock.Verifieer()
@@ -65,7 +64,7 @@
 	Do OrderMock.Verifieer()
 	Do PartijAPIMock.Verifieer()
 	Do LegacyPartijApiMock.Verifieer()
-	Do BatchPitchedRepositoryMock.Verifieer()
+	Do BatchPitchExportedRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/DataVoorToeleveringGenerator.cls.xml
===================================================================
diff -u -r71703 -r71755
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/DataVoorToeleveringGenerator.cls.xml	(.../DataVoorToeleveringGenerator.cls.xml)	(revision 71703)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/DataVoorToeleveringGenerator.cls.xml	(.../DataVoorToeleveringGenerator.cls.xml)	(revision 71755)
@@ -3,8 +3,8 @@
 <Class name="APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.DataVoorToeleveringGenerator">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="BatchPitchedRepository">
-<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository</Type>
+<Property name="BatchPitchExportedRepository">
+<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,13 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>BatchPitchedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository="",OrderApi:DOM.VKP.OrderAPI="",PartijApi:DOM.PARTIJ.PartijAPI="",LegacyPartijApi:DOM.PARTIJ.LegacyPartijAPI="",Logger:vhLib.Logger=""</FormalSpec>
+<FormalSpec>BatchPitchExportedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository="",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 ..BatchPitchedRepository = $$$Inject(BatchPitchedRepository, ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New())
+	Set ..BatchPitchExportedRepository = $$$Inject(BatchPitchExportedRepository, ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%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())
@@ -100,15 +100,15 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim Rangorde As %String = ""
-	#dim BatchPitchedIterator As TECH.Iterator = ..BatchPitchedRepository.ZoekViaBatchId(BatchId)
-	#dim BatchPitchedLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(BatchPitchedIterator)
+	#dim BatchPitchExportedIterator As TECH.Iterator = ..BatchPitchExportedRepository.ZoekViaBatchId(BatchId)
+	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(BatchPitchExportedIterator)
 	
-	If (BatchPitchedLijst.Size = 1) {
-		#dim BatchPitched As APPS.Halux.Planning.Pitching.dto.BatchPitched = BatchPitchedLijst.GetAt(1)
-		#dim Id As %String = BatchPitched.GeefID()
+	If (BatchPitchExportedLijst.Size = 1) {
+		#dim BatchPitchExported As APPS.Halux.Planning.Pitching.dto.BatchPitchExported = BatchPitchExportedLijst.GetAt(1)
+		#dim Volgnummer As %String = BatchPitchExported.Volgnummer
 		
-		Set Rangorde = Id _ "_" _ ..FormateerSequentieNummer(SequentieNummerToelevering)
-	} ElseIf (BatchPitchedLijst.Size > 1) {
+		Set Rangorde = Volgnummer _ "_" _ ..FormateerSequentieNummer(SequentieNummerToelevering)
+	} ElseIf (BatchPitchExportedLijst.Size > 1) {
 		Set Exception = ##class(TECH.Exceptions.DataCorruptException).%New("De rangorde kan niet worden bepaald voor BatchId '" _ BatchId _ "', aangezien er meerdere batches zijn gepitcht.")
 		Do ..Logger.Error("BepaalRangorde", Exception.GeefOmschrijving())