Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r949 -r1010
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 949)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1010)
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-23 15:38:06">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-04-18 15:22:31">
 <Class name="APPS.common.impl.StockNiveauService">
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.common.StockNiveauService,%RegisteredObject</Super>
-<TimeChanged>62173,41115.064929</TimeChanged>
+<TimeChanged>62199,55366.581181</TimeChanged>
+<TimeCreated>62173,62721.245468</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="PRNr">
+<Property name="Datum">
 <Description>
 Bij de berekeningen wordt er momenteel nog geen rekening gehouden met magazijn waarin de goederen zich bevinden.</Description>
-<Type>%Integer</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Datum">
 <Type>%Date</Type>
 <Private>1</Private>
 </Property>
@@ -24,8 +20,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Product">
-<Type>DOM.PM.Product</Type>
+<Property name="PRNr">
+<Type>%Integer</Type>
 <Private>1</Private>
 </Property>
 
@@ -64,16 +60,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="implStockOverKinderen">
+<Type>APPS.common.impl.StockOverKinderen</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	#define enuStockType ##class(APPS.common.enu.StockType)
-	
-	set ..Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(PRNr)
 	set ..PRNr = PRNr
+	set ..implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(PRNr,Datum)
 	set ..Datum = Datum
 	set ..Magazijn = Magazijn
 	quit $$$OK
@@ -84,13 +84,36 @@
 <ReturnType>APPS.common.dto.StockNiveaus</ReturnType>
 <Implementation><![CDATA[
 	set dtoStock = ##class(APPS.common.dto.StockNiveaus).%New()
+	
+	;d StartTimer^vhLib
 	set dtoStock.Fysisch = ..GeefFysischeStock()
+	;d StopTimer^vhLib
+	;D WLIP^vhDBG(195,"Fys : "_$$GetInterval^vhLib())
+	;d StartTimer^vhLib
 	set dtoStock.Praktisch = ..GeefPraktischeStock()
+	;d StopTimer^vhLib
+	;D WLIP^vhDBG(195,"Pra : "_$$GetInterval^vhLib())
+	;d StartTimer^vhLib
 	set dtoStock.FysischMinReservaties = ..GeefFysischeStockMinReservaties()
+	;d StopTimer^vhLib
+	;D WLIP^vhDBG(195,"Fys-Res : "_$$GetInterval^vhLib())
+	;d StartTimer^vhLib
 	set dtoStock.Theoretisch = ..GeefTheoretischeStock()
+	;d StopTimer^vhLib
+	;D WLIP^vhDBG(195,"Theo : "_$$GetInterval^vhLib())
+	;d StartTimer^vhLib
 	set dtoStock.InOrder = ..GeefAantalInOrder()
+	;d StopTimer^vhLib
+	;D WLIP^vhDBG(195,"InOrder : "_$$GetInterval^vhLib())
+	;d StartTimer^vhLib
 	set dtoStock.InToelevering = ..GeefAantalInToelevering()
+	;d StopTimer^vhLib
+	;D WLIP^vhDBG(195,"InToelev : "_$$GetInterval^vhLib())
+	;d StartTimer^vhLib
 	set dtoStock.InReservatie = ..GeefAantalInReservatie()
+	;d StopTimer^vhLib
+	;D WLIP^vhDBG(195,"InReser : "_$$GetInterval^vhLib())
+	
 	quit dtoStock
 ]]></Implementation>
 </Method>
@@ -101,9 +124,9 @@
 	quit:$length(..Fysisch) ..Fysisch
 	
 	set Result = 0
