Index: vhUnitTest/WSimpl/Halux/AAP/AfdrukService/KlantEtiketAfdrukken/Test.cls.xml
===================================================================
diff -u -r61693 -r61704
--- vhUnitTest/WSimpl/Halux/AAP/AfdrukService/KlantEtiketAfdrukken/Test.cls.xml	(.../Test.cls.xml)	(revision 61693)
+++ vhUnitTest/WSimpl/Halux/AAP/AfdrukService/KlantEtiketAfdrukken/Test.cls.xml	(.../Test.cls.xml)	(revision 61704)
@@ -3,7 +3,7 @@
 <Class name="vhUnitTest.WSimpl.Halux.AAP.AfdrukService.KlantEtiketAfdrukken.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: geen data in request -&gt; exception">
+<Method name="aTest: geen data in request -&gt; exception">
 <Implementation><![CDATA[
 	Set AfdrukService = ##class(WSimpl.Halux.AAP.AfdrukService).%New()
 	
@@ -14,6 +14,68 @@
 	Do $$$AssertEquals(Antwoord.Header.Status,"-1006")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: 1 LBX in request">
+<Implementation><![CDATA[
+	#dim DnaCodeString As %String = "LAAAAA0"
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.DnaCode = DnaCodeString
+	Set DnaCode1.BatchId = "123456"
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	
+	Set KlantEtiketAfdrukkenRequest = ##class(WS.Halux.AAP.KlantEtiketAfdrukkenRequest).%New()
+	Do KlantEtiketAfdrukkenRequest.DnaCodes.Insert(DnaCodeString)
+	
+	Set EtikettenAfdrukkenHelperMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper).%New()
+	Do EtikettenAfdrukkenHelperMock.VerwachtMethodCall("MaakDnaCodeIteratorVanDnaCodeStringLijst",KlantEtiketAfdrukkenRequest.DnaCodes).DanReturn(DnaCodeIteratorEenStuk)
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Legrabox())
+	Do BatchStub.IndienMethodCall("GeefProductieGroep").DanReturn("")
+
+	Set BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	Do BatchServiceMock.VerwachtMethodCall("BestaatBatch",DnaCode1.BatchId).DanReturn($$$True)
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",DnaCode1.BatchId).DanReturn(BatchStub)
+	
+	Set PrinterMock = ##class(vhTest.Mock.APPS.Halux.PPS.AansturingActie.common.KlantEtiket.Printer).%New()
+	Do PrinterMock.VerwachtMethodCall("PrintKlantEtiket",BatchStub,"",..Matches.Object(DnaCodeIteratorEenStuk)).DanDoeNiks()
+	
+	Set PrinterFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.impl.AansturingActie.common.KlantEtiket.PrinterFactory).%New()
+	Do PrinterFactoryMock.VerwachtMethodCall("GeefKlantEtiketPrinter",BatchStub).DanReturn(PrinterMock)
+	
+	Set AfdrukService = ##class(WSimpl.Halux.AAP.AfdrukService).%New(,,EtikettenAfdrukkenHelperMock,BatchServiceMock,PrinterFactoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.KlantEtiketAfdrukkenResponse = AfdrukService.KlantEtiketAfdrukken(KlantEtiketAfdrukkenRequest)
+	
+	Do EtikettenAfdrukkenHelperMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
+	Do PrinterMock.Verifieer()
+	Do PrinterFactoryMock.Verifieer()
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Batch bestaat niet">
+</Method>
+
+<Method name="Test: 1 TAX in request">
+</Method>
+
+<Method name="Test: 1 TAX - LC in request">
+</Method>
+
+<Method name="Test: 2 LBX in request">
+</Method>
+
+<Method name="Test: 2 TAX in request">
+</Method>
+
+<Method name="Test: 2 TAX - LC in request">
+</Method>
+
+<Method name="Test: 2 LBX en 2 TAX en 2 TAX - LC in request">
+</Method>
 </Class>
 
 
Index: WSimpl/Halux/AAP/AfdrukService.cls.xml
===================================================================
diff -u -r61693 -r61704
--- WSimpl/Halux/AAP/AfdrukService.cls.xml	(.../AfdrukService.cls.xml)	(revision 61693)
+++ WSimpl/Halux/AAP/AfdrukService.cls.xml	(.../AfdrukService.cls.xml)	(revision 61704)
@@ -34,7 +34,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",DocsV1:BL.PPS.TBX.DocsV1="",EtiketAfdrukkenHelper:WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper,BatchService:APPS.Halux.common.impl.BatchService=""</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",DocsV1:BL.PPS.TBX.DocsV1="",EtiketAfdrukkenHelper:WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper,BatchService:APPS.Halux.common.impl.BatchService="",PrinterFactory:APPS.Halux.PPS.impl.AansturingActie.common.KlantEtiket.PrinterFactory=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -43,8 +43,8 @@
 	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())
-	Set ..PrinterFactory = ##class(APPS.Halux.PPS.impl.AansturingActie.common.KlantEtiket.PrinterFactory).%New()
+	Set ..BatchService = $$$Inject(BatchService, ##class(APPS.Halux.common.impl.BatchService).%New())
+	Set ..PrinterFactory = $$$Inject(PrinterFactory, ##class(APPS.Halux.PPS.impl.AansturingActie.common.KlantEtiket.PrinterFactory).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -135,6 +135,7 @@
 		Set Response.Header.Status = "200"
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(Tools.Wlip).%New(127).String(Exception.ToString())
 		Set Response.Header.Status = Exception.GeefExceptionCode()
 		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
 	}
@@ -179,7 +180,7 @@
 		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)
+	Quit ..BatchService.GeefBatch(BatchId)
 ]]></Implementation>
 </Method>
 
@@ -235,6 +236,7 @@
 	Do DnaCodesIteratorLijsten.Insert(KastIterator)
 	Do DnaCodesIteratorLijsten.Insert(TaorIterator)
 	Do DnaCodesIteratorLijsten.Insert(MaatwerkDnaCodesIterator)
+	Do ##class(Tools.Wlip).%New(127).String(DnaCodesIteratorLijsten.Count())
 	
 	#dim IteratorVanDnaCodesIterators As TECH.Iterator = ##class(TECH.ListIterator).%New(DnaCodesIteratorLijsten)
 	
@@ -256,11 +258,11 @@
 			//Do DnaCodeIterator.Reset()			
 			#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 Batch As APPS.Halux.common.impl.BatchImpl = ..BatchService.GeefBatch(BatchId)	
 			
 			If $$$Not(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).TAORbox()) {	
 				Set Printer = ..PrinterFactory.GeefKlantEtiketPrinter(Batch)
-				Do Printer.PrintKlantEtiket(,,DnaCodeIterator)
+				Do Printer.PrintKlantEtiket(Batch,,DnaCodeIterator)
 			} Else {
 				Set LabelPrinter = ##class(BL.Sys.LabelPrinter).%New()
 				Set BatchService = ##class(APPS.Halux.Planning.impl.BatchService).%New()