Index: APPS/Halux/Component/impl/ConvertAll.cls.xml
===================================================================
diff -u -r57552 -r62525
--- APPS/Halux/Component/impl/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 57552)
+++ APPS/Halux/Component/impl/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 62525)
@@ -54,6 +54,11 @@
 <Type>AX.Uitgaand.EC.DataAX.impl.Translator</Type>
 </Property>
 
+<Property name="Cache">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
 <Method name="%OnNew">
 <Description>
 D ##class(APPS.Halux.Component.impl.ConvertAll).%New().ExportHistoriek()</Description>
@@ -62,7 +67,7 @@
 <Implementation><![CDATA[
 	Set ..Convertor=##class(APPS.Halux.Component.impl.ConvertOneProduct).%New(UpdateOnly)
 	Set ..Translator=##class(AX.Uitgaand.EC.DataAX.impl.Translator).%New()
-	Set ..BeginDatum=$H-5
+	Set ..BeginDatum=$H-60
 	Set ..EindDatum=$H-1
 	Do ..Convertor.VerwijderAlles()
 	Set ..Cnt=0
@@ -72,16 +77,16 @@
 
 <Method name="ExportHistoriek">
 <Implementation><![CDATA[
-
-	Set ..Dev=$$OPEN^vhDEV(,"Export Productie transfers","W","T")
+	Set ..Dev=$$OPEN^vhDEV(,"Export Productie transfers.txt","W","T")
 	Use ..Dev
-	Write $TR("MPRNr,MKorttekst,MIdentNr,MFamilie,MAantal,ReceptieTijdstip,FabKey,BouwsteenKey,KPRNr,KKorttekst,KIdentNr,Firma,TransferTo,AantalStuksVoor1Moeder,AantalStuksVoorMAantal,NettoDimInMM,BasisDimensie,Eenheid",",",$c(9)),!
-	#dim PRNr as %String = $O(^PRHIST(2200000))
+	Write $TR("MPRNr,MKorttekst,MIdentNr,MFamilie,MAantal,ReceptieTijdstip,FabKey,BouwsteenKey,CompPRNr,CompKorttekst,CompLangtekst,CompIdentNr,CompFirma,TransferTo,AantalStuksVoor1Moeder,AantalStuksVoorMAantal,NettoDimInMM,BasisDimensie,Eenheid",",",$c(9)),!
+	#dim PRNr as %String = $O(^PRHIST(220000))
 	s PrevCnt=0
-	While (PRNr'="")&&(..Cnt<100)
+	While (PRNr'="") ;&&(..Cnt<100)
 	{
 		 //w:..Cnt'=PrevCnt ..Cnt r k
 		 //s PrevCnt=..Cnt
+		Kill ..Cache
 		If ..IsValidProduct(PRNr)
 		{
 			#dim VolgNr as %String = $O(^PRHIST(PRNr,""))
@@ -91,38 +96,60 @@
 				If ..IsValidHistory(PRNr,VolgNr)
 				{
 					Set ..Cnt=..Cnt+1
-					Do ..VerwerkOneHistory(PRNr,VolgNr)
+					Do ..BuildCache(PRNr,VolgNr)
 				}
-			Set VolgNr=$O(^PRHIST(PRNr,VolgNr))
+				Set VolgNr=$O(^PRHIST(PRNr,VolgNr))
+			}
+			
+			#dim FabKey as %String = $O(..Cache(""))
+			While FabKey'=""
+			{
+				Do ..VerwerkOneHistory(PRNr,FabKey)
+				Set FabKey=$O(..Cache(FabKey))
+			}
 		}
-		}
 		Set PRNr=$O(^PRHIST(PRNr))
 	}
 	Do CLOSE^vhDEV(..Dev)
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkOneHistory">
+<Method name="BuildCache">
 <FormalSpec>PRNr:%String,VolgNr:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	Do ..Convertor.Converteer(PRNr)
-	Set rs=..Convertor.GeefResultSet(PRNr)
 	Set Rec=^PRHIST(PRNr,VolgNr)
- 	Set ReceptieTijdstip=$zdt($P(Rec,"\"),3)
 	Set Aantal=$P(Rec,"\",2)
 	Set ToeleveringNr=$P(Rec,"\",7)
 	Set LijnNr=$P(Rec,"\",8)\100*100
+	Set lb=$G(..Cache(ToeleveringNr_";"_LijnNr),$LB($P(Rec,"\"),0))
+	Set $li(lb,2)=$li(lb,2)+Aantal
+	Set ..Cache(ToeleveringNr_";"_LijnNr)=lb
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkOneHistory">
+<FormalSpec>PRNr:%String,FabKey:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..Convertor.Converteer(PRNr)
+	Set rs=..Convertor.GeefResultSet(PRNr)
+	Set lb=..Cache(FabKey)
+ 	Set ReceptieTijdstip=$zdt($LI(lb,1),3)
+	Set Aantal=$LI(lb,2)
 	While rs.Next(.sc)
 	{
 		If $$$ISERR(sc) Quit
 		Write PRNr, *9,$$$PRGet($$$KortTekst),*9,..Translator.GeefItemIDForAX(PRNr),*9,rs.Data("Familie")
+		
 		Set KindPRNr=rs.Data("KindProduct")
+		Set Product=##class(Prod.Product).%OpenId(KindPRNr)
+		Set LangTekst=Product.Tekst.GetOmschrijving("N",";")
+	
 		Set IsHalux=$S($E($$$ProductGet(KindPRNr,$$$LinkType),1,2)="HH":"HLX",1:"VHBE")
-		Write *9,Aantal,*9,ReceptieTijdstip,*9,ToeleveringNr_";"_LijnNr,*9,rs.Data("BSKey")
-		Write *9,KindPRNr,*9,$$$ProductGet(KindPRNr,$$$KortTekst),*9,..Translator.GeefItemIDForAX(KindPRNr),*9,IsHalux
+		Write *9,Aantal,*9,ReceptieTijdstip,*9,FabKey,*9,rs.Data("BSKey")
+		Write *9,KindPRNr,*9,$$$ProductGet(KindPRNr,$$$KortTekst),*9,LangTekst,*9,..Translator.GeefItemIDForAX(KindPRNr),*9,IsHalux
 		Write *9,rs.Data("TransferTo"),*9,$$$ExcelNum(rs.Data("BenodigdAantal"))
 		Set Totaal=rs.Data("BenodigdAantal")*Aantal
-		Set DimNet=$S($$$ProductGet(KindPRNr,$$$WerkvloerEenheid)="MM":rs.Data("DimensieNetto")*$$$ProductGet(KindPRNr,$$$WerkvloerGrootteNetto),1:"")
+		Set DimNet=$S($$$ProductGet(KindPRNr,$$$WerkvloerEenheid)="MM":rs.Data("DimensieNetto"),1:"")
 		Write *9,$$$ExcelNum(Totaal),*9,$$$ExcelNum(DimNet),*9,$$$ExcelNum($$$ProductGet(KindPRNr,$$$WerkvloerGrootteNetto)),*9,$$$ProductGet(KindPRNr,$$$WerkvloerEenheid)
 		Write !
 	}