Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r72898 -r73584
--- DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 72898)
+++ DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 73584)
@@ -158,6 +158,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaToeleveringEnSequentienummer">
+<FormalSpec>BatchId:%String,Sequentienummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("Toelevering = ? and Sequentienummer = ?", $LB(BatchId, Sequentienummer))
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaDnaCodeEnRecent">
 <FormalSpec>DnaCode:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
Index: vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r72861 -r73584
--- vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 72861)
+++ vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 73584)
@@ -19,6 +19,13 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="ZoekViaToeleveringEnSequentienummer">
+<FormalSpec>BatchId:%String,Sequentienummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent">
 <FormalSpec>ToeleveringId:%String,SequentieNummer:%String,ProductNummer:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/GeefVolgendeAfTeDrukkenDnaCode/Test.cls.xml
===================================================================
diff -u -r63689 -r73584
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/GeefVolgendeAfTeDrukkenDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 63689)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/GeefVolgendeAfTeDrukkenDnaCode/Test.cls.xml	(.../Test.cls.xml)	(revision 73584)
@@ -271,7 +271,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Afdruk KlantEtiketSpaceStep met nog niet ingevulde afdrukdatum -&gt; ok">
+<Method name="Test: Afdruk KlantEtiketSpaceStep met herafdruk">
 <Implementation><![CDATA[
 	#dim ToeleveringId As %String = "222222"
 	#dim ProductNummer As %String = "1234567"
@@ -292,6 +292,28 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Afdruk KlantEtiketSpaceStep met nog niet ingevulde afdrukdatum -&gt; ok">
+<Implementation><![CDATA[
+	#dim ToeleveringId As %String = "222222"
+	#dim ProductNummer As %String = "1234567"
+	#dim SequentieNummer As %String = "1"
+	#dim BatchId As %String = ""
+	Set ..DnaCode1.ProductNummer = ProductNummer
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringEnSequentienummer",ToeleveringId,SequentieNummer).DanReturn(..DnaCodeIterator1)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",..DnaCode1).DanDoeNiks()
+	
+	Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,..ProjectSettingsAPIStub)
+	
+	#dim VolgendeDnaCode As %String = DnaCodeService.GeefVolgendeAfTeDrukkenDnaCode(ToeleveringId,ProductNummer,SequentieNummer, $$$False, BatchId, $$$True)
+	
+	Do $$$AssertEquals(VolgendeDnaCode,..DnaCode1.DnaCode)
+	
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r72861 -r73584
--- vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 72861)
+++ vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 73584)
@@ -197,6 +197,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZoekViaToeleveringEnSequentienummer">
+<FormalSpec>BatchId:%String,Sequentienummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaToeleveringEnSequentienummer",BatchId,Sequentienummer)
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaToeleveringEnToeleveringLijnId">
 <FormalSpec>ToeleveringId:%String,ToeleveringLijnId:%String</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r73121 -r73584
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 73121)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 73584)
@@ -200,6 +200,8 @@
 	#dim DnaCodeIterator As TECH.Iterator
 	If Herafdruk {
 		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(BatchId, SequentieNummer)
+	} ElseIf (IsKlantEtiketSpaceStep && (SequentieNummer > 0)) {
+		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringEnSequentienummer(ToeleveringID, SequentieNummer)
 	} Else {
 		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnStatusEnRecent(ToeleveringID,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch())
 	}
@@ -208,7 +210,7 @@
 	While DnaCodeIterator.HasNext() {
 		Set DnaCode = DnaCodeIterator.Next()
 		If ..DnaCodeServiceHelper.MagDnaCodeBijgewerktWorden(DnaCode, ProductID, Herafdruk, SequentieNummer) {
-			If $$$HasLength(SequentieNummer) {
+			If ($$$HasLength(SequentieNummer) && $$$Not(..DnaCodeServiceHelper.IsSpaceStepGeneriekProduct(DnaCode,ProductID))) {
 				Set DnaCode.SequentieNummer = SequentieNummer
 			}
 			Set DnaCode.AfdrukTijdstip = ..DateTimeAPI.CurrentHorolog()