-	if ..Product.IsStockOverKinderen() { 
-		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.Fysisch())
-		set Result = implStockOverKinderen.Beschikbaarheid()
+	if $data(^PRBS("BS",..PRNr))>0 { 
+		do ..implStockOverKinderen.SetStockType($$$enuStockType.Fysisch())
+		set Result = ..implStockOverKinderen.Beschikbaarheid()
 	}
 	else {	set Result = +$piece(^KPR(..PRNr,0),"\",14)
 	}
@@ -119,9 +142,9 @@
 	quit:$length(..FysischMinReservatie) ..FysischMinReservatie
 	
 	set Result = 0
-	if ..Product.IsStockOverKinderen() {
-		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.FysischMinReservaties(),..Datum)
-		set Result = implStockOverKinderen.Beschikbaarheid()
+	if $data(^PRBS("BS",..PRNr))>0 {
+		do ..implStockOverKinderen.SetStockType($$$enuStockType.FysischMinReservaties())
+		set Result = ..implStockOverKinderen.Beschikbaarheid()
 	}
 	else  { set Result = ..GeefFysischeStock()-..GeefAantalInReservatie() }
 	
@@ -137,9 +160,9 @@
 	quit:$length(..Praktisch) ..Praktisch
 	
 	set Result = 0
-	if ..Product.IsStockOverKinderen() {
-		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.Praktisch(),..Datum)
-		set Result = implStockOverKinderen.Beschikbaarheid()
+	if $data(^PRBS("BS",..PRNr))>0 {
+		do ..implStockOverKinderen.SetStockType($$$enuStockType.Praktisch())
+		set Result = ..implStockOverKinderen.Beschikbaarheid()
 	}
 	else { set Result = ..GeefFysischeStock() - ..GeefAantalInOrder()}
 	
@@ -155,10 +178,9 @@
 	quit:$length(..Theoretisch) ..Theoretisch
 	
 	set Result = 0
-	if ..Product.IsStockOverKinderen() {
-		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.Theoretisch(),..Datum)
-		
-		set Result = implStockOverKinderen.Beschikbaarheid()
+	if $data(^PRBS("BS",..PRNr))>0 {
+		do ..implStockOverKinderen.SetStockType($$$enuStockType.Theoretisch())
+		set Result = ..implStockOverKinderen.Beschikbaarheid()
 	}
 	else  { set Result = ..GeefPraktischeStock() + ..GeefAantalInToelevering() }
 	
@@ -175,12 +197,18 @@
 	
 	set Result = 0
 	if $length(..Datum) {
-		set itProductOrderLijnen = ##class(APPS.PM.ProductOpOrderLijnIt).%New(..PRNr)
-		while itProductOrderLijnen.HasNext() {
-			set OrderLijn = itProductOrderLijnen.Next()
-			continue:($$$Not(OrderLijn.IsInReservatie()))
-			continue:( ( $length(..Datum) ) && ( OrderLijn.GeefLeverdag()>(..Datum) ) )
-			set Result = Result + OrderLijn.GeefAantal()			 
+		set idxWNode = "W    0.0R" 
+		for { set idxWNode = $order(^KPR(..PRNr,idxWNode)) Quit:'$$$StartsWith(idxWNode,"W    0.0R")
+			 set OrderNr = $extract(idxWNode,18,23)
+			 set OrderLijnNr = $translate($extract(idxWNode,24,26)," ","")+100
+			 If ..IsInReservatie(OrderNr,OrderLijnNr) {
+				 set Rec = ^KPR(..PRNr,idxWNode)
+				 set Leverdag = $P(Rec,"\",2)
+				 if (Leverdag<..Datum) {
+				 	 set Aantal = $piece(Rec,"\",1)
+				 	 set Result = Result + Aantal
+				 }
+			 }
 		}
 	}
 	else  { 
@@ -192,49 +220,69 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalInToelevering">
+<Method name="GeefAantalInOrder">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..AantalInToelevering) ..AantalInToelevering
+	quit:$length(..AantalInOrder) ..AantalInOrder
 	set Result = 0
 
 	if $length(..Datum) { 
-		set itProductToelevLijnen = ##class(APPS.PM.ProductOpToeleveringLijnIt).%New(..PRNr)
-		while itProductToelevLijnen.HasNext() {
-			set ToelevLijn = itProductToelevLijnen.Next()
-			continue:( ( $length(..Datum) ) && ( ToelevLijn.GeefLeverdag()>(..Datum) ) )
-			set Result = Result + ToelevLijn.GeefAantal()
+		set idxWNode = "W    0.0R"
+		for { set idxWNode = $Order(^KPR(..PRNr,idxWNode)) Quit:'$$$StartsWith(idxWNode,"W    0.0R")
+			 set OrderNr = $extract(idxWNode,18,23)
+			 set OrderLijnNr = $translate($extract(idxWNode,24,26)," ","")+100
+			 If '..IsInReservatie(OrderNr,OrderLijnNr) {
+				 set Rec = ^KPR(..PRNr,idxWNode)
+				 set Leverdag = $P(Rec,"\",2)
+				 if (Leverdag<..Datum) {
+				 	 set Aantal = $piece(Rec,"\",1)
+				 	 set Result = Result + Aantal
+				 }
+			 }
 		}
 	}
-	else  { set Result = +$piece($piece(^KPR(..PRNr,0),"\",17),"#",1) }
+	else  { set Result = +$piece($get(^PRSTOCK("D",..PRNr)),"\",3) }
 	
-	set ..AantalInToelevering = Result
-	
+	set ..AantalInOrder = Result
 	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalInOrder">
+<Method name="IsInReservatie">
+<FormalSpec>OrderNr,OrderLijnNr</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set KlantNr = $piece(^KO1(OrderNr,"F"),"\",1)
+	set OLUNr = $piece(^KOD(KlantNr,"F",OrderNr,OrderLijnNr),"\",15)
+	set Result = $data(^ORDW("IO",OrderNr,OLUNr))
+	quit Result
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantalInToelevering">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..AantalInOrder) ..AantalInOrder
+	quit:$length(..AantalInToelevering) ..AantalInToelevering
 	set Result = 0
 
 	if $length(..Datum) { 
-		set itProductOrderLijnen = ##class(APPS.PM.ProductOpOrderLijnIt).%New(..PRNr)
-		while itProductOrderLijnen.HasNext() {
-			set OrderLijn = itProductOrderLijnen.Next()
-			continue:(OrderLijn.IsInReservatie())
-			continue:( ( $length(..Datum) ) && ( OrderLijn.GeefLeverdag()>(..Datum) ) )
-			set Result = Result + OrderLijn.GeefAantal()
+		set idxWNode = "W    0.0T"
+		for { set idxWNode = $order(^KPR(..PRNr,idxWNode)) Quit:'$$$StartsWith(idxWNode,"W    0.0T")
+			 set Rec = ^KPR(..PRNr,idxWNode)
+			 set Leverdag = $$INTDATE^vhDTyp($piece(Rec,"\",6),"DW")
+			 if (Leverdag<..Datum) {
+			 	 set Aantal = $piece(Rec,"\",4)
+			 	 set Result = Result + Aantal
+			 }
 		}
 	}
-	else  { set Result = +$piece($get(^PRSTOCK("D",..PRNr)),"\",3) }
+	else  { set Result = +$piece($piece(^KPR(..PRNr,0),"\",17),"#",1) }
 	
-	set ..AantalInOrder = Result
+	set ..AantalInToelevering = Result
+	
 	quit Result
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="2256394405"/>
+<Checksum value="207151052"/>
 </Export>