Index: DW/StockWaarde.cls.xml
===================================================================
diff -u -r29059 -r41122
--- DW/StockWaarde.cls.xml	(.../StockWaarde.cls.xml)	(revision 29059)
+++ DW/StockWaarde.cls.xml	(.../StockWaarde.cls.xml)	(revision 41122)
@@ -196,90 +196,204 @@
 <SqlComputed>1</SqlComputed>
 </Property>
 
+<Property name="StandaardAfwijking">
+<Type>%Float</Type>
+<Calculated>1</Calculated>
+<SqlComputeCode> Set {*}=##class(DW.StockWaarde).StandaardAfwijking({Product})</SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+</Property>
+
 <Method name="AfwijkingGemiddeldeCode">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>PRNr:%String,AantalWeken:%Integer=15,MinAantalWeken:%Integer=5</FormalSpec>
+<FormalSpec>PRNr:%String,AantalWeken:%Integer,MinAantalWeken:%Integer,GroepeerPer2:%Boolean</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Afwijking=..AfwijkingGemiddelde(PRNr,.AantalWeken,.MinAantalWeken)
+	Set Afwijking=..AfwijkingGemiddelde(PRNr,.AantalWeken,.MinAantalWeken,.GroepeerPer2)
+	
 	;X - Articles Interference level below 0,2
 	;Y - Articles Interference level between 0,2 - 0,4
 	;Z - Articles Interference above 0,4
 	Quit $S(Afwijking="":"",Afwijking<.2:"X",Afwijking<.4:"Y",1:"Z")
 ]]></Implementation>
 </Method>
 
