Index: APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml
===================================================================
diff -u -r71703 -r74429
--- 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 74429)
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
+<Parameter name="MESFaseActief">
+<Type>%Integer</Type>
+<Default>1</Default>
+</Parameter>
+
 <Property name="MESService">
 <Type>APPS.Halux.PPS.MES.MESService</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="BatchPitchedRepository">
-<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository</Type>
+<Property name="BatchService">
+<Type>APPS.Halux.common.BatchService</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="BatchPitchExportedRepository">
-<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository</Type>
+<Property name="BatchPitchedRepository">
+<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository</Type>
 <Private>1</Private>
 </Property>
 
@@ -23,108 +28,142 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BatchPitchExportedService">
+<Type>APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
 </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="",BatchService:APPS.Halux.common.BatchService=""</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.PPS.Activiteit.impl.common.BatchNaarObjectiveIoCContainer).Instance().Resolve("BatchPitchExportedService"))
 	Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New("APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter"))
+	Set ..BatchService = $$$Inject(BatchService, ##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchService())
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <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())
+		#dim CategorTLM As %Boolean = ((Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Tandembox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Legrabox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Merivobox()))
+
+		If (..MESService.IsActiefVoorMes(Batch.GeefLijn(), ..#MESFaseActief) && CategorTLM) {
+			Try {
+				If ((Batch.IsReedsGestart()) && ($$$Not(..IsBatchExported(Batch.GeefID())))) {
+					Do ..BatchPitchExportedService.BepaalVolgnummerEnBewaar(PitchedBatch)
+					#dim IsVerzondenNaarObjective As %Boolean = ..TriggerBatchNaarObjectiveAansturingActie(Batch)
+					
+					If (IsVerzondenNaarObjective) {
+						Do ..BatchPitchExportedService.MarkeerBatchAlsExportedNaarObjective(Batch.GeefID())
+					}
+				}
+			} Catch {
+				#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+				Do ..Logger.ErrorMail("ExporteerBatchPitchedDataNaarObjective", Exception.GeefOmschrijving())
 			}
+			
 		}
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="ExporteerBatchPitchedDataNaarObjectiveVoorBatch">
+<Description>
+Wordt opgeroepen bij het resetten van een batch</Description>
+<FormalSpec>BatchID:%String,IsTriggerResetBatch:%Boolean=0</FormalSpec>
+<Implementation><![CDATA[
+	#dim Batch As APPS.Halux.common.impl.BatchImpl = ..BatchService.GeefBatch(BatchID)
+	#dim CategorTLM As %Boolean = ((Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Tandembox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Legrabox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Merivobox()))
+	
+	If (..MESService.IsActiefVoorMes(Batch.GeefLijn(), ..#MESFaseActief) && CategorTLM) {
+		Try {
+			If ((Batch.IsReedsGestart()) && ((..IsBatchExported(Batch.GeefID())))) {
+				#dim IsVerzondenNaarObjective As %Boolean = ..TriggerBatchNaarObjectiveAansturingActie(Batch, IsTriggerResetBatch)
+			}
+		} Catch {
+			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+			Do ..Logger.Error("ExporteerBatchPitchedDataNaarObjectiveVoorBatch", Exception.GeefOmschrijving())
+		}
+	}
+]]></Implementation>
+</Method>
+
 <Method name="IsBatchExported">
 <FormalSpec>BatchId:%String</FormalSpec>
 <Private>1</Private>
 <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)
-		Set IsBatchExported = BatchPitchExportedDto.IsExported
+		#dim BatchPitchExported As APPS.Halux.Planning.Pitching.BatchPitchExported = BatchPitchExportList.GetAt(1)
+		Set IsBatchExported = BatchPitchExported.IsExported
 	} ElseIf (BatchPitchExportList.Size = 0) {
 		Set IsBatchExported = $$$False
 	} 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>
+<FormalSpec>Batch:APPS.Halux.common.impl.BatchImpl,IsTriggerResetBatch:%Boolean=0</FormalSpec>
 <Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim VerzondenNaarObjective As %Boolean = $$$True
+	#dim UitvoeringInfoIterator As TECH.Iterator
+	#dim UitvoeringInfoLijst As %ListOfObjects
+	
 	If (Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Legrabox()) {
 		Set AansturingActie = ##class(APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective).%New()
-		#dim UitvoeringInfoIterator As TECH.Iterator = ..BatchNaarObjectiveUitvoeringInfoRepository.ZoekViaBatchId(Batch.GeefID())
-		#dim UitvoeringInfoLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(UitvoeringInfoIterator)
-		
-		Do AansturingActie.VerwerkUitvoeringInfoLijst(UitvoeringInfoLijst)
+		Do ..VerwerkAansturingActie(AansturingActie, Batch, IsTriggerResetBatch)
+	} ElseIf (Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Tandembox()) {
+		Set AansturingActie = ##class(APPS.Halux.PPS.Document.impl.TBX.BatchNaarObjective).%New()
+		Do ..VerwerkAansturingActie(AansturingActie, Batch, IsTriggerResetBatch)
+	} ElseIf (Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Merivobox()) {
+		Set AansturingActie = ##class(APPS.Halux.PPS.Document.impl.MVX.BatchNaarObjective).%New()
+		Do ..VerwerkAansturingActie(AansturingActie, Batch, IsTriggerResetBatch)
+	} Else {
+		Set VerzondenNaarObjective = $$$False
+		Set Exception = ##class(TECH.Exceptions.NotSupportedException).%New(..%ClassName(1), "TriggerBatchNaarObjectiveAansturingActie voor categorie '" _ Batch.GeefCategorie() _ "'.")
+		Do ..Logger.Error("TriggerBatchNaarObjectiveAansturingActie", Exception.GeefOmschrijving())
 	}
+	
+	Quit VerzondenNaarObjective
 ]]></Implementation>
 </Method>
 
-<Method name="MarkeerBatchAlsExportedNaarObjective">
-<FormalSpec>BatchId:%String</FormalSpec>
+<Method name="VerwerkAansturingActie">
+<FormalSpec>AansturingActie:APPS.Halux.PPS.Document.impl.common.BatchNaarObjective,Batch:APPS.Halux.common.impl.BatchImpl,IsTriggerResetBatch:%Boolean=0</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)
+	#dim UitvoeringInfoIterator As TECH.Iterator = ..BatchNaarObjectiveUitvoeringInfoRepository.ZoekViaBatchId(Batch.GeefID())
+	#dim UitvoeringInfoLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(UitvoeringInfoIterator)
+		
+	Do AansturingActie.VerwerkUitvoeringInfoLijst(UitvoeringInfoLijst,,, IsTriggerResetBatch)
 ]]></Implementation>
 </Method>
 </Class>