Index: vhTest/Mock/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml
===================================================================
diff -u -r66777 -r66791
--- vhTest/Mock/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66777)
+++ vhTest/Mock/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66791)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>DnaCodeGenerator:APPS.Halux.AAP.DnaCodeGenerator="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",ProductAPI:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>DnaCodeGenerator:APPS.Halux.AAP.DnaCodeGenerator="",DnaCodeRepository:APPS.Halux.AAP.DnaCodeGenerator="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",ProductAPI:DOM.PM.ProductAPI="",IngegevenKenmerkenSpaceStepHelper:DOM.PM.Maatwerk.Calc.Common.impl.IngegevenKenmerkenSpaceStepHelper=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml
===================================================================
diff -u -r66789 -r66791
--- APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66789)
+++ APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66791)
@@ -87,8 +87,22 @@
 <FormalSpec>ToeleveringLijn:DOM.AKP.ProductToeleveringLijn,Batch:APPS.Halux.common.impl.BatchImpl</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
-	
+	#dim ProductID As %String = ToeleveringLijn.GeefProductID()
+	#dim Toelevering As DOM.AKP.Toelevering = ToeleveringLijn.GeefToelevering()
+	#dim DnaCode As DOM.Halux.AAP.DnaCode = ..MaakGeneriekeDnaCodeVoorToeleveringLijn(ToeleveringLijn, Batch)
+
+	If ..ProductTypeAPI.IsLegraboxProduct(ProductID) {
+		Set DnaCode.ProductNummer = ##class(DOM.PM.Maatwerk.enu.GenerischProductID).LBXSSTV1()
+	}
+	ElseIf ..ProductTypeAPI.IsTandemboxProduct(ProductID) {
+		Set DnaCode.ProductNummer = ##class(DOM.PM.Maatwerk.enu.GenerischProductID).TBXSSTV1()
+	}
+	ElseIf ..ProductTypeAPI.IsTAORboxProduct(ProductID) {
+		Set DnaCode.ProductNummer = ##class(DOM.PM.Maatwerk.enu.GenerischProductID).TAORSSTV1()
+	} Else {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("SpaceStep voor MVX genereert nog geen DnaCodes!"))
+	}
+
 	Do ..DnaCodeRepository.Bewaar(DnaCode)
 ]]></Implementation>
 </Method>
@@ -103,6 +117,7 @@
 	
 	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode.ProductNummer = ProductID
+
 	Set DnaCode.DnaCode = ..DnaCodeGenerator.GenereerDnaCode(..ProductTypeAPI.GeefProductTypePrefix(ProductID))
 	Set DnaCode.Toelevering = Toelevering.GeefID()
 	Set DnaCode.KlantNummer = Toelevering.GeefKlantID()