Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r61365 -r61681
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61365)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61681)
@@ -212,7 +212,7 @@
 </Method>
 
 <Method name="GeefVolgendeAfTeDrukkenDnaCode">
-<FormalSpec>ToeleveringID:%String,ProductID:%String,SequentieNummer:%String=""</FormalSpec>
+<FormalSpec>ToeleveringID:%String,ProductID:%String,SequentieNummer:%String="",Herafdruk:%Boolean=$$$False,BatchId:%String=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If $$$Not(..ProjectSettingsApi.IsActiefDnaCodeOpEtiket()) {
@@ -223,11 +223,19 @@
 	}
 	#dim Result As %String = ""
 	#dim DnaCodeIterator As TECH.Iterator
-	Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnStatus(ToeleveringID,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch())
+	Do ##class(Tools.Wlip).%New(127).String("Herafdruk = "_Herafdruk_"/"_BatchId_"/"_SequentieNummer)
+	If Herafdruk {
+		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(BatchId, SequentieNummer)
+	} Else {
+		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnStatus(ToeleveringID,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch())
+	}
+	
 	#dim DnaCode As DOM.Halux.AAP.DnaCode = ""
 	While DnaCodeIterator.HasNext() {
 		Set DnaCode = DnaCodeIterator.Next()
 		If ((DnaCode.AfdrukTijdstip = "") && (DnaCode.ProductNummer = ProductID)) {
+			Do ##class(Tools.Wlip).%New(127).String("seq nummer = "_SequentieNummer)
+			Do ##class(Tools.Wlip).%New(127).Stack()
 			Set DnaCode.SequentieNummer = SequentieNummer
 			Set DnaCode.AfdrukTijdstip = ..DateTimeApi.CurrentHorolog()
 			Do ..DnaCodeRepository.Bewaar(DnaCode)