Index: vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml
===================================================================
diff -u -r71699 -r71733
--- vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml	(.../Test.cls.xml)	(revision 71699)
+++ vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml	(.../Test.cls.xml)	(revision 71733)
@@ -41,7 +41,8 @@
 <Implementation><![CDATA[
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").ExactAantalKeer(0)
 	
-	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
+	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
 	
 	Set MESServiceMock = ##class(vhTest.Mock.APPS.Halux.PPS.MES.MESService).%New()
 	Do MESServiceMock.VerwachtMethodCall("IsActiefVoorMes", ..#Lijn).DanReturn($$$False)
@@ -62,9 +63,10 @@
 	
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
 	Do ..BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(0)
-		
-	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
 	
+	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
+	
 	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
@@ -81,19 +83,20 @@
 	
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
 	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)	
-	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)
+	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
 	
-	#dim BatchesExported As TECH.ListIterator = ..GeefBatchesExportedIterator(DummyBatchId, IsExported)
-	Set BatchPitchExportRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
-	Do BatchPitchExportRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(1).DanReturn(BatchesExported)
+	#dim BatchesExportedLijst As %ListOfObjects = ..GeefBatchesExportedLijst(DummyBatchId, IsExported)
+	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).DanReturn(BatchesExportedLijst)
 	
-	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub ,BatchPitchedRepositoryMock, BatchPitchExportRepositoryMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock,,,BatchPitchExportedServiceMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
 	Do ..BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
-	Do BatchPitchExportRepositoryMock.Verifieer()
+	Do BatchPitchExportedServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -105,121 +108,123 @@
 	
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
 	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(1).DanReturn("Legrabox")	
-	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(1).DanReturn("Legrabox")
+	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
 	
-	#dim BatchesExported As TECH.ListIterator = ..GeefBatchesExportedIterator(DummyBatchId, IsExported)
-	#dim BatchesExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(BatchesExported)
-	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
-	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(2).DanReturn(BatchesExported)
-	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("Bewaar", BatchesExportedLijst.GetAt(1)).ExactAantalKeer(1).DanDoeNiks()
+	#dim BatchesExportedLijst As %ListOfObjects = ..GeefBatchesExportedLijst(DummyBatchId, IsExported)
 	
+	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).DanReturn(BatchesExportedLijst)
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("MarkeerBatchAlsExportedNaarObjective", DummyBatchId).DanDoeNiks()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("BepaalVolgnummerEnBewaar", DummyBatchPitchedDto).DanDoeNiks()
+	
 	Set BatchNaarObjectiveUitvoeringInfoRepositoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository).%New()
 	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(1).DanReturn(..GeefLegeUitvoeringInfoIterator())
 	
-	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock,, BatchPitchExportedServiceMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
 	Do ..BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
-	Do BatchPitchExportedRepositoryMock.Verifieer()
 	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.Verifieer()
+	Do BatchPitchExportedServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Indien gepitchte batch nog niet aanwezig in &apos;BatchPitchExported&apos; tabel, maar batch is wel gestart -&gt; trigger aansturingactie en nieuwe rij maken in &apos;BatchPitchExported&apos;">
+<Method name="Test: Indien meerdere verzonden batches -&gt; geen error gooien, wel loggen">
 <Implementation><![CDATA[
 	#dim DummyBatchId = 12345
 	#dim IsReedsGestart As %Boolean = $$$True
 	#dim IsExported As %Boolean = $$$False
-	#dim AantalBatchesExported As %Integer = 0
+	#dim AantalBatchesExported As %Integer = 2
 	
-	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(1).DanReturn("Legrabox")
-	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
+	Set BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(..#Lijn)
+	Do BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
+	Do BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
+	Do BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)
+	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(BatchMock, DummyBatchPitchedDto)
 	
-	#dim BatchesExported As TECH.ListIterator = ..GeefBatchesExportedIterator(DummyBatchId, IsExported, AantalBatchesExported)
-	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
-	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(2).DanReturn(BatchesExported)
-	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("Bewaar", $$$ElkeWaarde).ExactAantalKeer(1).DanDoeNiks()
+	#dim BatchesExportedLijst As %ListOfObjects = ..GeefBatchesExportedLijst(DummyBatchId, IsExported, AantalBatchesExported)
+	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).DanReturn(BatchesExportedLijst)
 	
-	Set BatchNaarObjectiveUitvoeringInfoRepositoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository).%New()
-	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(1).DanReturn(..GeefLegeUitvoeringInfoIterator())
+	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
+	Do LoggerMock.VerwachtMethodCall("Error", "IsBatchExported", "De batch kan niet naar Objective verzonden worden aangezien er reeds meerdere zijn verzonden voor BatchId '12345'.", $$$False).DanDoeNiks()
 	
