Index: DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml
===================================================================
diff -u -r1075 -r1177
--- DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml	(.../HalffabContext.cls.xml)	(revision 1075)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml	(.../HalffabContext.cls.xml)	(revision 1177)
@@ -83,7 +83,19 @@
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.impl.BewerkingsInfo</ReturnType>
 <Implementation><![CDATA[
-	Set BewerkingsInfo = ..BewerkingsInfoTabel.GeefBewerkingsInfoDatum(..Familie,..Variant,ProductID,$Piece($H,","))
+	Set Tag = ..BerekeningsSpecificatie.GeefBerekenTag()
+	Set BewerkingsInfo = ""
+	
+	If (Tag '= "")
+	{
+		Set BewerkingsInfo = ..BewerkingsInfoTabel.GeefBewerkingsInfoTag(..Familie,..Variant,ProductID,Tag)
+	}
+	
+	If ('$IsObject(BewerkingsInfo))
+	{
+		Set BewerkingsInfo = ..BewerkingsInfoTabel.GeefBewerkingsInfoDatum(..Familie,..Variant,ProductID,$Piece($H,","))
+	}
+	
 	Set BewerkingsInfo.GeefBewerkingsCalculator().NettoAfmetingHalffabrikaat = ##class(Prod.Product).GetPropViaNr(ProductID,"HFNettoLengte")
 	Quit BewerkingsInfo
 ]]></Implementation>
Index: vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml
===================================================================
diff -u -r1172 -r1177
--- vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml	(.../TestBuilders.cls.xml)	(revision 1172)
+++ vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml	(.../TestBuilders.cls.xml)	(revision 1177)
@@ -21,7 +21,7 @@
 	Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(1,KlantID,Personality,"UnitTest")
 	Set Context=##class(vhUnitTest.DOM.PM.Maatwerk.OLM.impl.UTContext).%New(Familie,Variant,BerekeningsSpecificatie)
 	
-	Set PRNr = 191579 //202630
+	Set PRNr = 191579
 	Set LengteOrigineelProduct = 1000
 	Do ##class(Prod.Product).SetPropViaNr(PRNr,"HFNettoLengte",LengteOrigineelProduct)
 	
@@ -88,14 +88,24 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set HalffabSpec = ##class(DOM.PM.Maatwerk.Calc.HF.impl.HalffabSpecInfo).%New(##class(DOM.PM.enu.Familie).Orgalux(),##class(DOM.PM.enu.OrgaluxVariant).OpMaat(),"DOM.PM.Maatwerk.Calc.HF.impl.OLM.SpecOpMaatv001","UnitTest")
-	Quit HalffabSpec.%Save()
+	Set Status = HalffabSpec.%Save()
+	
+	If ($$$ISOK(Status))
+	{
+		Set Calculator = ##class(DOM.PM.Maatwerk.Calc.HF.impl.StandaardContinuFlowCalculator).%New(0,3,0.2,0)
+		Set BewerkingsInfo = ##class(DOM.PM.Maatwerk.Calc.HF.impl.BewerkingsInfo).%New(##class(DOM.PM.enu.Familie).Orgalux(),##class(DOM.PM.enu.OrgaluxVariant).OpMaat(),191579,Calculator,"UnitTest")
+		Set Status = BewerkingsInfo.%Save()
+	}
+	
+	Quit Status
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	&SQL(DELETE FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Tag = "UnitTest")
+	&SQL(DELETE FROM DOM_PM_Maatwerk_Calc_HF_impl.BewerkingsInfo WHERE Tag = "UnitTest")
 	Quit $$$OK
 ]]></Implementation>
 </Method>