Index: BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator.cls.xml
===================================================================
diff -u -r68296 -r68307
--- BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator.cls.xml	(.../ProboxBarcodeEtiketGenerator.cls.xml)	(revision 68296)
+++ BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator.cls.xml	(.../ProboxBarcodeEtiketGenerator.cls.xml)	(revision 68307)
@@ -37,19 +37,22 @@
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	
-	#dim DnaCode As DOM.Halux.AAP.DnaCode
+	
  	#dim GesorteerdeDnaCodeIterator As TECH.ListIterator = ..GeefGesorteerdeDnaCodeIterator(DnaCodeIterator)
- 	#dim HuidigeLijnRefEnLadeCodePrefix As %String = ""
+ 	#dim DnaCode As DOM.Halux.AAP.DnaCode
  	#dim AantalLadesOpEtiket As %Integer = 0
  	#dim IsBarcodeLinks As %Boolean = $$$False
+ 	#dim HuidigeLijnRefEnLadeCodePrefix As %String = ""
+ 	
  	Set ProboxBarcodeLabelLijst = ##class(%ListOfDataTypes).%New()
 	While GesorteerdeDnaCodeIterator.HasNext() {
 		Set AantalLadesOpEtiket = AantalLadesOpEtiket + 1
 		Set IsBarcodeLinks = $$$Not(IsBarcodeLinks)
-		Set DnaCode = DnaCodeIterator.Next()
+		Set DnaCode = GesorteerdeDnaCodeIterator.Next()
 		If $$$Not($ListBuild(DnaCode.LijnReferentie, ..GeefLadeCodePrefix(DnaCode)) = HuidigeLijnRefEnLadeCodePrefix) {
 			Do ProboxBarcodeLabelLijst.Insert(..GenereerProboxBarcodeEtiket(DnaCode, AantalLadesOpEtiket, IsBarcodeLinks, LabelDevice))
 			Set AantalLadesOpEtiket = 0
+			Set HuidigeLijnRefEnLadeCodePrefix = $ListBuild(DnaCode.LijnReferentie, ..GeefLadeCodePrefix(DnaCode))
 		}
 	}
  	
Index: vhUnitTest/BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator/GenereerProboxBarcodeEtiketIterator/Test.cls.xml
===================================================================
diff -u -r68300 -r68307
--- vhUnitTest/BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator/GenereerProboxBarcodeEtiketIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 68300)
+++ vhUnitTest/BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator/GenereerProboxBarcodeEtiketIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 68307)
@@ -86,15 +86,36 @@
 
 <Method name="Test: Geen DnaCodeIterator meegegeven">
 <Implementation><![CDATA[
-	Set ProboxInhoudEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxBarcodeEtiketGenerator).%New()
+	Set ProboxBarcodeEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxBarcodeEtiketGenerator).%New(..ProductAPIStub, ..ToeleveringServiceStub)
 	
 	#dim Substring = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Dna codes meegegeven.")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substring))
 	
-	Do ProboxInhoudEtiketGenerator.GenereerProboxBarcodeEtiketIterator(..EmptyIterator())
+	Do ProboxBarcodeEtiketGenerator.GenereerProboxBarcodeEtiketIterator(..EmptyIterator())
 ]]></Implementation>
 </Method>
 
+<Method name="Test: DnaCodeIterator met 1 DnaCode meegegeven geeft 1 etiket">
+<Implementation><![CDATA[
+	#dim Aantal As %Integer = 1
+	#dim DnaCodeIterator = ..GenereerIteratorMetAantalDnaCodes(Aantal)
+	
+	Set ProboxBarcodeEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxBarcodeEtiketGenerator).%New(..ProductAPIStub, ..ToeleveringServiceStub)
+	#dim EtiketIterator As TECH.ListIterator = ProboxBarcodeEtiketGenerator.GenereerProboxBarcodeEtiketIterator(DnaCodeIterator, ..Device)
+	
+	Do ..AssertEtiketIteratorMetEenDnaCode(EtiketIterator)
+]]></Implementation>
+</Method>
+
+<Method name="AssertEtiketIteratorMetEenDnaCode">
+<FormalSpec>EtiketIterator:TECH.ListIterator</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..AssertEtiket(EtiketIterator.Next(), 1, ..#LijnReferentie1, $$$True)
+	Do $$$AssertFalse(EtiketIterator.HasNext())
+]]></Implementation>
+</Method>
+
 <Method name="AssertEtiket">
 <FormalSpec>Etiket:BL.Etiket.ProboxBarcode,AantalLades:%Integer,LijnReferentie:%String,IsBarcodeLinks:%Boolean</FormalSpec>
 <Private>1</Private>