Index: APPS/Halux/Planning/impl/Queries.cls.xml
===================================================================
diff -u -r994 -r1012
--- APPS/Halux/Planning/impl/Queries.cls.xml	(.../Queries.cls.xml)	(revision 994)
+++ APPS/Halux/Planning/impl/Queries.cls.xml	(.../Queries.cls.xml)	(revision 1012)
@@ -1,92 +1,195 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-29 13:41:10">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-04-18 16:04:07">
 <Class name="APPS.Halux.Planning.impl.Queries">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62179,49271.111348</TimeChanged>
+<TimeChanged>62199,57863.082972</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Query name="qGeefStockProblemen">
+<Type>%SQLQuery</Type>
+<FormalSpec>ToeleveringNummer:%Integer</FormalSpec>
+<SqlQuery>	SELECT * FROM APPS_Halux_Planning_impl.ProductInfo</SqlQuery>
+</Query>
+
 <Query name="qGeefPlanningOverzicht">
 <Type>%SQLQuery</Type>
 <FormalSpec>Van:%Date,Tot:%Date</FormalSpec>
 <SqlQuery><![CDATA[	SELECT CAST(TI.Gepland As DATE) As Gepland, PI.Categorie,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUFrees_VM,
-	 COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid)*PI.Aantal,0) As ALUFrees,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUOperator_VM,
-	 COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid)*PI.Aantal,0) As ALUOperator,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUZaag_VM,
-	 COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid)*PI.Aantal,0) As ALUZaag,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Bewerkingscenter_VM,
-	 COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastInpak_VM,
-	 COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid)*PI.Aantal,0) As HoekkastInpak,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastMontage_VM,
-	 COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid)*PI.Aantal,0) As HoekkastMontage,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastZaag_VM,
-	 COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid)*PI.Aantal,0) As HoekkastZaag,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Houtzaag_VM,
-	 COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid)*PI.Aantal,0) As Houtzaag,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As KartonMachine_VM,
-	 COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid)*PI.Aantal,0) As KartonMachine,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers1_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid)*PI.Aantal,0) As TBXPers1,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers2_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid)*PI.Aantal,0) As TBXPers2,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers3_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid)*PI.Aantal,0) As TBXPers3,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPicking_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid)*PI.Aantal,0) As TBXPicking,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Voormontage_VM,
-	 COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid)*PI.Aantal,0) As Voormontage
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUFrees_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal),0) As ALUFrees,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUOperator_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal),0) As ALUOperator,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal),0) As ALUZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Bewerkingscenter_VM,
+	 COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal),0) As Bewerkingscenter,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastInpak_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal),0) As HoekkastInpak,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastMontage_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal),0) As HoekkastMontage,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal),0) As HoekkastZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Houtzaag_VM,
+	 COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal),0) As Houtzaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal ELSE 0 END),0) As KartonMachine_VM,
+	 COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal),0) As KartonMachine,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers1_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal),0) As TBXPers1,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers2_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal),0) As TBXPers2,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers3_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal),0) As TBXPers3,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPicking_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal),0) As TBXPicking,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Voormontage_VM,
+	 COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal),0) As Voormontage
 	 FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
  	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON TI.ID = PI.ToeleveringInfoID
 	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON PI.ID = AI.ProductInfoID
