Index: APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml
===================================================================
diff -u -r29059 -r31826
--- APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 29059)
+++ APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 31826)
@@ -19,7 +19,12 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Datum=$G(Datum,+$H)
+	Set ..VanDatum=+$G(Van)
+	Set ..TotDatum=+$G(Tot)
+	Set:..VanDatum=0 ..VanDatum=$$CALCDATE^vhLib.DataTypes($H,"BJ",-1,"FD")
+	Set:..TotDatum=0 ..TotDatum=$$CALCDATE^vhLib.DataTypes($H,"BJ",-1,"LD")
+	;Set:..TotDatum=0 ..TotDatum=+$H-1 ;$$CALCDATE^vhLib.DataTypes($H,"M",0,"LD")
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -30,7 +35,31 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>DatumFrom:%Date,DatumTo:%Date</FormalSpec>
 <Implementation><![CDATA[
-	For Datum=DatumFrom:1:DatumTo 
+	Do ..HerbouwenOrders()
+	Do ##class(OrderGeleverd).Export2File()
+	Do ##class(OrderIntake).Export2File()
+]]></Implementation>
+</Method>
+
+<Method name="HerbouwenOrders">
+<Implementation><![CDATA[
+	Do ##class(OrderIntake).DeleteAll()
+	Do ##class(OrderGeleverd).DeleteAll()
+
+	Do ..HerbouwenOrdersVanuitKFA()
+	Do ..HerbouwenOrdersVanuitKFAP()
+	Do ..HerbouwenOrdersVanuitKUL()
+	Do ..HerbouwenOrdersVanuitKOD()
+]]></Implementation>
+</Method>
+
+<Method name="HerbouwenOrdersVanuitKFA">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..FromType="F"
+	Set ..Node="F"
+	Set ..KLNr=$O(^KFA1(..Node,""))
+	While ..KLNr'=""
 	{
 		Set bl=..%New(Datum)
 		Do bl.Extract()
@@ -119,15 +148,27 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 
-	Set rs=##class(%ResultSet).%New()
-	Set rs.ClassName=..%ClassName(1)
-	Set rs.QueryName="OrderPortefeuille"
-	Set sc=rs.Execute()
-	While rs.Next()
-	{  
-		Set Regio=+rs.Data("Regio")
-		Set PRNr=rs.Data("Product")
-		If ##class(Extract2IntakeEnGeleverd).ExistProduct(PRNr)
+	Set ..OrderTijd=$P($P(OrderIntakeRec,"#",2),",",2)
+	
+	Set EDIRef=$P(Rec,"\",21)
+	If (EDIRef'?4.9N)&&(..KLNr=$$$KlantKeller)&&($P(Rec,"\",5)["EDI") ; Keller
+ 	{
+ 		Set EDIRef=$P($P(Rec,"\",5),"EDI",2)
+ 		Set EDIRef=$P($P(EDIRef,"."),"/")
+ 		Set EDIRef=$$TRIMN^vhRtn1(EDIRef)
+ 	}
+ 	Set ..IntakeType=$S(EDIRef'="":"EDI",1:"")
+]]></Implementation>
+</Method>
+
+<Method name="HerbouwenOrdersVanuitKOD">
+<Implementation><![CDATA[
+	Set ..KLNr=$O(^KOD(0))
+	While ..KLNr'=""
+	{
+	 	Set ..Node="F"
+	 	Set ..ORDNr=$O(^KOD(..KLNr,..Node,""))
+		While ..ORDNr'=""
 		{
 			Set ProductGroep=..ControleProductGroep(##class(Prod.Product).GetPropViaNr(PRNr,"ProductGroep"))
 			Set AantalLijnen=rs.Data("AantalLijnen")
@@ -147,6 +188,78 @@
 <Implementation><![CDATA[	Quit $S(ProductGroep="":"REST",1:ProductGroep)
 ]]></Implementation>
 </Method>
+
+<Method name="ExtractHoofdingUitKOD">
+<FormalSpec>Rec</FormalSpec>
+<Implementation><![CDATA[
+	Set OrderIntakeRec=$P(Rec,"\",24)
+	Set ..OrderVerwerker=$P($P(Rec,"\",8),"#")
+	Set:..OrderVerwerker="" ..OrderVerwerker=$P(OrderIntakeRec,"#",1)
+	Set ..OrderDatum=$P($P(OrderIntakeRec,"#",2),",")
+	If ..OrderDatum="" 
+	{
+ 		Set ..OrderDatum=$$INTDATE^vhLib.DataTypes($P(Rec,"\",2),"DK")
+	}	
+	Set ..OrderTijd=$P($P(OrderIntakeRec,"#",2),",",2)
+	Set EDIRef=$P(Rec,"\",40)
+	If (EDIRef'?4.9N)&&(..KLNr=$$$KlantKeller)&&($P(Rec,"\",5)["EDI")
+	{
+		Set EDIRef=$P($P(Rec,"\",3),"EDI",2)
+		Set EDIRef=$P($P(EDIRef,"."),"/")
+		Set EDIRef=$$TRIMN^vhRtn1(EDIRef)
+	}
+ 	Set ..IntakeType=$S(EDIRef'="":"EDI",1:"")
+]]></Implementation>
+</Method>
+
+<Method name="AddIntake">
+<FormalSpec>PRNr:%Integer,Qty:%Integer,OmzetVerkoop:%Float,OmzetAankoop:%Float</FormalSpec>
+<Implementation><![CDATA[
+  
+	Quit:'..ExistProduct(PRNr)
+	Quit:'..CheckDatum(..OrderDatum)
+	
+	Set OrderIntake=##class(OrderIntake).Add(..FromType,..KLNr,..ORDNr,..OrderDatum,..OrderTijd,..IntakeType,..OrderVerwerker,PRNr,Qty,OmzetVerkoop,OmzetAankoop)
+]]></Implementation>
+</Method>
+
+<Method name="AddGeleverd">
+<FormalSpec>PRNr:%Integer,Qty:%Integer,BevestigdeLeverDatum:%Date,VerwachteLeverDatum:%Date,OmzetVerkoop:%Float,OmzetAankoop:%Float</FormalSpec>
+<Implementation><![CDATA[
+	
+	Quit:'..ExistProduct(PRNr)
+	Quit:'..CheckDatum(..PickDatum)
+	
+	Set OrderInLevering=##class(OrderGeleverd).Add(..FromType,..KLNr,..ORDNr,..OrderDatum,..OrderTijd,..IntakeType,..OrderVerwerker,..BONNr,..LeverDatum,..Verzendwijze,..PickDatum,..PickTijd,PRNr,Qty,BevestigdeLeverDatum,VerwachteLeverDatum,OmzetVerkoop,OmzetAankoop)
+]]></Implementation>
+</Method>
+
+<Method name="ExistProduct">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNr</FormalSpec>
+<Implementation><![CDATA[
+	Quit:PRNr'?4.8N 0
+	Quit:'$D(^KPR(PRNr)) 0
+	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="CifPPL">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNr</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Quit:'..ExistProduct(PRNr) 0
+	Set D="\"
+	Quit $P($$PRIJSGEG^KPRIJS(PRNr,.NoSa),D,6)
+]]></Implementation>
+</Method>
+
+<Method name="CheckDatum">
+<FormalSpec>Datum</FormalSpec>
+<Implementation><![CDATA[	Quit (Datum'<..VanDatum)&&(Datum'>..TotDatum)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/BD/OrderStat/impl/OrderGeleverd.cls.xml
===================================================================
diff -u -r29059 -r31826
--- APPS/BD/OrderStat/impl/OrderGeleverd.cls.xml	(.../OrderGeleverd.cls.xml)	(revision 29059)
+++ APPS/BD/OrderStat/impl/OrderGeleverd.cls.xml	(.../OrderGeleverd.cls.xml)	(revision 31826)
@@ -81,7 +81,8 @@
 
 <Query name="SelectAll">
 <Type>%SQLQuery</Type>
-<SqlQuery>	Select * from APPS_BD_OrderStat_impl.OrderGeleverd</SqlQuery>
+<SqlQuery><![CDATA[	Select *,Klant->LandCode,Klant->Divisie,Klant->SubDivisie,Klant->Sektor from APPS_BD_OrderStat_impl.OrderGeleverd t
+	join (select PickDatum,BONNr ,1/sum(Aantallijnen) from APPS_BD_OrderStat_impl.OrderGeleverd group by BONNr) g on g.PickDatum=t.PickDatum and g.BONNr=t.BONNr]]></SqlQuery>
 </Query>
 
 <Method name="Export2File">
@@ -106,9 +107,9 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>FromType:%String,KLNr:%Integer,ORDNr:%Integer,OrderDatum:%Date,OrderTijd:%Time,IntakeType:%String,OrderVerwerker:%String,BONNr:%Integer,LeverDatum:%Date,Verzendwijze:%String,PickDatum:%Date,PickTijd:%Time,PRNr:%Integer,Qty:%Integer,OmzetVerkoop:%Float,OmzetAankoop:%Float</FormalSpec>
 <Implementation><![CDATA[
-	If ##class(OrderGeleverd).%ExistsId(PickDatum_"||"_ORDNr_"||"_BONNr_"||"_PRNr)
+	If ##class(OrderGeleverd).%ExistsId(PickDatum_"||"_BONNr_"||"_ORDNr_"||"_PRNr)
 	{
-		 Set OrderDtl=##class(OrderGeleverd).%OpenId(PickDatum_"||"_ORDNr_"||"_BONNr_"||"_PRNr)
+		 Set OrderDtl=##class(OrderGeleverd).%OpenId(PickDatum_"||"_BONNr_"||"_ORDNr_"||"_PRNr)
 	}
 	Else
 	{
@@ -117,6 +118,10 @@
 		Set OrderDtl.OrderTijd=OrderTijd
 		Set OrderDtl.ORDNr=ORDNr
 		Set OrderDtl.BONNr=BONNr
+		If BevestigdeLeverDatum["/" Set BevestigdeLeverDatum=$$INTDATE^vhLib.DataTypes(BevestigdeLeverDatum,"DW")
+		Set OrderDtl.BevestigdeLeverDatum=BevestigdeLeverDatum
+		If VerwachteLeverDatum["/" Set VerwachteLeverDatum=$$INTDATE^vhLib.DataTypes(VerwachteLeverDatum,"DW")
+		Set OrderDtl.VerwachteLeverDatum=VerwachteLeverDatum
 		Set OrderDtl.Verzendwijze=Verzendwijze
 		Set OrderDtl.LeverDatum=LeverDatum
 		Set OrderDtl.PickDatum=PickDatum
@@ -147,7 +152,7 @@
 <Index name="PrimeKey">
 <IdKey>1</IdKey>
 <PrimaryKey>1</PrimaryKey>
-<Properties>PickDatum,ORDNr,BONNr,Product</Properties>
+<Properties>PickDatum,BONNr,ORDNr,Product</Properties>
 <Unique>1</Unique>
 </Index>
 
Index: APPS/BD/OrderStat/impl/OrderIntake.cls.xml
===================================================================
diff -u -r29059 -r31826
--- APPS/BD/OrderStat/impl/OrderIntake.cls.xml	(.../OrderIntake.cls.xml)	(revision 29059)
+++ APPS/BD/OrderStat/impl/OrderIntake.cls.xml	(.../OrderIntake.cls.xml)	(revision 31826)
@@ -61,7 +61,9 @@
 
 <Query name="SelectAll">
 <Type>%SQLQuery</Type>
-<SqlQuery>	Select * from APPS_BD_OrderStat_impl.OrderIntake</SqlQuery>
+<SqlQuery><![CDATA[	Select *,InternePersoon->Initialen as OrderVW, Klant->Divisie as Divisie,Klant->Subdivisie as SubDivisie,Klant->Sektor as Sektor,Klant->LandCode as Land 
+	from APPS_BD_OrderStat_impl.OrderIntake t
+	join (select orderdatum,ordnr,1/sum(Aantallijnen) from APPS_BD_OrderStat_impl.OrderIntake group by ORDNr) g on g.OrderDatum=t.OrderDatum and g.ORDNr=t.ORDNr]]></SqlQuery>
 </Query>
 
 <Method name="Export2File">