Index: APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml
===================================================================
diff -u -r44378 -r47555
--- APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 44378)
+++ APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 47555)
@@ -132,8 +132,8 @@
 	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 ..VanDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-15,"FD")
-	Set ..TotDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"LD") 
+	Set ..VanDatum=..TotDatum-30 ;$$CALCDATE^vhLib.DataTypes($H,"M",-24,"FD")
+	;Set ..TotDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"LD") 
 	Set ..AfstandBepaler=##class(APPS.BD.CarbonFootprint.impl.AfstandBepaler).%New()
 	
 	Quit $$$OK
@@ -142,15 +142,16 @@
 
 <Method name="BouwEnFile">
 <Description>
-	D ##class(APPS.BD.OrderStat.impl.Extract2IntakeEnGeleverd).%New().BouwEnFile()</Description>
+	D ##class(APPS.BD.OrderStat.impl.Extract2IntakeEnGeleverd).%New().BouwEnFile("I")</Description>
+<FormalSpec>WelkBestand:%String="IL"</FormalSpec>
 <Implementation><![CDATA[
 	;Set Dev=$$OPEN^vhDEV("c:\scratch","OrderStat_Build.txt","W","T")
 	;Use Dev
 
 	Do ..HerbouwenOrders()
 	;Do CLOSE^vhDEV(Dev)
-	Do ##class(APPS.BD.OrderStat.impl.OrderGeleverd).Export2File()
-	;Do ##class(APPS.BD.OrderStat.impl.OrderIntake).Export2File()
+	Do:WelkBestand["L" ##class(APPS.BD.OrderStat.impl.OrderGeleverd).Export2File()
+	Do:WelkBestand["I" ##class(APPS.BD.OrderStat.impl.OrderIntake).Export2File()
 ]]></Implementation>
 </Method>
 
@@ -407,13 +408,14 @@
 	Set ..OrderTijd=$P($P(OrderIntakeRec,"#",2),",",2)
 	
 	Set EDIRef=$P(Rec,"\",21)
+	Set EDIOorsprong=$P(Rec,"\",28)
 	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:"")
+ 	Set ..IntakeType=$S(EDIOorsprong'="":EDIOorsprong,EDIRef'="":"EDI",1:"")
 ]]></Implementation>
 </Method>
 
@@ -468,13 +470,15 @@
 	}	
 	Set ..OrderTijd=$P($P(OrderIntakeRec,"#",2),",",2)
 	Set EDIRef=$P(Rec,"\",40)
+	Set EDIOorsprong=$P(Rec,"\",53)
+
 	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:"")
+ 	Set ..IntakeType=$S(EDIOorsprong'="":EDIOorsprong,EDIRef'="":"EDI",1:"")
 ]]></Implementation>
 </Method>
 
Index: APPS/BD/OrderStat/impl/OrderIntake.cls.xml
===================================================================
diff -u -r40616 -r47555
--- APPS/BD/OrderStat/impl/OrderIntake.cls.xml	(.../OrderIntake.cls.xml)	(revision 40616)
+++ APPS/BD/OrderStat/impl/OrderIntake.cls.xml	(.../OrderIntake.cls.xml)	(revision 47555)
@@ -33,6 +33,7 @@
 
 <Property name="IntakeType">
 <Type>%String</Type>
+<Parameter name="MAXLEN" value="250"/>
 </Property>
 
 <Property name="OrderVerwerker">
@@ -47,6 +48,14 @@
 <Type>%Integer</Type>
 </Property>
 
+<Property name="BevestigdeLeverDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="VerwachteLeverDatum">
+<Type>%Date</Type>
+</Property>
+
 <Property name="AantalLijnen">
 <Type>%Integer</Type>
 </Property>
@@ -59,22 +68,36 @@
 <Type>%Float</Type>
 </Property>
 
+<Property name="GenType">
+<Type>%String</Type>
+</Property>
+
+<Property name="SubGenType">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductGroep">
+<Type>%String</Type>
+</Property>
+
 <Query name="SelectAll">
 <Type>%SQLQuery</Type>
