Index: APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml
===================================================================
diff -u -r71508 -r71699
--- APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml	(.../BatchPitchDataExporter.cls.xml)	(revision 71508)
+++ APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml	(.../BatchPitchDataExporter.cls.xml)	(revision 71699)
@@ -3,6 +3,11 @@
 <Class name="APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter">
 <Super>TECH.RegisteredObject</Super>
 
+<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>
 <Private>1</Private>
@@ -24,12 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>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="",BatchPitchExportedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository="",BatchNaarObjectiveUitvoeringInfoRepository:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository="",Logger:vhLib.Logger=""</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())
@@ -41,15 +47,18 @@
 
 <Method name="ExporteerBatchPitchedDataNaarObjective">
 <Implementation><![CDATA[
+	#dim MESFaseActief As %Integer = 1
 	#dim BatchesPitched As TECH.Iterator = ..BatchPitchedRepository.ZoekAlle()
-
+	
 	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 ((Batch.IsReedsGestart()) && ($$$Not(..IsBatchExported(Batch.GeefID())))) {
-			Do ..TriggerBatchNaarObjectiveAansturingActie(Batch)
-			Do ..MarkeerBatchAlsExportedNaarObjective(Batch.GeefID())
+		
+		If (..MESService.IsActiefVoorMes(Batch.GeefLijn(), MESFaseActief)) {
+			If ((Batch.IsReedsGestart()) && ($$$Not(..IsBatchExported(Batch.GeefID())))) {
+				Do ..TriggerBatchNaarObjectiveAansturingActie(Batch)
+				Do ..MarkeerBatchAlsExportedNaarObjective(Batch.GeefID())
+			}
 		}
 	}
 ]]></Implementation>
@@ -64,6 +73,8 @@
 	#dim BatchPitchExportedIterator As TECH.Iterator = ..BatchPitchExportedRepository.ZoekViaBatchId(BatchId)
 	#dim BatchPitchExportList As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(BatchPitchExportedIterator)
 
