Index: WSimpl/Halux/AAP/AfdrukService.cls.xml
===================================================================
diff -u -r61623 -r61624
--- WSimpl/Halux/AAP/AfdrukService.cls.xml	(.../AfdrukService.cls.xml)	(revision 61623)
+++ WSimpl/Halux/AAP/AfdrukService.cls.xml	(.../AfdrukService.cls.xml)	(revision 61624)
@@ -23,8 +23,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BatchService">
+<Type>APPS.Halux.common.impl.BatchService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",DocsV1:BL.PPS.TBX.DocsV1="",EtiketAfdrukkenHelper:WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",DocsV1:BL.PPS.TBX.DocsV1="",EtiketAfdrukkenHelper:WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper,BatchService:APPS.Halux.common.impl.BatchService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -33,6 +38,7 @@
 	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
 	Set ..DocsV1 = $$$Inject(DocsV1, ##class(BL.PPS.TBX.DocsV1).%New())
 	Set ..EtiketAfdrukkenHelper = $$$Inject(EtiketAfdrukkenHelper, ##class(WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper).%New())
+	Set ..BatchService = $$$Inject(BatchService,##class(APPS.Halux.common.impl.BatchService).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -155,20 +161,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBatchVoorDnaCode">
+<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<ReturnType>APPS.Halux.common.Batch</ReturnType>
+<Implementation><![CDATA[
+	
+	#dim BatchId As %Integer = DnaCode.BatchId
+	#dim BestaatBatch As %Boolean = ..BatchService.BestaatBatch(BatchId)
+
+	If ($$$Not(BestaatBatch)) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Batch ("_DnaCode.BatchId_")niet gevonden voor Dnacode ("_DnaCode.DnaCode_")"))
+	}
+
+	Quit ##class(APPS.Halux.common.impl.BatchService).%New().GeefBatch(BatchId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefDnaCodeLijstenPerCategorie">
 <FormalSpec>DnaCodeIterator:TECH.Iterator,KaderdeurDnaCodesLijst:%ListOfDataTypes,MatDnaCodesLijst:%ListOfDataTypes,InpakDnaCodesLijst:%ListOfDataTypes,OnbepaaldDnaCodesLijst:%ListOfDataTypes,ProductOpMaatDnaCodesLijst:%ListOfDataTypes,KastDnaCodesLijst:%ListOfDataTypes,TAORboxDnaCodesLijst:%ListOfDataTypes,MaatwerkDnaCodesLijst:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
 	Do DnaCodeIterator.Reset()
 	While DnaCodeIterator.HasNext() {
-		#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
-		#dim BatchId As %Integer = DnaCode.BatchId
-		#dim BestaatBatch As %Boolean = ##class(APPS.Halux.common.impl.BatchService).%New().BestaatBatch(BatchId)
-
-		If ($$$Not(BestaatBatch)) {
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Batch ("_DnaCode.BatchId_")niet gevonden voor Dnacode ("_DnaCode.DnaCode_")"))
-		}		
+		#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()		
+		#dim Batch As APPS.Halux.common.Batch = ..GeefBatchVoorDnaCode(DnaCode)
 		
-		#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.impl.BatchService).%New().GeefBatch(BatchId)
 		If (Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Kaderdeur()) {
 			Do KaderdeurDnaCodesLijst.Insert(DnaCode)
 		} ElseIf (Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Mat()) {
@@ -233,16 +249,14 @@
 		
 		If (DnaCodeIterator.HasNext()){
 			Do DnaCodeIterator.Reset()			
-			While DnaCodeIterator.HasNext() {				
-				#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
-				#dim BatchId As %Integer = DnaCode.BatchId
-				Set Batch = ##class(APPS.Halux.common.impl.BatchService).%New().GeefBatch(BatchId)	
-			}
-			
+			#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
+			#dim BatchId As %Integer = DnaCode.BatchId
+			Set Batch = ##class(APPS.Halux.common.impl.BatchService).%New().GeefBatch(BatchId)	
+						
 			Set Printer = PrinterFactory.GeefKlantEtiketPrinter(Batch)
 			Do Printer.PrintKlantEtiket(,,DnaCodeIterator)
 		} Else {
-			Do ##class(Tools.Wlip).%New(43).String("Geen records in Iterator")
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen records in Iterator"))
 		}
 	}
 ]]></Implementation>