-	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock,, LoggerMock, BatchPitchExportedServiceMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
-	Do ..BatchMock.Verifieer()
+	Do BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
-	Do BatchPitchExportedRepositoryMock.Verifieer()
-	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.Verifieer()
+	Do BatchPitchExportedServiceMock.Verifieer()
+	Do LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Indien meerdere verzonden batches -&gt; error gooien">
+<Method name="Test: Indien error -&gt; geen error gooien, wel loggen">
 <Implementation><![CDATA[
 	#dim DummyBatchId = 12345
 	#dim IsReedsGestart As %Boolean = $$$True
 	#dim IsExported As %Boolean = $$$False
-	#dim AantalBatchesExported As %Integer = 2
 	
-	Set BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(..#Lijn)
-	Do BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)	
-	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(BatchMock)
+	Do ..BatchMock.IndienMethodCall("GeefLijn").DanReturn(..#Lijn)
+	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
+	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
 	
-	#dim BatchesExported As TECH.ListIterator = ..GeefBatchesExportedIterator(DummyBatchId, IsExported, AantalBatchesExported)
-	Set BatchPitchExportRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
-	Do BatchPitchExportRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(1).DanReturn(BatchesExported)
+	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
 	
+	#dim BatchesExportedLijst As %ListOfObjects = ..GeefBatchesExportedLijst(DummyBatchId, IsExported)
+	Set EenExceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("EenExceptie")
+	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).DanReturn(BatchesExportedLijst)
+	Do BatchPitchExportedServiceMock.IndienMethodCall("BepaalVolgnummerEnBewaar", DummyBatchPitchedDto).DanException(EenExceptie)
+	
 	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
-	Do LoggerMock.VerwachtMethodCall("Error", "IsBatchExported", "De batch kan niet naar Objective verzonden worden aangezien er reeds meerdere zijn verzonden voor BatchId '12345'.", $$$False).DanDoeNiks()
+	Do LoggerMock.VerwachtMethodCall("Error", "ExporteerBatchPitchedDataNaarObjective", "EenExceptie", $$$False).DanDoeNiks()
 	
-	#dim Substring = ##class(TECH.ListUtils).CreateListOfDataTypes("De batch kan niet naar Objective verzonden worden aangezien er reeds meerdere zijn verzonden voor BatchId '12345'.")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataCorruptException",Substring))
-	
-	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchPitchExportRepositoryMock,, LoggerMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock,, LoggerMock, BatchPitchExportedServiceMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
-	Do BatchMock.Verifieer()
+	Do ..BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
-	Do BatchPitchExportRepositoryMock.Verifieer()
+	Do BatchPitchExportedServiceMock.Verifieer()
+	Do LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBatchPitchedRepositoryMock">
-<FormalSpec>BatchMock:vhTest.Mock.APPS.Halux.common.Batch</FormalSpec>
+<FormalSpec>BatchMock:vhTest.Mock.APPS.Halux.common.Batch,BatchPitchedDto:APPS.Halux.Planning.Pitching.dto.BatchPitched</FormalSpec>
 <Private>1</Private>
 <ReturnType>vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository</ReturnType>
 <Implementation><![CDATA[
 	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
 	
-	#dim BatchesPitched As TECH.ListIterator = ..GeefBatchesPitchedIterator(BatchMock)
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekAlle").ExactAantalKeer(1).DanReturn(BatchesPitched)
+	#dim BatchesPitched As TECH.ListIterator = ..GeefBatchesPitchedIterator(BatchMock, BatchPitchedDto)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekAlleGesorteerd", "Pitchorde").ExactAantalKeer(1).DanReturn(BatchesPitched)
 	
 	Quit BatchPitchedRepositoryMock
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBatchesPitchedIterator">
-<FormalSpec>BatchMock:vhTest.Mock.APPS.Halux.common.Batch</FormalSpec>
+<FormalSpec>BatchMock:vhTest.Mock.APPS.Halux.common.Batch,BatchPitchedDto:APPS.Halux.Planning.Pitching.dto.BatchPitched</FormalSpec>
 <Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
-	Set DummyBatchPitchedDto.Batch = BatchMock
+	Set BatchPitchedDto.Batch = BatchMock
 	
 	Set BatchesPitchedLijst = ##class(%ListOfObjects).%New()
-	Do BatchesPitchedLijst.Insert(DummyBatchPitchedDto)	
+	Do BatchesPitchedLijst.Insert(BatchPitchedDto)	
 	
 	Quit ##class(TECH.ListIterator).%New(BatchesPitchedLijst)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBatchesExportedIterator">
+<Method name="GeefBatchesExportedLijst">
 <FormalSpec>BatchId:%String,IsExported:%Boolean,Aantal:%Integer=1</FormalSpec>
 <Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
@@ -234,7 +239,7 @@
 		Do BatchesExportedLijst.Insert(BatchExportedDto)
 	}
 		
-	Quit ##class(TECH.ListIterator).%New(BatchesExportedLijst)
+	Quit BatchesExportedLijst
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml
===================================================================
diff -u -r71703 -r71733
--- APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml	(.../BatchPitchDataExporter.cls.xml)	(revision 71703)
+++ APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml	(.../BatchPitchDataExporter.cls.xml)	(revision 71733)
@@ -13,13 +13,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="BatchPitchExportedRepository">
-<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository</Type>
+<Property name="BatchNaarObjectiveUitvoeringInfoRepository">
+<Type>APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="BatchNaarObjectiveUitvoeringInfoRepository">
-<Type>APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository</Type>
+<Property name="BatchPitchExportedService">
+<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,16 +29,16 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MESService:APPS.Halux.PPS.MES.MESService="",BatchPitchedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository="",BatchPitchExportedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository="",BatchNaarObjectiveUitvoeringInfoRepository:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository="",Logger:vhLib.Logger=""</FormalSpec>
+<FormalSpec>MESService:APPS.Halux.PPS.MES.MESService="",BatchPitchedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository="",BatchNaarObjectiveUitvoeringInfoRepository:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository="",Logger:vhLib.Logger="",BatchPitchExportedService:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..MESService = $$$Inject(MESService, ##class(APPS.Halux.PPS.MES.MESService).%New())
 	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 ..BatchNaarObjectiveUitvoeringInfoRepository = $$$Inject(BatchNaarObjectiveUitvoeringInfoRepository, ##class(APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository).%New())
+	Set ..BatchPitchExportedService = $$$Inject(BatchPitchExportedService, ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New())
 	Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New("APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter"))
 	
 	Quit $$$OK
@@ -48,17 +48,24 @@
 <Method name="ExporteerBatchPitchedDataNaarObjective">
 <Implementation><![CDATA[
 	#dim MESFaseActief As %Integer = 1
-	#dim BatchesPitched As TECH.Iterator = ..BatchPitchedRepository.ZoekAlle()
-	
+	#dim BatchesPitched As TECH.Iterator = ..BatchPitchedRepository.ZoekAlleGesorteerd("Pitchorde")
+
 	While BatchesPitched.HasNext() {
 		#dim PitchedBatch As APPS.Halux.Planning.Pitching.dto.BatchPitched = BatchesPitched.Next()
 		#dim Batch As APPS.Halux.common.impl.BatchImpl = PitchedBatch.Batch
-		
+
 		If (..MESService.IsActiefVoorMes(Batch.GeefLijn(), MESFaseActief)) {
-			If ((Batch.IsReedsGestart()) && ($$$Not(..IsBatchExported(Batch.GeefID())))) {
-				Do ..TriggerBatchNaarObjectiveAansturingActie(Batch)
-				Do ..MarkeerBatchAlsExportedNaarObjective(Batch.GeefID())
+			Try {
+				If ((Batch.IsReedsGestart()) && ($$$Not(..IsBatchExported(Batch.GeefID())))) {
+					Do ..BatchPitchExportedService.BepaalVolgnummerEnBewaar(PitchedBatch)
+					Do ..TriggerBatchNaarObjectiveAansturingActie(Batch)
+					Do ..BatchPitchExportedService.MarkeerBatchAlsExportedNaarObjective(Batch.GeefID())
+				}
+			} Catch {
+				#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+				Do ..Logger.Error("ExporteerBatchPitchedDataNaarObjective", Exception.GeefOmschrijving())
 			}
+			
 		}
 	}
 ]]></Implementation>
@@ -70,8 +77,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim IsBatchExported As %Boolean = $$$True
-	#dim BatchPitchExportedIterator As TECH.Iterator = ..BatchPitchExportedRepository.ZoekViaBatchId(BatchId)
-	#dim BatchPitchExportList As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(BatchPitchExportedIterator)
+	#dim BatchPitchExportList As %ListOfObjects = ..BatchPitchExportedService.ZoekViaBatchId(BatchId)
 	
 	If (BatchPitchExportList.Size = 1) {
 		#dim BatchPitchExportedDto As APPS.Halux.Planning.Pitching.dto.BatchPitchExported = BatchPitchExportList.GetAt(1)
@@ -81,18 +87,12 @@
 	} Else {
 		Set Exception = ##class(TECH.Exceptions.DataCorruptException).%New("De batch kan niet naar Objective verzonden worden aangezien er reeds meerdere zijn verzonden voor BatchId '" _ BatchId _ "'.")
 		Do ..Logger.Error("IsBatchExported", Exception.GeefOmschrijving())
-		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	
 	Quit IsBatchExported
 ]]></Implementation>
 </Method>
 
-<Method name="BepaalVolgnummer">
-<Implementation><![CDATA[	//
-]]></Implementation>
-</Method>
-
 <Method name="TriggerBatchNaarObjectiveAansturingActie">
 <FormalSpec>Batch:APPS.Halux.common.impl.BatchImpl</FormalSpec>
 <Private>1</Private>
@@ -103,30 +103,12 @@
 		#dim UitvoeringInfoLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(UitvoeringInfoIterator)
 		
 		Do AansturingActie.VerwerkUitvoeringInfoLijst(UitvoeringInfoLijst)
+	} Else {
+		Set Exception = ##class(TECH.Exceptions.NotSupportedException).%New("'ExporteerBatchPitchedDataNaarObjective()' is niet geïmplementeerd voor '" _ Batch.GeefCategorie() _ "'.")
+		Do ..Logger.Error("TriggerBatchNaarObjectiveAansturingActie", Exception.GeefOmschrijving())
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="MarkeerBatchAlsExportedNaarObjective">
-<FormalSpec>BatchId:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim BatchPitchesExportedIterator As TECH.Iterator = ..BatchPitchExportedRepository.ZoekViaBatchId(BatchId)
-	#dim BatchPitchesExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(BatchPitchesExportedIterator)
-	#dim BatchPitchExportedDto As APPS.Halux.Planning.Pitching.dto.BatchPitchExported
-	
-	If (BatchPitchesExportedLijst.Size = 1) {
-		Set BatchPitchExportedDto = BatchPitchesExportedLijst.GetAt(1)
-		Set BatchPitchExportedDto.IsExported = $$$True
-	} ElseIf (BatchPitchesExportedLijst.Size = 0) {
-		Set BatchPitchExportedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitchExported).%New()
-		Set BatchPitchExportedDto.BatchId = BatchId
-		Set BatchPitchExportedDto.IsExported = $$$True
-	}
-	
-	Do ..BatchPitchExportedRepository.Bewaar(BatchPitchExportedDto)
-]]></Implementation>
-</Method>
 </Class>