-<SqlQuery><![CDATA[	Select *,InternePersoon->Initialen as OrderVW, Klant->Divisie as Divisie,Klant->Subdivisie as SubDivisie,Klant->Sektor as Sektor,Klant->LandCode as Land 
+<SqlQuery><![CDATA[	Select Product->KortTekst as Korttekst,*,InternePersoon->Initialen as OrderVW, Klant->Naam as Klantnaam,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>
+	join (select OrderDatum, ORDNr, Replace(to_char(1/sum(Aantallijnen),'9.999999'),'.',',') as LijnPerOrder from APPS_BD_OrderStat_impl.OrderIntake group by OrderDatum,ORDNr) g on (g.OrderDatum=t.OrderDatum and g.ORDNr=t.ORDNr)]]></SqlQuery>
 </Query>
 
 <Method name="Export2File">
 <ClassMethod>1</ClassMethod>
+<ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Set rs=##class(%ResultSet).%New()
 	Set rs.ClassName=..%ClassName(1)
 	Set rs.QueryName="SelectAll"
 	Set sc=rs.Execute()
 	Set FileExport=##class(TECH.FileExportResultSet).%New(rs)
-	Do FileExport.ExportToFile("c:\scratch","OrderStat_Intake.txt")
+	Set Pad=$$DIRUSER^vhDEV()
+	Do FileExport.ExportToFile(Pad,"OrderStat_Intake "_$ZD($H,2)_".txt")
 ]]></Implementation>
 </Method>
 
@@ -86,7 +109,7 @@
 
 <Method name="Add">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>FromType:%String,KLNr:%Integer,ORDNr:%Integer,OrderDatum:%Date,OrderTijd:%Time,IntakeType:%String,OrderVerwerker:%String,PRNr:%Integer,Qty:%Integer,OmzetVerkoop:%Float,OmzetAankoop:%Float</FormalSpec>
+<FormalSpec>FromType:%String,KLNr:%Integer,ORDNr:%Integer,OrderDatum:%Date,OrderTijd:%Time,IntakeType:%String,OrderVerwerker:%String,PRNr:%Integer,Qty:%Integer,BevestigdeLeverDatum:%Date,VerwachteLeverDatum:%Date,OmzetVerkoop:%Float,OmzetAankoop:%Float</FormalSpec>
 <Implementation><![CDATA[
 	If ##class(OrderIntake).%ExistsId(OrderDatum_"||"_ORDNr_"||"_PRNr)
 	{
@@ -97,7 +120,15 @@
 		Set OrderDtl=##class(OrderIntake).%New()
 		Set OrderDtl.OrderDatum=OrderDatum
 		Set OrderDtl.ORDNr=ORDNr
+		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
 		Do OrderDtl.ProductSetObjectId(PRNr)
+		Set GenType=$$GENTYP^HAD(PRNr,1)
+		Set OrderDtl.GenType=$P(GenType,"\",1)
+		Set OrderDtl.SubGenType=$P(GenType,"\",2)
+		Set OrderDtl.ProductGroep=$$PRODGRP^PRODUKT(PRNr,1)
 		Set OrderDtl.FromType=FromType
 		Do OrderDtl.KlantSetObjectId(KLNr)
 		Set OrderDtl.OrderTijd=OrderTijd
@@ -130,11 +161,11 @@
 
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
-<DataLocation>^||APPS.BD.OrderIntakeD</DataLocation>
+<DataLocation>^APPS.BD.OrderIntakeD</DataLocation>
 <DefaultData>OrderIntakeDefaultData</DefaultData>
-<IdLocation>^||APPS.BD.OrderIntakeD</IdLocation>
-<IndexLocation>^||APPS.BD.OrderIntakeI</IndexLocation>
-<StreamLocation>^||APPS.BD.OrderIntakeS</StreamLocation>
+<IdLocation>^APPS.BD.OrderIntakeD</IdLocation>
+<IndexLocation>^APPS.BD.OrderIntakeI</IndexLocation>
+<StreamLocation>^APPS.BD.OrderIntakeS</StreamLocation>
 <Data name="OrderIntakeDefaultData">
 <Value name="1">
 <Value>%%CLASSNAME</Value>
@@ -169,6 +200,21 @@
 <Value name="11">
 <Value>OmzetAankoop</Value>
 </Value>
+<Value name="12">
+<Value>GenType</Value>
+</Value>
+<Value name="13">
+<Value>ProductGroep</Value>
+</Value>
+<Value name="14">
+<Value>SubGenType</Value>
+</Value>
+<Value name="15">
+<Value>BevestigdeLeverDatum</Value>
+</Value>
+<Value name="16">
+<Value>VerwachteLeverDatum</Value>
+</Value>
 </Data>
 </Storage>
 </Class>