Index: vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml
===================================================================
diff -u -r71744 -r71745
--- vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 71744)
+++ vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 71745)
@@ -196,6 +196,55 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Indien er meerdere gepitchte batches vooraan toegevoegd worden bij reeds ge-exporteerde batches -&gt; tweede batch krijgt volgnummer 75">
+<Implementation><![CDATA[
+	#dim VerwachtVolgnummer = 75
+	#dim ReedsAanwezigVorigVolgnummer = 50
+	#dim ReedsAanwezigVolgendVolgnummer = 100
+	#dim Pitchorde As %Integer = 2
+	#dim LijnNr As %Integer = 1
+	#dim AantalBatchesPitched = 4
+	#dim VorigeBatchId = 111111
+	#dim VolgendeBatchId1 = 222222
+	#dim VolgendeBatchId2 = 333333
+	
+ 	#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 VorigeBatchMock As vhTest.Mock.APPS.Halux.common.Batch = ..GeefBatchMock(VorigeBatchId, LijnNr)
+ 	#dim VorigeDummyPitchedBatch As TECH.Iterator = ..GeefBatchPitchedIterator(LijnNr, Pitchorde - 1, VorigeBatchMock)
+ 	#dim VolgendeBatchMock1 As vhTest.Mock.APPS.Halux.common.Batch = ..GeefBatchMock(VolgendeBatchId1, LijnNr)
+ 	#dim VolgendeDummyPitchedBatch1 As TECH.Iterator = ..GeefBatchPitchedIterator(LijnNr, Pitchorde + 1, VolgendeBatchMock1)
+ 	#dim VolgendeBatchMock2 As vhTest.Mock.APPS.Halux.common.Batch = ..GeefBatchMock(VolgendeBatchId2, LijnNr)
+ 	#dim VolgendeDummyPitchedBatch2 As TECH.Iterator = ..GeefBatchPitchedIterator(LijnNr, Pitchorde + 2, VolgendeBatchMock2)
+ 	 	
+	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde - 1, LijnNr).DanReturn(VorigeDummyPitchedBatch)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde + 1, LijnNr).DanReturn(VolgendeDummyPitchedBatch1)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde + 2, LijnNr).DanReturn(VolgendeDummyPitchedBatch2)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("GeefHoogstePitchordeVoorLijnNr", LijnNr).DanReturn(AantalBatchesPitched)
+	
+	#dim VorigeBatchPitchExported As TECH.Iterator = ..GeefBatchPitchedExportedIterator(ReedsAanwezigVorigVolgnummer)
+	#dim VolgendeBatchPitchExported As TECH.Iterator = ..GeefBatchPitchedExportedIterator(ReedsAanwezigVolgendVolgnummer)
+	
+	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", VorigeBatchId).DanReturn(VorigeBatchPitchExported)
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", VolgendeBatchId1).DanReturn(LegeIterator)
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", VolgendeBatchId2).DanReturn(VolgendeBatchPitchExported)
+
+	Set BatchPitchExportedHelper = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService.BatchPitchExportedHelper).%New(BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock)
+	#dim Volgnummer = BatchPitchExportedHelper.BepaalVolgnummer(DummyPitchedBatch)
+	
+	Do $$$AssertEquals(Volgnummer, VerwachtVolgnummer)
+	
+	Do VorigeBatchMock.Verifieer()
+	Do VolgendeBatchMock1.Verifieer()
+	Do VolgendeBatchMock2.Verifieer()
+	Do BatchPitchedRepositoryMock.Verifieer()
+	Do BatchPitchExportedRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefBatchMock">
 <FormalSpec>BatchId:%String,LijnNr:%Integer</FormalSpec>
 <Private>1</Private>
@@ -238,10 +287,12 @@
 </Method>
 
 <Method name="GeefBatchPitchedExportedIterator">
+<FormalSpec>Volgnummer:%Integer=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	Set BatchPitchedExported = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitchExported).%New()
+	Set BatchPitchedExported.Volgnummer = Volgnummer
 	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchedExported)
 	
 	Quit ##class(TECH.ListIterator).%New(BatchPitchExportedLijst)