Index: APPS/Halux/Planning/impl/Queries.cls.xml
===================================================================
diff -u -r946 -r954
--- APPS/Halux/Planning/impl/Queries.cls.xml	(.../Queries.cls.xml)	(revision 946)
+++ APPS/Halux/Planning/impl/Queries.cls.xml	(.../Queries.cls.xml)	(revision 954)
@@ -1,67 +1,43 @@
 <?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-16 13:47:21">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-25 09:44:28">
 <Class name="APPS.Halux.Planning.impl.Queries">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62166,49720.597406</TimeChanged>
+<TimeChanged>62175,35155.092653</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Query name="qGeefPlanningOverzicht">
 <Type>%SQLQuery</Type>
 <FormalSpec>Van:%Date,Tot:%Date</FormalSpec>
-<SqlQuery><![CDATA[	SELECT
-	 Sum(ALUFrees) As ALUFrees,
-	 Sum(ALUOperator) As ALUOperator,
-	 Sum(ALUZaag) As ALUZaag,
-	 Sum(CorpusMontageVerpakken) As CorpusMontageVerpakken,
-	 Sum(CorpusVoorbereiding) As CorpusVoorbereiding,
-	 Sum(KartonMachine) As KartonMachine,
-	 Sum(TBXBoxpressKeller) As TBXBoxpressKeller,
-	 Sum(TBXBoxpressLijn1) As TBXBoxpressLijn1,
-	 Sum(TBXBoxpressLijn2) As TBXBoxpressLijn2,
-	 Sum(TBXSpecialsMontage) As TBXSpecialsMontage,
-	 Sum(TBXVoormontage) As TBXVoormontage,
-	 Sum(TBXZaag) As TBXZaag,
-	 CAST(TO_DATE(Gepland,'YYYY-MM-DD') As Date) As Datum
-	 
-	 FROM APPS_Halux_Planning_impl.PlanningDataItem
-	 WHERE TO_Date(:Van,'YYYY-MM-DD') < Gepland AND Gepland < TO_Date(:Tot,'YYYY-MM-DD')
-	 GROUP BY TO_DATE(Gepland,'YYYY-MM-DD')]]></SqlQuery>
+<SqlQuery><![CDATA[	SELECT PI.Categorie, TI.Dag, COALESCE(Sum(ALUFrees->Hoeveelheid)*PI.Aantal,0) As ALUFrees, COALESCE(Sum(ALUOperator->Hoeveelheid)*PI.Aantal,0) As ALUOperator, COALESCE(Sum(ALUZaag->Hoeveelheid)*PI.Aantal,0) As ALUZaag, COALESCE(Sum(Bewerkingscenter->Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter, COALESCE(Sum(HoekkastInpak->Hoeveelheid)*PI.Aantal,0) As HoekkastInpak, COALESCE(Sum(HoekkastMontage->Hoeveelheid)*PI.Aantal,0) As HoekkastMontage, COALESCE(Sum(HoekkastZaag->Hoeveelheid)*PI.Aantal,0) As HoekkastZaag, COALESCE(Sum(Houtzaag->Hoeveelheid)*PI.Aantal,0) As Houtzaag, COALESCE(Sum(KartonMachine->Hoeveelheid)*PI.Aantal,0) As KartonMachine, COALESCE(Sum(TBXPers1->Hoeveelheid)*PI.Aantal,0) As TBXPers1, COALESCE(Sum(TBXPers2->Hoeveelheid)*PI.Aantal,0) As TBXPers2, COALESCE(Sum(TBXPers3->Hoeveelheid)*PI.Aantal,0) As TBXPers3, COALESCE(Sum(TBXPicking->Hoeveelheid)*PI.Aantal,0) As TBXPicking, COALESCE(Sum(Voormontage->Hoeveelheid)*PI.Aantal,0) As Voormontage
+	 FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
+	 JOIN APPS_Halux_Planning_impl.ToeleveringInfo_ProductInfoLijst PIL ON TI.ID = PIL.ToeleveringInfo
+	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON PI.ID = PIL.ProductInfoLijst
+	 JOIN APPS_Halux_Planning_impl.ProductInfo_ActiviteitInfoLijst AIL ON PI.ID = AIL.ProductInfo
+	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON AI.ID = AIL.ActiviteitInfoLijst
+	 JOIN APPS_Halux_Planning_impl.ResourceGebruik RG ON AI.ResourceGebruik = RG.ID
+	 WHERE :Van < TI.Dag AND TI.Dag < :Tot
+	 GROUP BY TI.Dag]]></SqlQuery>
 </Query>
 
 <Query name="qGeefPlanningDetail">
 <Type>%SQLQuery</Type>
 <FormalSpec>Datum:%Date,Categorie:APPS.Halux.Planning.enu.Categorie</FormalSpec>
-<SqlQuery>	SELECT
-	 ToeleveringsNummer,
-	 IsASAP,
-	 Categorie,
-	 DueOut,
-	 Klant,
-	 IngegevenDoor,
-	 CASE WHEN DueOut = Gepland THEN 0 ELSE 1 END As IsExplicietGepland,
- 	 ALUFrees,
- 	 ALUOperator,
- 	 ALUZaag,
- 	 CorpusMontageVerpakken,
- 	 CorpusVoorbereiding,
- 	 KartonMachine,
- 	 TBXBoxpressKeller,
- 	 TBXBoxpressLijn1,
- 	 TBXBoxpressLijn2,
- 	 TBXSpecialsMontage,
- 	 TBXVoormontage,
- 	 TBXZaag,
- 	 CAST(TO_DATE(Gepland,'YYYY-MM-DD') As Date) As Datum
- 	 
- 	 FROM APPS_Halux_Planning_impl.PlanningDataItem
- 	 WHERE TO_DATE(Gepland,'YYYY-MM-DD') = TO_Date(:Datum,'YYYY-MM-DD')</SqlQuery>
+<SqlQuery><![CDATA[	SELECT AI.Naam As Activiteit, AI.Fase As ActiviteitFase, PI.Categorie, TI.Dag, TI.DueOut, TI.GeplandStatus, TI.IngegevenDoor, TI.IsASAP, TI.Klant, TI.ProductieStatus, TI.ToeleveringNummer, PI.Aantal, PI.ProductCode, PI.StockProbleem, COALESCE(Sum(ALUFrees->Hoeveelheid)*PI.Aantal,0) As ALUFrees, COALESCE(Sum(ALUOperator->Hoeveelheid)*PI.Aantal,0) As ALUOperator, COALESCE(Sum(ALUZaag->Hoeveelheid)*PI.Aantal,0) As ALUZaag, COALESCE(Sum(Bewerkingscenter->Hoeveelheid)*PI.Aantal,0) As Bewerkingscenter, COALESCE(Sum(HoekkastInpak->Hoeveelheid)*PI.Aantal,0) As HoekkastInpak, COALESCE(Sum(HoekkastMontage->Hoeveelheid)*PI.Aantal,0) As HoekkastMontage, COALESCE(Sum(HoekkastZaag->Hoeveelheid)*PI.Aantal,0) As HoekkastZaag, COALESCE(Sum(Houtzaag->Hoeveelheid)*PI.Aantal,0) As Houtzaag, COALESCE(Sum(KartonMachine->Hoeveelheid)*PI.Aantal,0) As KartonMachine, COALESCE(Sum(TBXPers1->Hoeveelheid)*PI.Aantal,0) As TBXPers1, COALESCE(Sum(TBXPers2->Hoeveelheid)*PI.Aantal,0) As TBXPers2, COALESCE(Sum(TBXPers3->Hoeveelheid)*PI.Aantal,0) As TBXPers3, COALESCE(Sum(TBXPicking->Hoeveelheid)*PI.Aantal,0) As TBXPicking, COALESCE(Sum(Voormontage->Hoeveelheid)*PI.Aantal,0) As Voormontage
+	 FROM APPS_Halux_Planning_impl.ToeleveringInfo TI
+	 JOIN APPS_Halux_Planning_impl.ToeleveringInfo_ProductInfoLijst PIL ON TI.ID = PIL.ToeleveringInfo
+	 JOIN APPS_Halux_Planning_impl.ProductInfo PI ON PI.ID = PIL.ProductInfoLijst
+	 JOIN APPS_Halux_Planning_impl.ProductInfo_ActiviteitInfoLijst AIL ON PI.ID = AIL.ProductInfo
+	 JOIN APPS_Halux_Planning_impl.ActiviteitInfo AI ON AI.ID = AIL.ActiviteitInfoLijst
+	 JOIN APPS_Halux_Planning_impl.ResourceGebruik RG ON AI.ResourceGebruik = RG.ID
+	 WHERE TI.Dag = :Datum AND ((:Categorie is null) OR (PI.Categorie = :Categorie))
+	 GROUP BY TI.Dag, AI.Naam, PI.ProductCode]]></SqlQuery>
 </Query>
 
 <Query name="qGeefUniekeToeleveringen">
 <Type>%SQLQuery</Type>
-<SqlQuery>	SELECT DISTINCT ToeleveringsNummer FROM APPS_Halux_Planning_impl.PlanningDataItem ORDER BY ToeleveringsNummer ASC</SqlQuery>
+<SqlQuery>	SELECT DISTINCT ToeleveringNummer FROM APPS_Halux_Planning_impl.ToeleveringInfo ORDER BY ToeleveringNummer ASC</SqlQuery>
 </Query>
 </Class>
-<Checksum value="2349690320"/>
+<Checksum value="940421098"/>
 </Export>