Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r71890 -r74747
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 71890)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 74747)
@@ -200,6 +200,8 @@
 	#dim DnaCodeIterator As TECH.Iterator
 	If Herafdruk {
 		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(BatchId, SequentieNummer)
+	} ElseIf (IsKlantEtiketSpaceStep && (SequentieNummer > 0)) {
+		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringEnSequentienummerEnRecent(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()
@@ -227,15 +229,37 @@
 </Method>
 
 <Method name="VulInSequentieId">
-<FormalSpec>SequentieId:%String,BatchId:%String,ToeleveringId:%String,ToeleveringlijnId:%String</FormalSpec>
+<FormalSpec>SequentieId:%String,BatchId:%String,ToeleveringId:%String,ToeleveringlijnId:%String,ProductId:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Try {
 		Do ..Logger.Info("APPS.Halux.AAP.DnaCodeService", "VulInSequentieId voor "_SequentieId_ "/" _BatchId_" / "_ToeleveringId_" / "_ToeleveringlijnId_".")
-		#dim DnaCodeIterator = ..DnaCodeRepository.ZoekVolgendeMetLeegSequentieItem(BatchId, ToeleveringId, ToeleveringlijnId)
+		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekVolgendeMetLeegSequentieItem(BatchId, ToeleveringId, ToeleveringlijnId)
+		
 		If DnaCodeIterator.HasNext() {
 			#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
 			Set DnaCode.SequentieNummer = SequentieId
 			Do ..DnaCodeRepository.Bewaar(DnaCode)
+			
+			#dim Product As DOM.PM.Product = ..ProductAPI.GeefProduct(ProductId)
+			If (DnaCodeIterator.HasNext() && (Product.%Extends("DOM.PM.MaatwerkProduct"))) {
+				#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = Product.GeefIngegevenKenmerken()
+				
+				If (..IngegevenKenmerkenSpaceStepHelper.IsSpaceStep(IngegevenKenmerken)) {
+					#dim Gevonden As %Boolean = $$$False
+					#dim VolgendeDnaCode As DOM.Halux.AAP.DnaCode = ""
+			
+					While (DnaCodeIterator.HasNext() && $$$Not(Gevonden)) {
+						Set VolgendeDnaCode = DnaCodeIterator.Next()
+						
+						If ($$$Not(##class(TECH.StringUtils).StartsWith(VolgendeDnaCode.DnaCode, $Extract(DnaCode.DnaCode, 1)))) {
+							Set VolgendeDnaCode.SequentieNummer = SequentieId
+							Do ..DnaCodeRepository.Bewaar(VolgendeDnaCode)
+							Set Gevonden = $$$True
+						}
+					}					
+				}
+			}
+			
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -285,6 +309,93 @@
 	Quit DnaCode
 ]]></Implementation>
 </Method>
+
+<Method name="GeefDnaCodesViaBatchIdEnSequentienummer">
+<FormalSpec>BatchId:%String,Sequentienummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(BatchId, Sequentienummer)
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantalVanProductOpPallet">
+<FormalSpec>ProdutNummer:%String,PalletCode:%String</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	#dim Aantal As %Integer = 0
+	#dim DnaCodeIterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode)
+	#dim DnaCode As DOM.Halux.AAP.DnaCode
+	
+	While DnaCodeIterator.HasNext() {
+		Set DnaCode = DnaCodeIterator.Next()
+		Set:(DnaCode.ProductNummer = ProdutNummer) Aantal = Aantal + 1
+	}
+	
+	Quit Aantal
+]]></Implementation>
+</Method>
+
+<Method name="GeefPalletKantABVoorProduct">
+<FormalSpec>ProductNummer:%String,PalletCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim PalletKantAB = ""
+	
+	Try {
+		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode)
+		#dim DnaCode As DOM.Halux.AAP.DnaCode
+		
+		While DnaCodeIterator.HasNext() {
+			Set DnaCode = DnaCodeIterator.Next()
+			
+			If ((DnaCode.ProductNummer = ProductNummer) && ..IsABPalletCode(DnaCode.PalletCode) && $$$Not(##class(TECH.StringUtils).Contains(PalletKantAB, $Extract(DnaCode.PalletCode, 9)))) {
+				Set PalletKantAB = PalletKantAB _ $Extract(DnaCode.PalletCode, 9)
+			}
+		}
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ..Logger.Error("APPS.Halux.AAP.DnaCodeService", Exception)
+	}
+	
+	Quit PalletKantAB
+]]></Implementation>
+</Method>
+
+<Method name="IsIngekortePalletCodeVanABPallet">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#Dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode)
+	Quit:$$$Not(DnaCodeIterator.HasNext()) $$$False
+	
+	#Dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
+	Quit ..IsABPalletCode(DnaCode.PalletCode)
+]]></Implementation>
+</Method>
+
+<Method name="IsABPalletCode">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (($Length(PalletCode) = 9) && (($Extract(PalletCode, 9) = "A") || ($Extract(PalletCode, 9) = "B")))
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductieLijnVoorPallet">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	#dim DnaCodeIterator = ..DnaCodeRepository.ZoekAlleRecenteViaPalletCode(PalletCode)
+	#dim DnaCode As DOM.Halux.AAP.DnaCode
+	#dim Lijn As %Integer = ""
+	
+	If DnaCodeIterator.HasNext() {
+		Set DnaCode = DnaCodeIterator.Next()
+		Set Lijn = DnaCode.Lijn
+	}
+	
+	Quit Lijn
+]]></Implementation>
+</Method>
 </Class>