Index: APPS/common/impl/StockOverKinderen.cls.xml
===================================================================
diff -u -r33652 -r33659
--- APPS/common/impl/StockOverKinderen.cls.xml	(.../StockOverKinderen.cls.xml)	(revision 33652)
+++ APPS/common/impl/StockOverKinderen.cls.xml	(.../StockOverKinderen.cls.xml)	(revision 33659)
@@ -121,24 +121,7 @@
 <Method name="BepaalKinderen">
 <FormalSpec>MoederPRNr:%Integer</FormalSpec>
 <ReturnType>%ArrayOfDataTypes</ReturnType>
-<Implementation><![CDATA[
-	set arKinderen = ##class(%ArrayOfDataTypes).%New()
-	set idxBSKey = ""
-	
-	for  { set idxBSKey = $order(^PRBS("BS",MoederPRNr,idxBSKey)) quit:idxBSKey=""
-		
-		set Rec = ^PRBS("BS",MoederPRNr,idxBSKey)
-		if $piece(Rec,"\",3) = "K" {
-			set Aantal = $piece(Rec,"\",2)
-			set KindPRNr = $piece(Rec,"\",1)
-			
-			if ##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock() '= $piece( ^KPR(KindPRNr, 0), "\", 23 ) {
-				do arKinderen.SetAt(Aantal,KindPRNr)
-			}
-		}
-	}
-	
-	quit arKinderen
+<Implementation><![CDATA[	Quit ##class(APPS.common.impl.KindProductenMetAantallenBepaler).%New().BepaalKinderen(MoederPRNr)
 ]]></Implementation>
 </Method>
 
Index: APPS/common/impl/KindProductenMetAantallenBepaler.cls.xml
===================================================================
diff -u
--- APPS/common/impl/KindProductenMetAantallenBepaler.cls.xml	(revision 0)
+++ APPS/common/impl/KindProductenMetAantallenBepaler.cls.xml	(revision 33659)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.impl.KindProductenMetAantallenBepaler">
+<Super>%RegisteredObject</Super>
+
+<Method name="BepaalKinderen">
+<FormalSpec>MoederPRNr:%Integer</FormalSpec>
+<ReturnType>%ArrayOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+		#dim KinderenMetAantal As %ArrayOfDataTypes = ##class(%ArrayOfDataTypes).%New()
+		#dim SamengesteldProduct As DOM.PM.SamengesteldProduct = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefSamengesteldProduct(MoederPRNr)
+		#dim KindBouwstenen As TECH.Iterator = SamengesteldProduct.GeefKindBouwsteenIterator()
+		While (KindBouwstenen.HasNext()) {
+			#dim BS As DOM.PM.KindBouwsteen = KindBouwstenen.Next()
+		
+			If ($IsObject(BS) && BS.%Extends("DOM.PM.KindBouwsteen")) && (BS.GeefAantal() > 0) {
+				#dim Aantal = 0
+			
+				If ##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock() '= BS.GeefProduct().GeefLinkType() {
+					If (KinderenMetAantal.IsDefined(BS.GeefPRNr()))
+					{
+						Set Aantal = KinderenMetAantal.GetAt(BS.GeefPRNr())
+					}
+					Do KinderenMetAantal.SetAt(Aantal + BS.GeefAantal(), BS.GeefPRNr())
+				}
+			}
+		}
+		Quit KinderenMetAantal
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml
===================================================================
diff -u -r33658 -r33659
--- APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml	(.../StockNiveauOverKinderenProdResService.cls.xml)	(revision 33658)
+++ APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml	(.../StockNiveauOverKinderenProdResService.cls.xml)	(revision 33659)
@@ -87,26 +87,7 @@
 <Method name="GeefKinderenMetAantal">
 <Private>1</Private>
 <ReturnType>%ArrayOfDataTypes</ReturnType>
-<Implementation><![CDATA[
-	#dim KinderenMetAantal As %ArrayOfDataTypes = ##class(%ArrayOfDataTypes).%New()
-	#dim BSLabel As %String = $Order(^PRBS("BS",..PRNr,""))
-	While (BSLabel '= "") {
-		#dim BS As DOM.PM.KindBouwsteen = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefSamengesteldProduct(..PRNr).GeefBouwsteen(BSLabel)
-		
-		If ($IsObject(BS) && BS.%Extends("DOM.PM.KindBouwsteen")) && (BS.GeefAantal() > 0) {
-			#dim Aantal = 0
-			
-			If ##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock() '= BS.GeefProduct().GeefLinkType() {
-				If (KinderenMetAantal.IsDefined(BS.GeefPRNr()))
-				{
-					Set Aantal = KinderenMetAantal.GetAt(BS.GeefPRNr())
-				}
-				Do KinderenMetAantal.SetAt(Aantal + BS.GeefAantal(), BS.GeefPRNr())
-			}
-		}
-		Set BSLabel = $Order(^PRBS("BS",..PRNr,BSLabel))
-	}
-	Quit KinderenMetAantal
+<Implementation><![CDATA[	Quit ##class(APPS.common.impl.KindProductenMetAantallenBepaler).%New().BepaalKinderen(..PRNr)
 ]]></Implementation>
 </Method>