-<Method name="GetWeekVerkoop">
-<ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[PRNr,Begin,Einde,&arHist]]></FormalSpec>
-<Implementation><![CDATA[
- New Key,I,Rec
- Set Begin=$G(Begin)
- Set Einde=$G(Einde,999999)
- Set Magazijn="M"
- Set lbActies=$LB("T","U")
- Set Key=""
- For  Set Key=$O(^PRHIST(PRNr,Key)) Quit:Key=""  Do
- . Set Rec=^PRHIST(PRNr,Key)
- . Quit:+$P(Rec,"\")<Begin
- . Quit:+$P(Rec,"\")>Einde
- . Quit:$P(Rec,"\",5)'=Magazijn
- . Quit:'$LF(lbActies,$P(Rec,"\",4))
- . Set IdxDate = $$CALCDATE^vhLib.DataTypes(+$P(Rec,"\"),"W","MD") ;woensdag
- . Set arHist(IdxDate)=$g(arHist(IdxDate))+$P(Rec,"\",2)
- Quit
-]]></Implementation>
-</Method>
-
 <Method name="AfwijkingGemiddelde">
 <Description>
-w ##class(DW.StockWaarde).AfwijkingGemiddelde(3551)</Description>
+w ##class(DW.StockWaarde).AfwijkingGemiddelde(808099)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>PRNr:%String,AantalWeken:%Integer=15,MinAantalWeken:%Integer=5</FormalSpec>
+<FormalSpec>PRNr:%String,AantalWeken:%Integer=26,MinAantalWeken:%Integer=5,GroepeerPer2:%Boolean=0</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
-	Set Offset=10
-	Set Begin=$$CALCDATE^vhLib.DataTypes($H,"W",-AantalWeken-Offset,"FD") 
-	Set End=$$CALCDATE^vhLib.DataTypes($H,"W",-1-Offset,"LD")
-	Do ..GetWeekVerkoop(PRNr,Begin,End,.arHist)
+	Do ..GenereerWeken(.arHist,AantalWeken)
+	Do ..GetWeekVerkoop(PRNr,.arHist)
+	Do:GroepeerPer2 ..GroepeerPer2(.arHist)
+	
 	;k %x m %x=arHist zw %x
 	; Gemiddelde
 	Set Som=0,Aantal=0
-	Set Begin=$$CALCDATE^vhLib.DataTypes($H,"W",-AantalWeken-Offset,"MD") ; woensdag
-	For I=1:1:AantalWeken
+	
+	Set IdxDate=$O(arHist(""))
+	While IdxDate'=""
 	{
-		Set AantalStuks=$G(arHist(Begin+((I-1)*7))) 
+		Set AantalStuks=$G(arHist(IdxDate)) 
 		If (AantalStuks'="")||(Aantal)
 		{
-			Set Som=Som-AantalStuks ; verkoop in historiek is negatief
+			Set Som=Som+AantalStuks ; verkoop in historiek is negatief
 		 	Set Aantal=Aantal+1 ; we beginnen pas te tellen als er de vorige weken verkoop is geweest
 		}
+		Set IdxDate=$O(arHist(IdxDate))
 	}
 	
 	If Aantal>MinAantalWeken,Som>0
 	{
 		Set Gemiddelde=Som/Aantal
 		; Afwijking
 		Set SomAfwijking=0,Aantal=0
-		For I=1:1:AantalWeken
+		Set IdxDate=$O(arHist(""))
+		While IdxDate'=""
 		{
-			Set AantalStuks=$G(arHist(Begin+((I-1)*7)))
+			Set AantalStuks=arHist(IdxDate)
 			If (AantalStuks'="")||(Aantal)
 			{
-				Set Afwijking=-AantalStuks-Gemiddelde ; verkoop in historiek is negatief
+				Set Afwijking=AantalStuks-Gemiddelde ; verkoop in historiek is negatief
 			;w I," ",Begin+((I-1)*7)," ",AantalStuks," ",Gemiddelde," ",Afwijking,!
 				Set SomAfwijking=SomAfwijking+$S(Afwijking<0:-Afwijking,1:Afwijking) ; abs
 				Set Aantal=Aantal+1 ; we beginnen pas te tellen als er de vorige weken verkoop is geweest
 			}
+			Set IdxDate=$O(arHist(IdxDate))
 		}
 		Set AfwijkingGemiddelde=(SomAfwijking/Aantal)/Gemiddelde
 	}
 	Quit $G(AfwijkingGemiddelde)
 ]]></Implementation>
 </Method>
 
+<Method name="StandaardAfwijking">
+<Description>
+w ##class(DW.StockWaarde).StandaardAfwijking(808099)
+Variantie, Deviation</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNr:%String,AantalWeken:%Integer=26,MinAantalWeken:%Integer=5,GroepeerPer2:%Boolean=0</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[
+	Do ..GenereerWeken(.arHist,AantalWeken)
+	Do ..GetWeekVerkoop(PRNr,.arHist)
+	;k %x m %x=arHist zw %x w !!
+	Do:GroepeerPer2 ..GroepeerPer2(.arHist)
+
+	;k %x m %x=arHist zw %x
+	; Gemiddelde
+	Set SomKwadraat=0,Som=0,Aantal=0
+	Set IdxDate=$O(arHist(""))
+	While IdxDate'=""
+	{
+		Set AantalStuks=arHist(IdxDate)
+		;w IdxDate,";",AantalStuks,!
+		If (AantalStuks'="")||(Aantal)
+		{
+			Set SomKwadraat=SomKwadraat+(AantalStuks*AantalStuks) ; verkoop in historiek is negatief
+			Set Som=Som+AantalStuks ; verkoop in historiek is negatief
+		 	Set Aantal=Aantal+1 ; we beginnen pas te tellen als er de vorige weken verkoop is geweest
+		}
+		Set IdxDate=$O(arHist(IdxDate))
+	}
+	
+	If Aantal>MinAantalWeken,Som>0
+	{
+		Set Gemiddelde=Som/Aantal
+		; Afwijking
+		Set Variantie=SomKwadraat/Aantal-(Gemiddelde*Gemiddelde)
+		Set StandaardAfwijking=Variantie**.5
+		
+	}
+	Quit $G(StandaardAfwijking)
+]]></Implementation>
+</Method>
+
+<Method name="GetWeekVerkoop">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[PRNr,&arHist]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+ New Key,I,Rec
+ ;Set Begin=$G(Begin)
+ ;Set Einde=$G(Einde,999999)
+ ;Set Magazijn=$LB("M","W")
+ ;Set lbActies=$LB("U","H","K")
+ Set Key=""
+ For  Set Key=$O(^PRHIST(PRNr,Key)) Quit:Key=""  Do
+ . Set Rec=^PRHIST(PRNr,Key)
+ . ;Quit:+$P(Rec,"\")<Begin
+ . ;Quit:+$P(Rec,"\")>Einde
+ . Quit:($P(Rec,"\",5)'="M")&&($P(Rec,"\",5)'="W")
+ . If $P(Rec,"\",5)="M" Quit:'$LF($LB("U","K"),$P(Rec,"\",4))
+ . If $P(Rec,"\",5)="W" Quit:'$LF($LB("H"),$P(Rec,"\",4))
+ . Set IdxDate = $$CALCDATE^vhLib.DataTypes(+$P(Rec,"\"),"W","MD") ;woensdag
+ . Quit:'$D(arHist(IdxDate))
+ . Set arHist(IdxDate)=$g(arHist(IdxDate))-$P(Rec,"\",2)
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="GenereerWeken">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>arHist,AantalWeken</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Datum=$$CALCDATE^vhLib.DataTypes($H,"W",-AantalWeken,"MD") 
+	For I=1:1:AantalWeken
+	{
+		If '..IsVakantieWeek(Datum) Set arHist(Datum)=""
+		Set Datum=Datum+7
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GroepeerPer2">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>arHist</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set IdxDate=$O(arHist(""))
+	Set IdxDatePrev=""
+	Set Count=0
+	While IdxDate'=""
+	{
+		If IdxDatePrev'=""
+		{ 
+			Set arHist(IdxDatePrev)=(arHist(IdxDatePrev)+arHist(IdxDate))/2
+			Kill arHist(IdxDate)
+			Set IdxDatePrev=""
+		}
+		Else
+		{
+			Set IdxDatePrev=IdxDate
+		}
+		Set IdxDate=$O(arHist(IdxDate))
+	}
+	
+	If IdxDatePrev'=""
+	{ 
+		Kill arHist(IdxDatePrev)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsVakantieWeek">
+<Description>
+de vakantieweken met minder omzet eruit halen</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Datum:%Date</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+		Set WeekNr=$$EXTDATE^vhLib.DataTypes(Datum,"W")
+		Quit ";29;30;31;32;52;1;"[(";"_WeekNr_";")
+]]></Implementation>
+</Method>
+
 <Method name="HoofdgroepGet">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
@@ -368,7 +482,6 @@
 
 <Method name="FetchAll">
 <ClassMethod>1</ClassMethod>
-<CodeMode>code</CodeMode>
 <FormalSpec>BackGround</FormalSpec>
 <Implementation><![CDATA[
    New CountType,Ok,oStockWaarde,Maand,PRNr,BldIndex
@@ -418,7 +531,6 @@
 Result bevat "O" : Moederproduct met stock over kinderen (zoals Orgalux) dan geen JaarVerkoopWaarde of GemFysStockWaarde
 Indien Result leeg is dan NIET tellen</Description>
 <ClassMethod>1</ClassMethod>
-<CodeMode>code</CodeMode>
 <FormalSpec>PRNr:%Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
@@ -437,14 +549,13 @@
 </Method>
 
 <Method name="SetAlgemeen">
-<CodeMode>code</CodeMode>
 <FormalSpec>PRNr:%Integer,Maand:%Date,BeginMnd:%String,EndMnd:%String</FormalSpec>
 <Implementation><![CDATA[
 	New JKey,RecJ,Rec1,GemSt,GemWvk,GGemWVk,Tmp
 	; Sleutels
 	Set ..Datum=Maand
 	
-	Set ..Owner=$S($E($$$PRGet($$$LinkType),1,2)="HH":"HALUX",1:"VH") ; Halux Halffabrikaat -> Onwer = Halux
+	Set ..Owner=$S($E($$$PRGet($$$LinkType),1,2)="HH":"HALUX",1:"VH") ; Halux Halffabrikaat -> Owner = Halux
 	;If ..Owner="HALUX"  w PRNr," ",$P(^KPR(PRNr,0),"\",1),! r k
 	Do ..ProductSetObjectId(PRNr)
 	
@@ -489,7 +600,6 @@
 </Method>
 
 <Method name="SetStock">
-<CodeMode>code</CodeMode>
 <FormalSpec>CountType:%String</FormalSpec>
 <Implementation><![CDATA[
  	New PRNr,WVStock,FysStock
@@ -517,7 +627,6 @@
 <Description>
 Alleen leveringen geen terugnames</Description>
 <ClassMethod>1</ClassMethod>
-<CodeMode>code</CodeMode>
 <FormalSpec>PRNr:%Integer</FormalSpec>
 <Implementation><![CDATA[
  	New Som,BONNr,BLNr,KLNr,Rec,Qty
@@ -541,7 +650,6 @@
 <Description>
 Alleen toeleveringen geen terugnames</Description>
 <ClassMethod>1</ClassMethod>
-<CodeMode>code</CodeMode>
 <FormalSpec>PRNr:%Integer</FormalSpec>
 <Implementation><![CDATA[
  	New Som,TOENr,TLUNr,RCPNr,RCPRec
Index: Prod/Product/StockBeheer/StockScan.mac.rou
===================================================================
diff -u -r29059 -r41122
--- Prod/Product/StockBeheer/StockScan.mac.rou	(.../StockScan.mac.rou)	(revision 29059)
+++ Prod/Product/StockBeheer/StockScan.mac.rou	(.../StockScan.mac.rou)	(revision 41122)
@@ -77,6 +77,7 @@
  New R,StockUpd,KLNr,ORDNr,OLNr
  Set StockUpd=0,ORDNr=$E(Ref,18,23),OLNr=$TR($E(Ref,24,26)," ","")+100
  If ORDNr,OLNr Do
+ .Quit:'$Data(^KO1(ORDNr,"F"))
  .Set R=^KO1(ORDNr,"F"),KLNr=$P(R,D)
  .Quit:'KLNr
  .Set R=$G(^KOD(KLNr,"F",ORDNr,OLNr))
@@ -153,3 +154,4 @@
  Lock -@("^"_Q_"SPW(PR)")
  Quit
  ;
+
Index: EWSTAT.mac.rou
===================================================================
diff -u -r38654 -r41122
--- EWSTAT.mac.rou	(.../EWSTAT.mac.rou)	(revision 38654)
+++ EWSTAT.mac.rou	(.../EWSTAT.mac.rou)	(revision 41122)
@@ -324,8 +324,8 @@
 
  Set Dev=$$OPEN^vhDEV(,"WMS Picking "_$$EXTDATE^vhLib.DataTypes($H)_".TXT","W","T")
  Use Dev
- Write "BONNr	PRNr	KortTekst	Qty	Picker	Datum	Tijd	SoftMag	PickMag	Pallet",!
- Set DatVan=$G(DatVan,$H-30)
+ Write "BONNr	ORDNr	OLUNr	SOLUNr	ExtraVeld	MPRNr	MKortTekst	MQty	GenTyp	ProdGrp	PRNr	KortTekst	Qty	Picker	Datum	Tijd	SoftMag	PickMag	Pallet",!
+ Set DatVan=$G(DatVan,$H-60)
  Set DatTot=$G(DatTot,$H-1)
  Set CONSNr=""
  Set Max=-1,Min=99999999
@@ -340,6 +340,10 @@
  .For  Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr)) Quit:ORDNr=""  Do
  ..Set OLUNr=""
  ..For  Set OLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)) Quit:OLUNr=""  Do
+ ...Set MPRNr=$P($G(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)),"\")
+ ...Set MQty=$P($G(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)),"\",4)
+ ...Set GenTyp=$P($$GENTYP^HAD(MPRNr,1),"\")
+ ...Set ProdGrp=$$PRODGRP^PRODUKT(MPRNr,1) 
  ...Set SOLUNr=""
  ...For  Set SOLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLUNr)) Quit:SOLUNr=""  Do
  ....Set R=^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLUNr)
@@ -352,7 +356,7 @@
  ....Set PickMag=$P(R,D,14)
  ....Set PRNr=$P(R,D,1)
  ....Set Qty=$P(R,D,4)
- .... Write CONSNr,*9,PRNr,*9,$$$PRGet($$$KortTekst),*9,$$$ExcelNum(Qty),*9,Picker,*9,$$$ExcelDat(Dat),*9,$$$ExcelTime(Uur),*9,SoftMag,*9,PickMag,*9,Pallet,!
+ .... Write CONSNr,*9,ORDNr,*9,OLUNr,*9,SOLUNr,*9,CONSNr,";",ORDNr,";",OLUNr,*9,MPRNr,*9,$$$ProductGet(MPRNr,$$$KortTekst),*9,MQty,*9,GenTyp,*9,ProdGrp,*9,PRNr,*9,$$$PRGet($$$KortTekst),*9,$$$ExcelNum(Qty),*9,Picker,*9,$$$ExcelDat(Dat),*9,$$$ExcelTime(Uur),*9,SoftMag,*9,PickMag,*9,Pallet,!
  Do CLOSE^vhDEV(Dev)
  Quit
  
@@ -567,3 +571,4 @@
 
 
 
+