Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r59271 -r59274
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 59271)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 59274)
@@ -188,18 +188,15 @@
 <FormalSpec>ToeleveringID:%String,ProductID:%String,SequentieNummer:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(127).String(..ProjectSettingsApi.IsActiefDnaCodeOpEtiket())
 	If $$$Not(..ProjectSettingsApi.IsActiefDnaCodeOpEtiket()) {
 		Quit ""
 	}
 	#dim Result As %String = ""
 	#dim DnaCodeIterator As TECH.Iterator
-	Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringId(ToeleveringID)
+	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()
-		Do ##class(Tools.Wlip).%New(127).String(DnaCode.AfdrukTijdstip)
-		Do ##class(Tools.Wlip).%New(127).String(DnaCode.ProductNummer)
 		If ((DnaCode.AfdrukTijdstip = "") && (DnaCode.ProductNummer = ProductID)) {
 			Set DnaCode.SequentieNummer = SequentieNummer
 			Set DnaCode.AfdrukTijdstip = ..DateTimeApi.CurrentHorolog()