Index: APPS/Halux/Planning/ResourcePitchingService.cls.xml
===================================================================
diff -u -r57301 -r57446
--- APPS/Halux/Planning/ResourcePitchingService.cls.xml	(.../ResourcePitchingService.cls.xml)	(revision 57301)
+++ APPS/Halux/Planning/ResourcePitchingService.cls.xml	(.../ResourcePitchingService.cls.xml)	(revision 57446)
@@ -9,20 +9,29 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="Online">
+<Property name="Debug">
 <Description>
 D ##class(APPS.Halux.Planning.ResourcePitchingService).%New().VerwerkAll()</Description>
 <Type>%Boolean</Type>
 </Property>
 
+<Property name="StartTijdstip">
+<Type>%Date</Type>
+</Property>
+
+<Parameter name="RepeatTijdBatchTaak">
+<Default>540</Default>
+</Parameter>
+
 <Parameter name="ApplicatieNaam">
 <Default>Halux_Planning_ResourcePitchingService</Default>
 </Parameter>
 
 <Method name="%OnNew">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Online=1
+	Set ..StartTijdstip=$H
+	Set ..Debug=1
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -44,51 +53,54 @@
 	
 	Do ..BuildProductieOrderToResource()
 	Do ..BuildPitchingFromResourcesAndBatch()
-	
+	Do ..BuildPitchingGroupedByActiviteitAndBatch()
+
 	Do ..UnLock()
 ]]></Implementation>
 </Method>
 
 <Method name="BuildPitchingFromResourcesAndBatch">
+<Private>1</Private>
 <Implementation><![CDATA[
-	Write:..Online "Build Pitching From Resources And Batch",!
-	Write:..Online "    BerekenTijdenLeadingResources",!
-	/* SQL voor de leading resources
-    Select BP.ResourceId, Pitchorde, BatchImpl as BatchID, RL.Groep as ResourceId,RL.ID,RL.ToeleveringNr, RL.UniekLijnNr, sum(RL.TijdPerStuk*TL.Aantal) Tijd,  sum(TL.Aantal) Aantal 
+	/* SQL Voor PITCH sequentie
+	Select BP.Resource, Pitchorde, BatchImpl as BatchID, BT.Element_Key 
 	 from APPS_Halux_common_impl.BatchImpl_ToeleveringenIndex BT 
 	 join APPS_Halux_Planning_Pitching_impl.BatchPitched BP on BP.Batch=BT.BatchImpl 
-	 join APPS_Halux_Planning_Resource_impl.Resourcelijn RL on RL.ToeleveringNr=BT.Element_Key 
-	 join Flow_Toelev.Lijn TL on RL.ToeleveringNr=TL.ToeleveringNr and RL.UniekLijnNr=(TL.UniekLijnNr\100*100) 
-	where isleading=1 
-	group by BP.ResourceId,Pitchorde,BatchImpl , RL.Groep,RL.ToeleveringNr, RL.UniekLijnNr 
-	order by BP.ResourceId,BP.pitchorde
+	order by BP.Resource,BP.pitchorde
 	*/
-	Do ##class(APPS.Halux.Planning.Pitching.impl.BerekenTijdenLeadingResources).%New().Bereken()
+	Write:..Debug "Build Pitching From Resources And Batch",!
+	
+	Do ##class(APPS.Halux.Planning.Pitching.impl.BerekenTijdenLeadingPitched).%New().DeleteOld()
 
-	Write:..Online "    BerekenTijdenAfhankelijkeResources",!
-	/* SQL voor de afhankelijke resources
-    Select BatchImpl as BatchID, PitchOrde,RL.Groep as ResourceId,RL.ID,RL.ToeleveringNr, RL.UniekLijnNr, sum(RL.TijdPerStuk*TL.Aantal) Tijd,  sum(TL.Aantal) Aantal 
-	 from APPS_Halux_common_impl.BatchImpl_ToeleveringenIndex BT 
-	 join APPS_Halux_Planning_Pitching_impl.BatchPitched BP on BP.Batch=BT.BatchImpl 
-	 join APPS_Halux_Planning_Resource_impl.Resourcelijn RL on RL.ToeleveringNr=BT.Element_Key 
-	 join Flow_Toelev.Lijn TL on RL.ToeleveringNr=TL.ToeleveringNr and RL.UniekLijnNr=(TL.UniekLijnNr\100*100) 
-	where isleading=0 
-	group by BatchImpl, RL.Groep, RL.ToeleveringNr, RL.UniekLijnNr 
-	order by BatchImpl ,RL.Groep 
-    */
-    /* Werktijd calculator 
-    	zw ^Halux.GeplandeCapaciteit(1)
-    	zw ^Halux.GeplandeCapaciteit(-1)
-    */
-	Do ##class(APPS.Halux.Planning.Pitching.impl.BerekenTijdenAfhankelijkeResources).%New().Bereken()
+	Write:..Debug "    BerekenTijdenLeadingPitched",!
+
+	Do ##class(APPS.Halux.Planning.Pitching.impl.BerekenTijdenLeadingPitched).%New().Bereken()
+	
+	Write:..Debug "    BerekenTijdenLeadingNotPitched",!
+	Do ##class(APPS.Halux.Planning.Pitching.impl.BerekenTijdenLeadingNotPitched).%New().Bereken()
+
+	Write:..Debug "    BerekenTijdenAfhankelijkeResources",!
+	Do ##class(APPS.Halux.Planning.Pitching.impl.BerekenTijdenAfhankelijke).%New().Bereken()
 ]]></Implementation>
 </Method>
 