-	 WHERE :Van < CAST(TI.Gepland As DATE) AND CAST(TI.Gepland As DATE) < :Tot
+	 WHERE :Van <= CAST(TI.Gepland As DATE) AND CAST(TI.Gepland As DATE) <= :Tot
 	 GROUP BY CAST(TI.Gepland As DATE), PI.Categorie]]></SqlQuery>
 </Query>
 
 <Query name="qGeefPlanningDetail">
 <Type>%SQLQuery</Type>
 <FormalSpec>Datum:%Date,Categorie:APPS.Halux.Planning.enu.Categorie</FormalSpec>
 <SqlQuery><![CDATA[	SELECT AI.Naam As Activiteit, AI.Fase As ActiviteitFase, PI.Categorie, CAST(TI.Gepland As DATE) As Gepland, TI.DueOut, TI.GeplandStatus, TI.IngegevenDoor, TI.IsASAP, TI.Klant, TI.ProductieStatus, TI.ToeleveringNummer, PI.Aantal, PI.ProductCode, PI.StockProbleem, PI.VerpakkingType,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUFrees_VM,
-	 COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid)*PI.Aantal,0) As ALUFrees,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUOperator_VM,
-	 COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid)*PI.Aantal,0) As ALUOperator,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As ALUZaag_VM,
-	 COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid)*PI.Aantal,0) As ALUZaag,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Bewerkingscenter_VM,
-	 COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastInpak_VM,
-	 COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid)*PI.Aantal,0) As HoekkastInpak,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastMontage_VM,
-	 COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid)*PI.Aantal,0) As HoekkastMontage,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As HoekkastZaag_VM,
-	 COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid)*PI.Aantal,0) As HoekkastZaag,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Houtzaag_VM,
-	 COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid)*PI.Aantal,0) As Houtzaag,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As KartonMachine_VM,
-	 COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid)*PI.Aantal,0) As KartonMachine,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers1_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid)*PI.Aantal,0) As TBXPers1,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers2_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid)*PI.Aantal,0) As TBXPers2,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPers3_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid)*PI.Aantal,0) As TBXPers3,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As TBXPicking_VM,
-	 COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid)*PI.Aantal,0) As TBXPicking,
-	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid ELSE 0 END)*PI.Aantal,0) As Voormontage_VM,
-	 COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid)*PI.Aantal,0) As Voormontage FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUFrees_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal),0) As ALUFrees,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUOperator_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal),0) As ALUOperator,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal),0) As ALUZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Bewerkingscenter_VM,
+	 COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal),0) As Bewerkingscenter,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastInpak_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal),0) As HoekkastInpak,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastMontage_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal),0) As HoekkastMontage,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastZaag_VM,
+	 COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal),0) As HoekkastZaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Houtzaag_VM,
+	 COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal),0) As Houtzaag,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal ELSE 0 END),0) As KartonMachine_VM,
+	 COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal),0) As KartonMachine,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers1_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal),0) As TBXPers1,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers2_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal),0) As TBXPers2,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers3_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal),0) As TBXPers3,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPicking_VM,
+	 COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal),0) As TBXPicking,
+	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Voormontage_VM,
+	 COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal),0) As Voormontage
+	 FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
 	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON TI.ID = PI.ToeleveringInfoID
 	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON PI.ID = AI.ProductInfoID
 	 WHERE CAST(TI.Gepland As DATE) = :Datum AND ((:Categorie is null) OR (PI.Categorie = :Categorie))
-	 GROUP BY CAST(TI.Gepland As DATE), AI.Naam, PI.ProductCode]]></SqlQuery>
+	 GROUP BY CAST(TI.Gepland As DATE), AI.Naam, TI.ToeleveringNummer, PI.ToeleveringLijnNr]]></SqlQuery>
 </Query>
 
