Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r63344 -r63349
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 63344)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 63349)
@@ -220,7 +220,17 @@
 	#dim ProductID As %String = ToeleveringLijn.GeefProductID()
 	#dim Toelevering As DOM.AKP.Toelevering= ToeleveringLijn.GeefToelevering()
 	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode.ProductNummer = ##class(DOM.PM.Maatwerk.enu.GenerischProductID).LBXSSTV1()
+	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!"))
+	}
 	Set DnaCode.DnaCode = ..DnaCodeGenerator.GenereerDnaCode("O")
 	Set DnaCode.Toelevering = Toelevering.GeefID()
 	Set DnaCode.KlantNummer = Toelevering.GeefKlantID()
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml
===================================================================
diff -u -r63344 -r63349
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 63344)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 63349)
@@ -38,6 +38,9 @@
 	Do ##super(aTestName)
 	Set ..ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
 	Do ..ProductTypeApiStub.IndienMethodCall("GeefProductTypePrefix", $$$ElkeWaarde).DanReturn("L")
+	Do ..ProductTypeApiStub.IndienMethodCall("IsLegraboxProduct", 1000).DanReturn($$$True)
+	Do ..ProductTypeApiStub.IndienMethodCall("IsTandemboxProduct", 1000).DanReturn($$$True)
+	Do ..ProductTypeApiStub.IndienMethodCall("IsTAORboxProduct", 1000).DanReturn($$$True)
 	Set ..DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New()
 	Do ..DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3")
 	Do ..DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","O").DanReturn("OAAAAA3")
@@ -264,6 +267,41 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Spacestep MVX geeft exceptie">
+<Implementation><![CDATA[
+	#dim Toelevering As DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).ToeleveringMetLijn()
+	
+	Do ..Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering))
+	
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken = ##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken).DummyLade()
+	
+	Do ..ProductTypeApiStub.IndienMethodCall("IsLegraboxProduct", 1000).DanReturn($$$False)
+	Do ..ProductTypeApiStub.IndienMethodCall("IsTandemboxProduct", 1000).DanReturn($$$False)
+	Do ..ProductTypeApiStub.IndienMethodCall("IsTAORboxProduct", 1000).DanReturn($$$False)
+	
+	Set ..ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Set ProductStub = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
+	Do ProductStub.IndienMethodCall("GeefDottedDossierCode").DanReturn("A.BC.DE.F")
+	Do ProductStub.IndienMethodCall("GeefID").DanReturn(1000)
+	Do ProductStub.IndienMethodCall("GeefIngegevenKenmerken").DanReturn(IngegevenKenmerken)
+	Do ..ProductApiStub.IndienMethodCall("GeefProduct",1000).DanReturn(ProductStub)
+	
+	#Dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("SpaceStep voor MVX genereert nog geen DnaCodes!")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.UnimplementedException, Substrings))
+	
+	Do ..IngegevenKenmerkenSpaceStepHelperStub.IndienMethodCall("IsSpaceStep",IngegevenKenmerken).DanReturn($$$True)
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub,, ..ProductApiStub,,,,..IngegevenKenmerkenSpaceStepHelperStub)
+	#dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch)
+	
+	Do $$$AssertEquals(DnaCodes.Count(),1)
+	Do $$$AssertEquals(DnaCodes.GetAt(1).Lijn,..LijnId)
+	Do $$$AssertEquals(DnaCodes.GetAt(1).Status,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch())
+	Do $$$AssertEquals(DnaCodes.GetAt(1).IsWegwerpPallet,$$$True)
+	Do $$$AssertEquals(DnaCodes.GetAt(1).LadeCode,"A.BC.DE.F")
+]]></Implementation>
+</Method>
 </Class>