+<Method name="BuildPitchingGroupedByActiviteitAndBatch">
+<Description>
+SQL   Select * from APPS_Halux_Planning_Pitching_impl.ActiviteitPitched</Description>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Write:..Debug "Build samenvatting per activiteit en batch",!
+	
+	Do ##class(APPS.Halux.Planning.Activiteit.impl.BerekenActiviteitPerBatch).%New().Bereken()
+]]></Implementation>
+</Method>
+
 <Method name="BuildProductieOrderToResource">
 <Description>
 SQL   Select * from APPS_Halux_Planning_Resource_impl.ResourceLijn</Description>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Write:..Online "Build Productieorder to resource",!
+	Write:..Debug "Build Productieorder to resource",!
 	
 	Do ##class(APPS.Halux.Planning.Resource.impl.ConvertAll).%New().Verwerk()
 ]]></Implementation>
@@ -97,8 +109,9 @@
 <Method name="ImportCapaciteit">
 <Description>
 SQL   Select * from APPS_Halux_Planning_Capaciteit_impl.GeplandeCapaciteit</Description>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Write:..Online "Import capacteit en uurschema per resource",!
+	Write:..Debug "Import capacteit en uurschema per resource",!
 
 	Do ##class(APPS.Halux.Planning.Capaciteit.impl.ImportFromXLS).%New().ImportXLS()
 ]]></Implementation>
@@ -107,8 +120,9 @@
 <Method name="ImportResourceTijden">
 <Description>
 SQL   Select * from APPS_Halux_Planning_Resource_impl.ResourceTijd</Description>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Write:..Online "Import resource tijden per activiteit",!
+	Write:..Debug "Import resource tijden per activiteit",!
 
 	Do ##class(APPS.Halux.Planning.Resource.impl.ImportTijdenFromXLS).%New().ImportXLS()
 ]]></Implementation>
@@ -117,25 +131,45 @@
 <Method name="ImportBatchPitching">
 <Description>
 SQL   Select * from APPS_Halux_Planning_Pitching_impl.BatchPitched</Description>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Write:..Online "Import batch pitching",!
+	Write:..Debug "Import batch pitching",!
 
-	Do ##class(APPS.Halux.Planning.Pitching.impl.ImportFromXLS).%New().ImportXLS()
+	Do ##class(APPS.Halux.Planning.Pitching.impl.ImportBatchPitchedFromXLS).%New().ImportXLS()
 ]]></Implementation>
 </Method>
 
 <Method name="Lock">
+<Private>1</Private>
 <Implementation><![CDATA[
 	Lock +ResourcePitchingService:0
 	Else  Quit 0
+	Do ##class(APPS.Halux.Planning.impl.ResourceCalcMutex).Enter($zdt(..StartTijdstip,3))
 	Quit 1
 ]]></Implementation>
 </Method>
 
 <Method name="UnLock">
-<Implementation><![CDATA[	Lock -ResourcePitchingService
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ##class(APPS.Halux.Planning.impl.ResourceCalcMutex).Exit($zdt($H,3), ..GeefVolgendeStart())
+	Lock -ResourcePitchingService
 ]]></Implementation>
 </Method>
+
+<Method name="GeefVolgendeStart">
+<Implementation><![CDATA[
+	Set RefDatum=$P(..StartTijdstip,",")
+	Set RefTijd=$P(..StartTijdstip,",",2)
+	Set RefTijd=RefTijd+..#RepeatTijdBatchTaak
+	While RefTijd>86399 
+	{
+		Set RefDatum=RefDatum+1
+		Set RefTijd=RefTijd-86399
+	}
+	Quit $zdt(RefDatum_","_RefTijd,3)
+]]></Implementation>
+</Method>
 </Class>