Index: WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder.cls.xml
===================================================================
diff -u -r64506 -r64510
--- WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder.cls.xml	(.../ProductIdRecycleerder.cls.xml)	(revision 64506)
+++ WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder.cls.xml	(.../ProductIdRecycleerder.cls.xml)	(revision 64510)
@@ -60,8 +60,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DateTimeApi">
+<Type>TECH.DateTime.DateTimeAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",ProductApi:DOM.PM.ProductAPI="",Console:TECH.Console.Console="",Logger:vhLib.Logger=""</FormalSpec>
+<FormalSpec>LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",ProductApi:DOM.PM.ProductAPI="",Console:TECH.Console.Console="",Logger:vhLib.Logger="",DateTimeApi:TECH.DateTime.DateTimeAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -71,6 +76,7 @@
 	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
 	Set ..Console = $$$Inject(Console, ##class(TECH.Console.impl.TerminalConsole).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New("ProductIdRecycleerder"))
+	Set ..DateTimeApi = $$$Inject(DateTimeApi, ##class(TECH.DateTime.impl.DateTimeAPI).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -298,7 +304,7 @@
 		
 		If (($Data(@GlobalKey)) && (@GlobalKey = 0)) {
 			Set IsVrijeProductIdGevonden = $$$True
-			Set @GlobalKey = 1
+			Set @GlobalKey = 1 _ "\" _ ..DateTimeApi.CurrentHorolog()
 		}
 	}
 	
@@ -354,7 +360,7 @@
 		Set GlobalKey = ..GlobalNaam_"("""_LadeVariant_""","_ProductId_")"
 		
 		If ($Data(@GlobalKey)) {
-			If (@GlobalKey = 1) {
+			If ($Piece(@GlobalKey, "\") = 1) {
 				Set AantalVrijePlaatsenInRangeVolgensLadeVariant = AantalVrijePlaatsenInRangeVolgensLadeVariant - 1
 			}
 		} Else {
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder/Test.cls.xml
===================================================================
diff -u -r64505 -r64510
--- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder/Test.cls.xml	(.../Test.cls.xml)	(revision 64505)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder/Test.cls.xml	(.../Test.cls.xml)	(revision 64510)
@@ -520,7 +520,8 @@
 		Set ProductId = (1000 + ProductIdTiental + Count)
 		Set VerwachteDataProductId = $Extract(VerwachteVolledigdeDataString, (Count + 1))
 		Set GlobalKey = ..#GlobalNaam_"("""_LadeVariant_""","_ProductId_")"
-		Do $$$AssertEquals(@GlobalKey, VerwachteDataProductId)
+		Do $$$AssertEquals($Piece(@GlobalKey,"\"), VerwachteDataProductId)
+		// NOTA: Enkel de 1e piece van de data wordt hier ge-assert, wat een true (1 = bezet) of false (0 = beschikbaar) voorstelt. De 2e piece (Horolog) wordt elders getest.
 	}
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder.cls.xml
===================================================================
diff -u -r64496 -r64510
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder.cls.xml	(.../ProductIdRecycleerder.cls.xml)	(revision 64496)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/ProductIdRecycleerder.cls.xml	(.../ProductIdRecycleerder.cls.xml)	(revision 64510)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",ProductApi:DOM.PM.ProductAPI="",Console:TECH.Console.Console="",Logger:vhLib.Logger=""</FormalSpec>
+<FormalSpec>LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",ProductApi:DOM.PM.ProductAPI="",Console:TECH.Console.Console="",Logger:vhLib.Logger="",DateTimeApi:TECH.DateTime.DateTimeAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>