Index: CHUI/Prod/ProductLabel.cls.xml
===================================================================
diff -u -r62200 -r62206
--- CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 62200)
+++ CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 62206)
@@ -118,7 +118,6 @@
 	Do bl.Init(PRNr)
 	Set bl.DefaultLayout="Product verpak maatwerk VH 5x10"
 	
-
 	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(ORDNr)
 	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(Order.GeefPersonalityID())
 	#Dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefKlantInstellingenService(Personality)
@@ -143,7 +142,7 @@
 		if $$$HasLength(DnaCode) {
 			Set bl.pxLabel.DnaCode = DnaCode
 		} Else {
-			Set bl.pxLabel.DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(TOENr,PRNr,"")
+			Set bl.pxLabel.DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(TOENr,PRNr)
 		}
 		Do LabelPrinter.Add(bl.pxLabel)
 	}
Index: WSimpl/Halux/AAP/AfdrukService.cls.xml
===================================================================
diff -u -r62199 -r62206
--- WSimpl/Halux/AAP/AfdrukService.cls.xml	(.../AfdrukService.cls.xml)	(revision 62199)
+++ WSimpl/Halux/AAP/AfdrukService.cls.xml	(.../AfdrukService.cls.xml)	(revision 62206)
@@ -111,7 +111,7 @@
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen DnaCodes aangeleverd om af te drukken"))
 		}
 		#dim DnaCodeIterator As TECH.Iterator = ..EtiketAfdrukkenHelper.MaakDnaCodeIteratorVanDnaCodeStringLijst(ProductEtiketAfdrukkenRequest.DnaCodes)
-		
+	
 		While DnaCodeIterator.HasNext() {
 			#dim DnaCodeInfo As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
 			Do ##class(CHUI.Prod.ProductLabel).PrintVHMaatwerkMetDnaCodes(DnaCodeInfo) 
Index: vhUnitTest/WSimpl/Halux/AAP/AfdrukService/ProductEtiketAfdrukken/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/AfdrukService/ProductEtiketAfdrukken/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/AfdrukService/ProductEtiketAfdrukken/Test.cls.xml	(revision 62206)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.AfdrukService.ProductEtiketAfdrukken.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: geen data in request -&gt; exception">
+<Implementation><![CDATA[
+	Set AfdrukService = ##class(WSimpl.Halux.AAP.AfdrukService).%New()
+	
+	Set ProductEtiketAfdrukkenRequest  = ##class(WS.Halux.AAP.ProductEtiketAfdrukkenRequest).%New()
+	
+	#dim Antwoord As WS.Halux.AAP.ProductEtiketAfdrukkenResponse = AfdrukService.ProboxEtiketAfdrukken(ProductEtiketAfdrukkenRequest)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"-1006")
+]]></Implementation>
+</Method>
+
+<Method name="aTest: 1 LBX in request">
+<Implementation><![CDATA[
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.DnaCode = "LAAAAA0"
+	Set DnaCode1.BatchId = "123456"
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	
+	Set ProductEtiketAfdrukkenRequest = ##class(WS.Halux.AAP.ProductEtiketAfdrukkenRequest).%New()
+	Do ProductEtiketAfdrukkenRequest.DnaCodes.Insert(DnaCode1.DnaCode)
+	
+	Set EtikettenAfdrukkenHelperMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.AfdrukService.EtiketAfdrukkenHelper).%New()
+	Do EtikettenAfdrukkenHelperMock.VerwachtMethodCall("MaakDnaCodeIteratorVanDnaCodeStringLijst",ProductEtiketAfdrukkenRequest.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 AfdrukService = ##class(WSimpl.Halux.AAP.AfdrukService).%New(,,EtikettenAfdrukkenHelperMock)
+	
+	#dim Antwoord As WS.Halux.AAP.KlantEtiketAfdrukkenResponse = AfdrukService.ProductEtiketAfdrukken(ProductEtiketAfdrukkenRequest)
+	
+	Do EtikettenAfdrukkenHelperMock.Verifieer()
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"200")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>