Index: WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper.cls.xml
===================================================================
diff -u -r60495 -r60628
--- WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper.cls.xml	(.../EtiketAfdrukkenHelper.cls.xml)	(revision 60495)
+++ WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper.cls.xml	(.../EtiketAfdrukkenHelper.cls.xml)	(revision 60628)
@@ -34,18 +34,59 @@
 	Set DnaCodeAsStringIterator = ##class(TECH.ListIterator).%New(DnaCodeStringLijst)
 	
 	Quit:$$$Not(DnaCodeAsStringIterator.HasNext())
-	
+
 	#dim LijstMetDnaCodes = ##class(%ListOfDataTypes).%New()
 	#dim DnaCode As DOM.Halux.AAP.DnaCode
 	While DnaCodeAsStringIterator.HasNext() {
-		Set DnaCode = ..DnaCodeRepository.ZoekViaDnaCode(DnaCodeAsStringIterator.Next()).Next()
-		Do LijstMetDnaCodes.Insert(DnaCode)
+		#dim DnaCodeId AS %String = DnaCodeAsStringIterator.Next()
+		#dim dnaIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaDnaCode(DnaCodeId)
+		
+		If (dnaIterator.HasNext()) {
+			Set DnaCode = dnaIterator.Next()
+			Do LijstMetDnaCodes.Insert(DnaCode)
+		}	
 	}
-	
+
 	Quit ##class(TECH.ListIterator).%New(LijstMetDnaCodes)
 ]]></Implementation>
 </Method>
 
+<Method name="MaakBatchIdIteratorVoorDnaCodes">
+<FormalSpec>DnaCodeIterator:TECH.Iterator</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim LijstMetBatchIds = ##class(%ListOfDataTypes).%New()
+	#dim DnaCode As DOM.Halux.AAP.DnaCode
+	
+	While DnaCodeIterator.HasNext() {
+		Set DnaCode = DnaCodeIterator.Next()
+		If (LijstMetBatchIds.Find(DnaCode.BatchId) = "") {
+			Do LijstMetBatchIds.Insert(DnaCode.BatchId)
+		}		
+	}
+		
+	Quit ##class(TECH.ListIterator).%New(LijstMetBatchIds)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDnaCodesVoorBatchId">
+<FormalSpec>DnaCodeIterator:TECH.Iterator,BatchId:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim DnaCodesVoorBatchId = ##class(%ListOfDataTypes).%New()
+	#dim DnaCode As DOM.Halux.AAP.DnaCode
+	
+	While DnaCodeIterator.HasNext() {
+		Set DnaCode = DnaCodeIterator.Next()
+		If (DnaCode.BatchId = BatchId) {
+			Do DnaCodesVoorBatchId.Insert(DnaCode.BatchId)
+		}
+	}
+		
+	Quit ##class(TECH.ListIterator).%New(DnaCodesVoorBatchId)
+]]></Implementation>
+</Method>
+
 <Method name="MapProductieLijnOpPrinter">
 <FormalSpec>Werkpost:%String</FormalSpec>
 <ReturnType>%String</ReturnType>