Index: APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml
===================================================================
diff -u -r33653 -r33658
--- APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml	(.../StockNiveauOverKinderenProdResService.cls.xml)	(revision 33653)
+++ APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml	(.../StockNiveauOverKinderenProdResService.cls.xml)	(revision 33658)
@@ -91,16 +91,17 @@
 	#dim KinderenMetAantal As %ArrayOfDataTypes = ##class(%ArrayOfDataTypes).%New()
 	#dim BSLabel As %String = $Order(^PRBS("BS",..PRNr,""))
 	While (BSLabel '= "") {
-		If ($Piece(^PRBS("BS",..PRNr,BSLabel),"\",3) = "K") && ($Piece(^PRBS("BS",..PRNr,BSLabel),"\",2) > 0) {
+		#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
-			#dim ProductID = $Piece(^PRBS("BS",..PRNr,BSLabel),"\",1)
 			
-			If ##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock() '= $piece( ^KPR(ProductID, 0), "\", 23 ) {
-				If (KinderenMetAantal.IsDefined(ProductID))
+			If ##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock() '= BS.GeefProduct().GeefLinkType() {
+				If (KinderenMetAantal.IsDefined(BS.GeefPRNr()))
 				{
-					Set Aantal = KinderenMetAantal.GetAt(ProductID)
+					Set Aantal = KinderenMetAantal.GetAt(BS.GeefPRNr())
 				}
-				Do KinderenMetAantal.SetAt(Aantal + $Piece(^PRBS("BS",..PRNr,BSLabel),"\",2), ProductID)
+				Do KinderenMetAantal.SetAt(Aantal + BS.GeefAantal(), BS.GeefPRNr())
 			}
 		}
 		Set BSLabel = $Order(^PRBS("BS",..PRNr,BSLabel))
Index: DOM/PM/KindBouwsteen.cls.xml
===================================================================
diff -u -r29059 -r33658
--- DOM/PM/KindBouwsteen.cls.xml	(.../KindBouwsteen.cls.xml)	(revision 29059)
+++ DOM/PM/KindBouwsteen.cls.xml	(.../KindBouwsteen.cls.xml)	(revision 33658)
@@ -21,6 +21,11 @@
 <ReturnType>DOM.PM.Product</ReturnType>
 </Method>
 
+<Method name="GeefPRNr">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="GeefInkortbaarOptie">
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.Bouwstenen.enu.InkortbaarOptie</ReturnType>
Index: vhTest/Mock/DOM/PM/KindBouwsteen.cls.xml
===================================================================
diff -u -r29059 -r33658
--- vhTest/Mock/DOM/PM/KindBouwsteen.cls.xml	(.../KindBouwsteen.cls.xml)	(revision 29059)
+++ vhTest/Mock/DOM/PM/KindBouwsteen.cls.xml	(.../KindBouwsteen.cls.xml)	(revision 33658)
@@ -21,6 +21,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPRNr">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPRNr")
+]]></Implementation>
+</Method>
+
 <Method name="GeefProduct">
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProduct")