Index: vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml
===================================================================
diff -u -r71740 -r71743
--- vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 71740)
+++ vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 71743)
@@ -114,6 +114,44 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Indien er meerdere gepitchte batches vooraan toegevoegd worden bij reeds ge-exporteerde batches -&gt; eerste batch krijgt volgnummer 50">
+<Implementation><![CDATA[
+	#dim VerwachtVolgnummer = 50
+	#dim ReedsAanwezigVolgnummer = 100
+	#dim Pitchorde As %Integer = 1
+	#dim LijnNr As %Integer = 1
+	#dim AantalBatchesPitched = 2
+	#dim VolgendeBatchId = 222222
+	
+ 	#dim DummyPitchedBatch As APPS.Halux.Planning.Pitching.dto.BatchPitched = ..GeefBatchPitched(LijnNr, Pitchorde)
+ 	#dim LegeIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New())
+ 	
+ 	#dim VolgendeBatchMock As vhTest.Mock.APPS.Halux.common.Batch = ..GeefBatchMock(VolgendeBatchId, LijnNr)
+ 	#dim VolgendeDummyPitchedBatch As TECH.Iterator = ..GeefBatchPitchedIterator(LijnNr, Pitchorde + 1, VolgendeBatchMock)
+ 	 	
+	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde - 1, LijnNr).DanReturn(LegeIterator)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde + 1, LijnNr).DanReturn(VolgendeDummyPitchedBatch)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("GeefHoogstePitchordeVoorLijnNr", LijnNr).DanReturn(AantalBatchesPitched)
+	
+	#dim BatchPitchExported1 As TECH.Iterator = ..GeefBatchPitchedExportedIterator()
+	
+	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", VolgendeBatchId).DanReturn(BatchPitchExported1)
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("GeefVolgnummerVoorBatchIdEnLijnNummer", VolgendeBatchId, LijnNr).DanReturn(ReedsAanwezigVolgnummer)
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("GeefHoogsteTussenliggendeVolgnummerVoorLijn", LijnNr, ReedsAanwezigVolgnummer).DanReturn("")
+	
+	Set BatchPitchExportedHelper = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService.BatchPitchExportedHelper).%New(BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock)
+	#dim Volgnummer = BatchPitchExportedHelper.BepaalVolgnummer(DummyPitchedBatch)
+	
+	Do $$$AssertEquals(Volgnummer, VerwachtVolgnummer)
+	
+	Do VolgendeBatchMock.Verifieer()
+	Do BatchPitchedRepositoryMock.Verifieer()
+	Do BatchPitchExportedRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefBatchMock">
 <FormalSpec>BatchId:%String,LijnNr:%Integer</FormalSpec>
 <Private>1</Private>
@@ -149,13 +187,22 @@
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	#dim PitchedBatch = ..GeefBatchPitched(LijnNr, Pitchorde, Batch)
+	#dim BatchPitchedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(PitchedBatch)
 	
-	Set BatchPitchedLijst = ##class(%ListOfObjects).%New()
-	Do BatchPitchedLijst.Insert(PitchedBatch)
-	
 	Quit ##class(TECH.ListIterator).%New(BatchPitchedLijst)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefBatchPitchedExportedIterator">
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	Set BatchPitchedExported = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitchExported).%New()
+	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchedExported)
+	
+	Quit ##class(TECH.ListIterator).%New(BatchPitchExportedLijst)
+]]></Implementation>
+</Method>
 </Class>