+	Do ##class(Tools.Wlip).%New(26).String("BatchPitchExported" _ BatchPitchExportList.Size)
+
 	If (BatchPitchExportList.Size = 1) {
 		#dim BatchPitchExportedDto As APPS.Halux.Planning.Pitching.dto.BatchPitchExported = BatchPitchExportList.GetAt(1)
 		Set IsBatchExported = BatchPitchExportedDto.IsExported
@@ -79,6 +90,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalVolgnummer">
+<Implementation><![CDATA[	//
+]]></Implementation>
+</Method>
+
 <Method name="TriggerBatchNaarObjectiveAansturingActie">
 <FormalSpec>Batch:APPS.Halux.common.impl.BatchImpl</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml
===================================================================
diff -u -r71508 -r71699
--- vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml	(.../Test.cls.xml)	(revision 71508)
+++ vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml	(.../Test.cls.xml)	(revision 71699)
@@ -3,23 +3,72 @@
 <Class name="vhUnitTest.APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="MESServiceStub">
+<Type>vhTest.Mock.APPS.Halux.PPS.MES.MESService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BatchMock">
+<Type>vhTest.Mock.APPS.Halux.common.Batch</Type>
+<Private>1</Private>
+</Property>
+
+<Parameter name="Lijn">
+<Type>%Integer</Type>
+<Default>1</Default>
+</Parameter>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	
+	Set ..MESServiceStub = ##class(vhTest.Mock.APPS.Halux.PPS.MES.MESService).%New()
+	Do ..MESServiceStub.IndienMethodCall("IsActiefVoorMes", ..#Lijn).DanReturn($$$True)
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestCase:%String</FormalSpec>
+<Implementation><![CDATA[
+ 	do ##super(aTestCase)
+	
+	Set ..BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do ..BatchMock.IndienMethodCall("GeefLijn").DanReturn(..#Lijn)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien fase nog niet actief, niets doen">
+<Implementation><![CDATA[
+	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").ExactAantalKeer(0)
+	
+	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
+	
+	Set MESServiceMock = ##class(vhTest.Mock.APPS.Halux.PPS.MES.MESService).%New()
+	Do MESServiceMock.VerwachtMethodCall("IsActiefVoorMes", ..#Lijn).DanReturn($$$False)
+	
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(MESServiceMock, BatchPitchedRepositoryMock)
+	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
+	
+	Do ..BatchMock.Verifieer()
+	Do BatchPitchedRepositoryMock.Verifieer()
+	Do MESServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Indien gepitchte batch nog niet verzonden maar ook nog niet gestart -&gt; geen trigger aansturingactie">
 <Implementation><![CDATA[
 	#dim DummyBatchId As %Integer = 12345
 	#dim IsReedsGestart As %Boolean = $$$False
 	
-	Set BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(0)
+	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
+	Do ..BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(0)
 		
-	#dim BatchesPitched As TECH.ListIterator = ..GeefBatchesPitchedIterator(BatchMock)	
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekAlle").ExactAantalKeer(1).DanReturn(BatchesPitched)
+	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
 	
-	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(BatchPitchedRepositoryMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
-	Do BatchMock.Verifieer()
+	Do ..BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -30,23 +79,19 @@
 	#dim IsReedsGestart As %Boolean = $$$True
 	#dim IsExported As %Boolean = $$$True
 	
-	Set BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)
-		
-	#dim BatchesPitched As TECH.ListIterator = ..GeefBatchesPitchedIterator(BatchMock)
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekAlle").ExactAantalKeer(1).DanReturn(BatchesPitched)
+	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
+	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)	
+	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(..BatchMock)
 	
 	#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)
 	
-	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(BatchPitchedRepositoryMock, BatchPitchExportRepositoryMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub ,BatchPitchedRepositoryMock, BatchPitchExportRepositoryMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
-	Do BatchMock.Verifieer()
+	Do ..BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
 	Do BatchPitchExportRepositoryMock.Verifieer()
 ]]></Implementation>
@@ -58,15 +103,11 @@
 	#dim IsReedsGestart As %Boolean = $$$True
 	#dim IsExported As %Boolean = $$$False
 	
-	Set BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(1).DanReturn("Legrabox")
+	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)
 	
-	#dim BatchesPitched As TECH.ListIterator = ..GeefBatchesPitchedIterator(BatchMock)
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekAlle").ExactAantalKeer(1).DanReturn(BatchesPitched)
-	
 	#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()	
@@ -76,10 +117,10 @@
 	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(BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
-	Do BatchMock.Verifieer()
+	Do ..BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
 	Do BatchPitchExportedRepositoryMock.Verifieer()
 	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.Verifieer()
@@ -93,14 +134,10 @@
 	#dim IsExported As %Boolean = $$$False
 	#dim AantalBatchesExported As %Integer = 0
 	
-	Set BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(1).DanReturn("Legrabox")
-		
-	#dim BatchesPitched As TECH.ListIterator = ..GeefBatchesPitchedIterator(BatchMock)
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekAlle").ExactAantalKeer(1).DanReturn(BatchesPitched)
+	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)
 	
 	#dim BatchesExported As TECH.ListIterator = ..GeefBatchesExportedIterator(DummyBatchId, IsExported, AantalBatchesExported)
 	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
@@ -110,10 +147,10 @@
 	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(BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock)
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
-	Do BatchMock.Verifieer()
+	Do ..BatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
 	Do BatchPitchExportedRepositoryMock.Verifieer()
 	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.Verifieer()
@@ -128,13 +165,11 @@
 	#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 BatchesPitched As TECH.ListIterator = ..GeefBatchesPitchedIterator(BatchMock)
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekAlle").ExactAantalKeer(1).DanReturn(BatchesPitched)
+	Do BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)	
+	#dim BatchPitchedRepositoryMock As BatchPitchedRepositoryMock = ..GeefBatchPitchedRepositoryMock(BatchMock)
 	
 	#dim BatchesExported As TECH.ListIterator = ..GeefBatchesExportedIterator(DummyBatchId, IsExported, AantalBatchesExported)
 	Set BatchPitchExportRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
@@ -145,7 +180,8 @@
 	
 	#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(BatchPitchedRepositoryMock, BatchPitchExportRepositoryMock,, LoggerMock)
+	
+	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchPitchExportRepositoryMock,, LoggerMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
 	
 	Do BatchMock.Verifieer()
@@ -154,6 +190,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBatchPitchedRepositoryMock">
+<FormalSpec>BatchMock:vhTest.Mock.APPS.Halux.common.Batch</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)
+	
+	Quit BatchPitchedRepositoryMock
+]]></Implementation>
+</Method>
+
 <Method name="GeefBatchesPitchedIterator">
 <FormalSpec>BatchMock:vhTest.Mock.APPS.Halux.common.Batch</FormalSpec>
 <Private>1</Private>