+<Query name="qGeefPlanningDetailToelevering">
+<Type>%SQLQuery</Type>
+<FormalSpec>Datum:%Date,Categorie:APPS.Halux.Planning.enu.Categorie</FormalSpec>
+<SqlQuery><![CDATA[	SELECT PI.Categorie, CAST(TI.Gepland As DATE) As Gepland, TI.DueOut, TI.GeplandStatus, TI.IngegevenDoor, Max(TI.IsASAP) As IsAsap, Max(CASE WHEN StockProbleem is not null OR GeplandStatus <> 'Impliciet' THEN 1 ELSE 0 END) As IsInfoBeschikbaar, TI.Klant, TI.LeverImpact, TI.ProductieStatus, TI.ToeleveringNummer, SUM(PI.Aantal) As Aantal, PI.ProductCode, max(PI.StockProbleem) As StockProbleem, PI.VerpakkingType,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUFrees_VM,
+ 	 COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal),0) As ALUFrees,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUOperator_VM,
+ 	 COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal),0) As ALUOperator,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUZaag_VM,
+ 	 COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal),0) As ALUZaag,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Bewerkingscenter_VM,
+ 	 COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal),0) As Bewerkingscenter,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastInpak_VM,
+ 	 COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal),0) As HoekkastInpak,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastMontage_VM,
+ 	 COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal),0) As HoekkastMontage,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastZaag_VM,
+ 	 COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal),0) As HoekkastZaag,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Houtzaag_VM,
+ 	 COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal),0) As Houtzaag,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal ELSE 0 END),0) As KartonMachine_VM,
+ 	 COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal),0) As KartonMachine,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers1_VM,
+ 	 COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal),0) As TBXPers1,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers2_VM,
+ 	 COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal),0) As TBXPers2,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers3_VM,
+ 	 COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal),0) As TBXPers3,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPicking_VM,
+ 	 COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal),0) As TBXPicking,
+ 	 COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Voormontage_VM,
+ 	 COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal),0) As Voormontage
+ 	 FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
+ 	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON TI.ID = PI.ToeleveringInfoID
+ 	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON PI.ID = AI.ProductInfoID
+ 	 WHERE CAST(TI.Gepland As DATE) = :Datum AND ((:Categorie is null) OR (PI.Categorie = :Categorie))
+ 	 GROUP BY TI.ToeleveringNummer]]></SqlQuery>
+</Query>
+
+<Method name="GeefPlanningDetailVoor">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Toeleveringen:%ListOfDataTypes</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set ToeleveringIterator = ##class(TECH.ListIterator).%New(Toeleveringen)
+	Set Where = ""
+	If (ToeleveringIterator.HasNext())
+	{
+		Set Where = "WHERE TI.ToeleveringNummer = "_ToeleveringIterator.Next().GeefToeNr()
+	}
+	
+	While (ToeleveringIterator.HasNext())
+	{
+		Set Toelevering = ToeleveringIterator.Next()
+		Set Where = Where_" OR TI.ToeleveringNummer = "_Toelevering.GeefToeNr()
+	}
+	
+	Set Query = "SELECT AI.Naam As Activiteit, AI.Fase As ActiviteitFase, PI.Categorie, CAST(TI.Gepland As DATE) As Gepland, TI.DueOut, TI.GeplandStatus, TI.IngegevenDoor, TI.IsASAP, TI.Klant, TI.ProductieStatus, TI.ToeleveringNummer, PI.Aantal, PI.ProductCode, PI.StockProbleem, PI.VerpakkingType,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUFrees_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_ALUFrees_Hoeveelheid*PI.Aantal),0) As ALUFrees,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUOperator_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_ALUOperator_Hoeveelheid*PI.Aantal),0) As ALUOperator,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As ALUZaag_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_ALUZaag_Hoeveelheid*PI.Aantal),0) As ALUZaag,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Bewerkingscenter_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_Bewerkingscenter_Hoeveelheid*PI.Aantal),0) As Bewerkingscenter,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastInpak_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_HoekkastInpak_Hoeveelheid*PI.Aantal),0) As HoekkastInpak,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastMontage_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_HoekkastMontage_Hoeveelheid*PI.Aantal),0) As HoekkastMontage,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As HoekkastZaag_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_HoekkastZaag_Hoeveelheid*PI.Aantal),0) As HoekkastZaag,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Houtzaag_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_Houtzaag_Hoeveelheid*PI.Aantal),0) As Houtzaag,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal ELSE 0 END),0) As KartonMachine_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_KartonMachine_Hoeveelheid*PI.Aantal),0) As KartonMachine,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers1_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_TBXPers1_Hoeveelheid*PI.Aantal),0) As TBXPers1,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers2_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_TBXPers2_Hoeveelheid*PI.Aantal),0) As TBXPers2,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPers3_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_TBXPers3_Hoeveelheid*PI.Aantal),0) As TBXPers3,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal ELSE 0 END),0) As TBXPicking_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_TBXPicking_Hoeveelheid*PI.Aantal),0) As TBXPicking,"_
+	 "COALESCE(Sum(CASE WHEN {fn HOUR(TI.Gepland)} < 13 THEN ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal ELSE 0 END),0) As Voormontage_VM,"_
+	 "COALESCE(Sum(ResourceGebruik_Voormontage_Hoeveelheid*PI.Aantal),0) As Voormontage"_
+	 " FROM APPS_Halux_Planning_impl.ToeleveringInfo TI"_
+	 " JOIN APPS_Halux_Planning_impl.ProductInfo PI ON TI.ID = PI.ToeleveringInfoID"_
+	 " JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON PI.ID = AI.ProductInfoID"
+	Set Query = Query_" "_Where
+	Set Query = Query_" GROUP BY CAST(TI.Gepland As DATE), AI.Naam, TI.ToeleveringNummer, PI.ToeleveringLijnNr"
+	
+	Quit Query
+]]></Implementation>
+</Method>
+
 <Query name="qGeefUniekeToeleveringen">
 <Type>%SQLQuery</Type>
 <SqlQuery>	SELECT DISTINCT ToeleveringNummer FROM APPS_Halux_Planning_impl.ToeleveringInfo ORDER BY ToeleveringNummer ASC</SqlQuery>
 </Query>
 </Class>
-<Checksum value="121678320"/>
+<Checksum value="860481427"/>
 </Export>