Index: APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml
===================================================================
diff -u -r31826 -r31827
--- APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 31826)
+++ APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 31827)
@@ -1,20 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.BD.OrderStat.impl.Extract2IntakeEnGeleverd">
-<Description>
-Maandrapport van de orderintake en facturatie</Description>
+<ClassType/>
+<CompileAfter>APPS.BD.OrderStat.impl.OrderIntake,APPS.BD.OrderStat.impl.OrderGeleverd</CompileAfter>
 <IncludeCode>vhLib.Macro,BL.Derde.KlantSpecifiek</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 
-<Property name="Datum">
+<Property name="VanDatum">
 <Type>%Date</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="TotDatum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BONNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FAKNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MinDatum">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Node">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ORDNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KLNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderVerwerker">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderDatum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderTijd">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="IntakeType">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FromType">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LeverDatum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Verzendwijze">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PickDatum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PickTijd">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<Description>
-D ##class(APPS.BD.OrderStat.impl.Extract2Statistiek).%New().Extract()</Description>
-<FormalSpec>Datum</FormalSpec>
+<FormalSpec>Van:%Date,Tot:%Date</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -29,11 +108,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Rebuild">
+<Method name="BouwEnFile">
 <Description>
-D ##class(APPS.BD.OrderStat.impl.Extract2Statistiek).Rebuild($H-10,+$H)</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>DatumFrom:%Date,DatumTo:%Date</FormalSpec>
+	D ##class(APPS.BD.OrderStat.impl.Extract2IntakeEnGeleverd).%New().BouwEnFile()</Description>
 <Implementation><![CDATA[
 	Do ..HerbouwenOrders()
 	Do ##class(OrderGeleverd).Export2File()
@@ -61,92 +138,203 @@
 	Set ..KLNr=$O(^KFA1(..Node,""))
 	While ..KLNr'=""
 	{
-		Set bl=..%New(Datum)
-		Do bl.Extract()
+		Set ..MinDatum=$O(^KFA1(..Node,..KLNr,""))
+		;w !,"KLNr",..KLNr
+		;w " mindatum",..MinDatum," ",-..VanDatum
+		
+		While ..MinDatum'>(-..VanDatum)
+		{
+			;w !," mindatum",..MinDatum
+	 		Set ..FAKNr=$O(^KFA1(..Node,..KLNr,..MinDatum,""))
+	 		While ..FAKNr'="" 
+	 		{
+			;w !,"  Faktuur",..MinDatum," ",..FAKNr
+				Do ..HerbouwOrderVanuitKFALijnen()
+		 		Set ..FAKNr=$O(^KFA1(..Node,..KLNr,..MinDatum,..FAKNr))	
+	 		}
+	 		Set ..MinDatum=$O(^KFA1(..Node,..KLNr,..MinDatum))
+		}
+		Set ..KLNr=$O(^KFA1(..Node,..KLNr))
+	 }
+]]></Implementation>
+</Method>
+
+<Method name="HerbouwOrderVanuitKFALijnen">
+<Implementation><![CDATA[
+	Set BONNr=$O(^KFA(..Node,..FAKNr,"U"))
+	While $E(BONNr)="U"
+	{
+		Set ..BONNr=$E(BONNr,2,99)
+		Do ..ExtractLeverDatum(^KFA(..Node,..FAKNr,BONNr,1))
+		Set LNr=$O(^KFA(..Node,..FAKNr,BONNr,99))
+		While LNr
+		{
+			Set Rec=^KFA(..Node,..FAKNr,BONNr,LNr)
+			;w !,"   bonnr",$P(Rec,"\",17)
+			If $P($P(Rec,"\",17),"#")="KF5"
+			{
+	 			Do ..ExtractHoofdingUitKUL(Rec)
+			}
+			ElseIf $P(Rec,"\",2)?4.7N 
+			{
+				Set PRNr=$P(Rec,"\",2)
+				Set Qty=$P(Rec,"\",3)
+				Set BevestigdeLeverDatum=$P(Rec,"\",25)
+				Set VerwachteLeverDatum=$P(Rec,"\",29)
+				Set OmzetVerkoop=$P(Rec,"\",34)
+				Set OmzetAankoop=$P(Rec,"\",33)
+				Do ..AddIntake(PRNr,Qty,OmzetVerkoop,OmzetAankoop)
+				Do ..AddGeleverd(PRNr,Qty,BevestigdeLeverDatum,VerwachteLeverDatum,OmzetVerkoop,OmzetAankoop)
+			}
+			Set LNr=$O(^KFA(..Node,..FAKNr,BONNr,LNr))
+		}
+		Set BONNr=$O(^KFA(..Node,..FAKNr,BONNr))
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="Extract">
+<Method name="HerbouwenOrdersVanuitKFAP">
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(APPS.BD.OrderStat.impl.Extract2IntakeEnGeleverd).%New(..Datum,..Datum).HerbouwenOrders()
-	Do ##class(OrderStatistiek).VerwijderDatum(..Datum)
-	Do ..ExtractIntake()
-	Do ..ExtractGeleverd()
-	Do:..Datum=+$H ..ExtractPortefeuille()
+	Set ..FromType="P"
+	Set ..Node="F"
+	Set ..KLNr=$O(^KFAP1(..Node,""))
+	While ..KLNr'=""
+	{
+		Set ..MinDatum=$O(^KFAP1(..Node,..KLNr,""))
+		While ..MinDatum'>(-..VanDatum)
+		{
+	 		Set ..FAKNr=$O(^KFAP1(..Node,..KLNr,..MinDatum,""))
+	 		While ..FAKNr'="" 
+	 		{
+				Do ..HerbouwOrderVanuitKFALijnen()
+		 		Set ..FAKNr=$O(^KFAP1(..Node,..KLNr,..MinDatum,..FAKNr))	
+	 		}
+	 		Set ..MinDatum=$O(^KFAP1(..Node,..KLNr,..MinDatum))
+		}
+		Set ..KLNr=$O(^KFAP1(..Node,..KLNr))
+	 }
 ]]></Implementation>
 </Method>
 
-<Query name="OrderIntake">
-<Type>%SQLQuery</Type>
-<FormalSpec>Datum</FormalSpec>
-<SqlQuery><![CDATA[	Select isnull(Klant->Sektor,0) as Regio, isnull(Product->ProductGroep,'REST') as ProductGroep,sum(AantalLijnen) as AantalLijnen,sum(OmzetVerkoop) as OmzetVerkoop ,sum(OmzetAankoop) as OmzetAankoop
-	from APPS_BD_OrderStat_impl.OrderIntake 
-	where OrderDatum=:Datum
-	group by isnull(Klant->Sektor,0),isnull(Product->ProductGroep,'REST')]]></SqlQuery>
-</Query>
+<Method name="HerbouwOrderVanuitKFAPLijnen">
+<Implementation><![CDATA[
+	Set BONNr=$O(^KFAP(..Node,..FAKNr,"U"))
+	While $E(BONNr)="U"
+	{
+		Set ..BONNr=$E(BONNr,2,99)
+		Do ..ExtractLeverDatum(^KFAP(..Node,..FAKNr,BONNr,1))
 
-<Query name="OrderGeleverd">
-<Type>%SQLQuery</Type>
-<FormalSpec>Datum</FormalSpec>
-<SqlQuery><![CDATA[	Select isnull(Klant->Sektor,0) as Regio, isnull(Product->ProductGroep,'REST') as ProductGroep,sum(AantalLijnen) as AantalLijnen,sum(OmzetVerkoop) as OmzetVerkoop ,sum(OmzetAankoop) as OmzetAankoop
-	from APPS_BD_OrderStat_impl.OrderGeleverd 
-	where PickDatum=:Datum
-	group by isnull(Klant->Sektor,0),isnull(Product->ProductGroep,'REST')]]></SqlQuery>
-</Query>
+		Set LNr=$O(^KFAP(..Node,..FAKNr,BONNr,99))
+		While LNr
+		{
+			Set Rec=^KFAP(..Node,..FAKNr,BONNr,LNr)
+			If $P($P(Rec,"\",17),"#")="KF5"
+			{
+	 			Do ..ExtractHoofdingUitKUL(Rec)
+			}
+			ElseIf $P(Rec,"\",2)?4.7N 
+			{
+				Set PRNr=$P(Rec,"\",2)
+				Set Qty=$P(Rec,"\",3)
+				Set BevestigdeLeverDatum=$P(Rec,"\",25)
+				Set VerwachteLeverDatum=$P(Rec,"\",29)
+				Set OmzetVerkoop=$P(Rec,"\",34)
+				Set OmzetAankoop=$P(Rec,"\",33)
+				Do ..AddIntake(PRNr,Qty,OmzetVerkoop,OmzetAankoop)
+				Do ..AddGeleverd(PRNr,Qty,BevestigdeLeverDatum,VerwachteLeverDatum,OmzetVerkoop,OmzetAankoop)
+			}
+			Set LNr=$O(^KFAP(..Node,..FAKNr,BONNr,LNr))
+		}
+		Set BONNr=$O(^KFAP(..Node,..FAKNr,BONNr))
+	}
+]]></Implementation>
+</Method>
 
-<Query name="OrderPortefeuille">
-<Type>%SQLQuery</Type>
-<SqlQuery><![CDATA[	Select isnull(L.Klant->Sektor,0) as Regio,Product,count(*) as AantalLijnen, sum(Aantal) as AantalStuks,sum(Netto) as OmzetVerkoop 
-	from Flow_Order.Lijn as L,Flow_Order.Hoofding as H 
-	where H.OrderNr=L.OrderNr and H.Klant=L.Klant 
-	and case isnull(H.OrderType,'STD') when 'P' then 0 when 'M' then 0  when 'C' then 0 else 1 end=1 
-	group by isnull(L.Klant->sektor,0),Product]]></SqlQuery>
-</Query>
-
-<Method name="ExtractIntake">
-<Private>1</Private>
+<Method name="HerbouwenOrdersVanuitKUL">
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set rs=##class(%ResultSet).%New()
-	Set rs.ClassName=..%ClassName(1)
-	Set rs.QueryName="OrderIntake"
-	Set sc=rs.Execute(..Datum)
-	While rs.Next()
-	{ 
-		Set Regio=+rs.Data("Regio")
-		Set ProductGroep=..ControleProductGroep(rs.Data("ProductGroep"))
-		Set AantalLijnen=rs.Data("AantalLijnen")
+	Set ..FAKNr=""
+	Set ..KLNr=$O(^KUL(0))
+	While ..KLNr'=""
+	{
+		Set ..Node=$O(^KUL(..KLNr,""))
+		While ..Node="F"
+		{
+			Set ..FromType=$S(..Node="F":"U",1:"F") ; in levering of reeds gefactureerd
+	 		Set ..BONNr=$O(^KUL(..KLNr,..Node,""))
+	 		While ..BONNr'="" 
+	 		{
+				Do ..HerbouwOrderVanuitKULLijnen()
+		 		Set ..BONNr=$O(^KUL(..KLNr,..Node,..BONNr))	
+	 		}
+	 		Set ..Node=$O(^KUL(..KLNr,..Node))
+		}
+		Set ..KLNr=$O(^KUL(..KLNr))
+	 }
+]]></Implementation>
+</Method>
 
-		Set Statistiek=##class(OrderStatistiek).Open(..Datum, Regio, ProductGroep)
-		Do Statistiek.AddIntake(rs.Data("AantalLijnen"),rs.Data("OmzetVerkoop"),rs.Data("OmzetAankoop"))
-		Do Statistiek.Save()
+<Method name="HerbouwOrderVanuitKULLijnen">
+<Implementation><![CDATA[
+	Do ..ExtractLeverDatum(^KUL(..KLNr,..Node,..BONNr,1))
+	Set LNr=$O(^KUL(..KLNr,..Node,..BONNr,100))
+	While LNr
+	{
+		Set Rec=^KUL(..KLNr,..Node,..BONNr,LNr)
+		If $P(Rec,"\",17)="KF5"
+		{
+ 			Do ..ExtractHoofdingUitKUL(Rec)
+		}
+		ElseIf $P(Rec,"\",2)?4.7N 
+		{
+			Set PRNr=$P(Rec,"\",2)
+			Set Qty=$P(Rec,"\",3)
+			Set BevestigdeLeverDatum=$P(Rec,"\",25)
+			Set VerwachteLeverDatum=$P(Rec,"\",29)
+ 			Set OmzetVerkoop=$P(Rec,"\",9)
+ 			Set OmzetAankoop=..CifPPL(PRNr)*Qty
+ 			Do ..AddIntake(PRNr,Qty,OmzetVerkoop,OmzetAankoop)
+			Do ..AddGeleverd(PRNr,Qty,BevestigdeLeverDatum,VerwachteLeverDatum,OmzetVerkoop,OmzetAankoop)
+		}
+		Set LNr=$O(^KUL(..KLNr,..Node,..BONNr,LNr))
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="ExtractGeleverd">
-<Private>1</Private>
+<Method name="ExtractLeverDatum">
+<FormalSpec>Rec</FormalSpec>
 <Implementation><![CDATA[
-	Set rs=##class(%ResultSet).%New()
-	Set rs.ClassName=..%ClassName(1)
-	Set rs.QueryName="OrderGeleverd"
-	Set sc=rs.Execute(..Datum)
-	While rs.Next()
+	Set ..LeverDatum=$$INTDATE^vhLib.DataTypes($P(Rec,"\",2),"DKP")
+	Set ..Verzendwijze=$P($P($P(Rec,"\",7),"#",1)," ")
+	
+	Set PickTijdstip=$P($G(^ORDW("D",..BONNr)),"\",19)
+	If PickTijdstip&&(..LeverDatum>($H-90))
 	{ 
-		Set Regio=+rs.Data("Regio")
-		Set ProductGroep=..ControleProductGroep(rs.Data("ProductGroep"))
-		Set AantalLijnen=rs.Data("AantalLijnen")
-
-		Set Statistiek=##class(OrderStatistiek).Open(..Datum,Regio, ProductGroep)
-		Do Statistiek.AddGeleverd(rs.Data("AantalLijnen"),rs.Data("OmzetVerkoop"),rs.Data("OmzetAankoop"))
-		Do Statistiek.Save()
+		Set ..PickDatum=$P(PickTijdstip,",",1)
+		Set ..PickTijd=$P(PickTijdstip,",",2)
 	}
+	Else ; raming
+	{
+		; kan nog verbeterd worden door de berekening dmv de verzendwijze
+		Set ..PickDatum=$$CALCDATE^vhLib.DataTypes(..LeverDatum,"A",-1)
+		Set ..PickTijd=$$INTTIME^vhLib.DataTypes("17:00")
+	}
 ]]></Implementation>
 </Method>
 
-<Method name="ExtractPortefeuille">
-<Private>1</Private>
+<Method name="ExtractHoofdingUitKUL">
+<FormalSpec>Rec</FormalSpec>
 <Implementation><![CDATA[
+	Set ..OrderVerwerker=$P($P(Rec,"\",4),"#")
+	Set ..ORDNr=$P($P(Rec,"\",5)," - ")
+	Set OrderIntakeRec=$P(Rec,"\",19)
+	Set:'..OrderVerwerker ..OrderVerwerker=$P(OrderIntakeRec,"#",1)
+	Set ..OrderDatum=$P($P(OrderIntakeRec,"#",2),",")
+	If ..OrderDatum="" 
+	{
+ 		Set ..OrderDatum=$$INTDATE^vhLib.DataTypes($P($P(Rec,"\",5)," - ",2),"DK")
+	}	
 
 	Set ..OrderTijd=$P($P(OrderIntakeRec,"#",2),",",2)
 	
@@ -170,22 +358,30 @@
 	 	Set ..ORDNr=$O(^KOD(..KLNr,..Node,""))
 		While ..ORDNr'=""
 		{
-			Set ProductGroep=..ControleProductGroep(##class(Prod.Product).GetPropViaNr(PRNr,"ProductGroep"))
-			Set AantalLijnen=rs.Data("AantalLijnen")
-			Set OmzetAankoop=rs.Data("AantalStuks")*##class(Extract2IntakeEnGeleverd).CifPPL(PRNr)
-		
-			Set Statistiek=##class(OrderStatistiek).Open(..Datum,Regio, ProductGroep)
-			Do Statistiek.AddPortefeuille(rs.Data("AantalLijnen"),rs.Data("OmzetVerkoop"),OmzetAankoop)
-			Do Statistiek.Save()
-		}
+			Do ..HerbouwOrderVanuitKODLijnen()
+		 	Set ..ORDNr=$O(^KOD(..KLNr,..Node,..ORDNr))
+	 	}
+	 	Set ..KLNr=$O(^KOD(..KLNr))
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="ControleProductGroep">
-<FormalSpec>ProductGroep</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[	Quit $S(ProductGroep="":"REST",1:ProductGroep)
+<Method name="HerbouwOrderVanuitKODLijnen">
+<Implementation><![CDATA[
+	Set ..FromType="O"
+	Do ..ExtractHoofdingUitKOD(^KOD(..KLNr,..Node,..ORDNr,1))
+	
+	Set LNr=$O(^KOD(..KLNr,..Node,..ORDNr,100))
+ 	While LNr'=""
+	{
+		Set Rec=^KOD(..KLNr,..Node,..ORDNr,LNr)
+ 		Set PRNr=$P(Rec,"\",2)
+ 		Set Qty=$P(Rec,"\",3)
+ 		Set OmzetVerkoop=$P(Rec,"\",9)
+ 		Set OmzetAankoop=..CifPPL(PRNr)*Qty
+ 		Do ..AddIntake(PRNr,Qty,OmzetVerkoop,OmzetAankoop)
+		Set LNr=$O(^KOD(..KLNr,..Node,..ORDNr,LNr))
+	}
 ]]></Implementation>
 </Method>
 
@@ -263,4 +459,5 @@
 </Class>
 
 
+<Package name="APPS.BD.OrderStat.impl" sqlname="APPS_BD_OrderStat_impl"/>
 </Export>