Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper/ProbeerEchteVhossIdTeBepalenNietTbx/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper/ProbeerEchteVhossIdTeBepalenNietTbx/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper/ProbeerEchteVhossIdTeBepalenNietTbx/Test.cls.xml	(revision 62605)
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper.ProbeerEchteVhossIdTeBepalenNietTbx.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: intern vhoss id al gelink aan echte vhossid">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "1"
+	#dim EchtVhossId = "O100000042"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",$H,EchtVhossId,SequentieNummer,BatchId)
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.TaorboxBatch).%New()
+	Do BatchStub.IndienMethodCall("GeefID").DanReturn(BatchId)
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Legrabox())
+	
+	#dim ProductieSequentieItem1 As APPS.Halux.common.VHOSSProductieSequentieItem= ..MaakProductieSequentieItem(1,42,BatchId)
+	
+	Set ProductieSequentie = ##class(APPS.Halux.common.ProductieSequentie).%New(BatchStub)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem1)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1))
+	
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New(DnaCodeRepositoryMock)
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId, ProductieSequentie)
+	
+	Do $$$AssertEquals(Antwoord,EchtVhossId)
+]]></Implementation>
+</Method>
+
+<Method name="Test: intern vhoss id nog niet gelink aan echte vhossid">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "1"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",,"",SequentieNummer,BatchId)
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.TaorboxBatch).%New()
+	Do BatchStub.IndienMethodCall("GeefID").DanReturn(BatchId)
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Legrabox())
+	
+	#dim ProductieSequentieItem1 As APPS.Halux.common.VHOSSProductieSequentieItem= ..MaakProductieSequentieItem(1,42,BatchId)
+	
+	Set ProductieSequentie = ##class(APPS.Halux.common.ProductieSequentie).%New(BatchStub)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem1)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1))
+	
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New(DnaCodeRepositoryMock)
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId, ProductieSequentie)
+	
+	Do $$$AssertEquals(Antwoord,"1")
+]]></Implementation>
+</Method>
+
+<Method name="Test: geen zinvolle dnacodes gevonden -&gt; return internvhossid">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "1"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",,"",SequentieNummer,BatchId)
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.TaorboxBatch).%New()
+	Do BatchStub.IndienMethodCall("GeefID").DanReturn(BatchId)
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Legrabox())
+	
+	#dim ProductieSequentieItem1 As APPS.Halux.common.VHOSSProductieSequentieItem= ..MaakProductieSequentieItem(1,42,BatchId)
+	
+	Set ProductieSequentie = ##class(APPS.Halux.common.ProductieSequentie).%New(BatchStub)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem1)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer).DanReturn(..EmptyIterator())
+	
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New(DnaCodeRepositoryMock)
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId, ProductieSequentie)
+	
+	Do $$$AssertEquals(Antwoord,InternVhossId)
+]]></Implementation>
+</Method>
+
+<Method name="Test: lege productiesequentie -&gt; return internvhossid">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "1"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",,"",SequentieNummer,BatchId)
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.TaorboxBatch).%New()
+	Do BatchStub.IndienMethodCall("GeefID").DanReturn(BatchId)
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Legrabox())
+	
+	Set ProductieSequentie = ##class(APPS.Halux.common.ProductieSequentie).%New(BatchStub)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer).DanReturn(..EmptyIterator())
+	
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New(DnaCodeRepositoryMock)
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId, ProductieSequentie)
+	
+	Do $$$AssertEquals(Antwoord,InternVhossId)
+]]></Implementation>
+</Method>
+
+<Method name="Test: juiste id uit langere productiesequentie halen (alles gescand)">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer1 = "42"
+	#dim SequentieNummer2 = "43"
+	#dim InternVhossId = "1"
+	#dim InternVhossId2 = "2"
+	#dim EchtVhossId1 = "O100000042"
+	#dim EchtVhossId2 = "O100000043"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",$H,EchtVhossId1,SequentieNummer1,BatchId)
+	#dim DnaCode2 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE2",$H,EchtVhossId2,SequentieNummer2,BatchId)
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.TaorboxBatch).%New()
+	Do BatchStub.IndienMethodCall("GeefID").DanReturn(BatchId)
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Legrabox())
+	
+	#dim ProductieSequentieItem1 As APPS.Halux.common.VHOSSProductieSequentieItem= ..MaakProductieSequentieItem(1,SequentieNummer1,BatchId)
+	#dim ProductieSequentieItem2 As APPS.Halux.common.VHOSSProductieSequentieItem= ..MaakProductieSequentieItem(2,SequentieNummer2,BatchId)
+	
+	Set ProductieSequentie = ##class(APPS.Halux.common.ProductieSequentie).%New(BatchStub)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem1)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem2)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer1).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1))
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer2).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode2))
+	
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New(DnaCodeRepositoryMock)
+	
+	Do $$$AssertEquals(Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId, ProductieSequentie),EchtVhossId1)
+	Do $$$AssertEquals(Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId2, ProductieSequentie),EchtVhossId2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: juiste id uit langere productiesequentie halen (deels gescand)">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer1 = "42"
+	#dim SequentieNummer2 = "43"
+	#dim InternVhossId = "1"
+	#dim InternVhossId2 = "2"
+	#dim EchtVhossId1 = "O100000042"
+	#dim EchtVhossId2 = "O100000043"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",$H,EchtVhossId1,SequentieNummer1,BatchId)
+	#dim DnaCode2 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE2",,"",SequentieNummer2,BatchId)
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.TaorboxBatch).%New()
+	Do BatchStub.IndienMethodCall("GeefID").DanReturn(BatchId)
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Legrabox())
+	
+	#dim ProductieSequentieItem1 As APPS.Halux.common.VHOSSProductieSequentieItem= ..MaakProductieSequentieItem(1,SequentieNummer1,BatchId)
+	#dim ProductieSequentieItem2 As APPS.Halux.common.VHOSSProductieSequentieItem= ..MaakProductieSequentieItem(2,SequentieNummer2,BatchId)
+	
+	Set ProductieSequentie = ##class(APPS.Halux.common.ProductieSequentie).%New(BatchStub)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem1)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem2)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer1).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1))
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",BatchId,SequentieNummer2).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode2))
+	
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New(DnaCodeRepositoryMock)
+	
+	Do $$$AssertEquals(Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId, ProductieSequentie),EchtVhossId1)
+	Do $$$AssertEquals(Helper.ProbeerEchteVhossIdTeBepalenNietTBX(BatchId, InternVhossId2, ProductieSequentie),InternVhossId2)
+]]></Implementation>
+</Method>
+
+<Method name="MaakProductieSequentieItem">
+<FormalSpec>VHOSSID:%String,SequentieNummer:%String,BatchId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Halux.common.VHOSSProductieSequentieItem</ReturnType>
+<Implementation><![CDATA[
+	Set ProductieSequentieItem = ##class(APPS.Halux.common.VHOSSProductieSequentieItem).%New()
+	Set ProductieSequentieItem.VHOSSID = VHOSSID
+	Set ProductieSequentieItem.SequentieNummer = SequentieNummer
+	Set ProductieSequentieItem.BatchID = BatchId
+	Quit ProductieSequentieItem
+]]></Implementation>
+</Method>
+
+<Method name="MaakDnaCode">
+<FormalSpec>DnaCode:%String,ScanTijdstip:TECH.Horolog="",PalletCode:%String,SequentieNummer:%String,BatchId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.Halux.AAP.DnaCode</ReturnType>
+<Implementation><![CDATA[
+	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode.DnaCode = DnaCode
+	Set DnaCode.ScanTijdstip = ScanTijdstip
+	Set DnaCode.PalletCode = PalletCode
+	Set DnaCode.SequentieNummer = SequentieNummer
+	Set DnaCode.BatchId = BatchId
+	Quit DnaCode
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper.cls.xml
===================================================================
diff -u -r62597 -r62605
--- WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper.cls.xml	(.../RondAfVhossKastHelper.cls.xml)	(revision 62597)
+++ WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper.cls.xml	(.../RondAfVhossKastHelper.cls.xml)	(revision 62605)
@@ -2,6 +2,96 @@
 <Export generator="Cache" version="24">
 <Class name="WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper">
 <Super>TECH.RegisteredObject</Super>
+
+<Property name="DnaCodeRepository">
+<Type>DOM.Halux.AAP.DnaCodeRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefTbxSequentieIterator">
+<FormalSpec>BatchId:%String,SequentieNummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim Query As %String = "SELECT pps.ID, WPVerpak_Unitnr, Sequence, PalletCode FROM PPS.TBX_Queue as pps join DOM_Halux_AAP.DnaCode as dna on dna.SequentieNummer = pps.Sequence and dna.batchid = pps.batchid where pps.BatchId = ? and pps.sequence = ?"
+	#dim QueryParams As %List = $ListBuild(BatchId, SequentieNummer)
+	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, QueryParams)
+	
+	Quit ##class(TECH.ResultSetIterator).%New(ResultSet)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTbxVhossKastenIterator">
+<FormalSpec>BatchId:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim Query As %String = "SELECT WPVerpak_Unitnr, max(PalletCode) FROM PPS.TBX_Queue as pps join DOM_Halux_AAP.DnaCode as dna on dna.SequentieNummer = pps.Sequence and dna.batchid = pps.batchid where pps.BatchId = ? group by wpverpak_unitnr"
+	#dim QueryParams As %List = $ListBuild(BatchId)
+	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, QueryParams)
+	
+	Quit ##class(TECH.ResultSetIterator).%New(ResultSet)
+]]></Implementation>
+</Method>
+
+<Method name="ProbeerEchteVhossIdTeBepalenNietTBX">
+<FormalSpec>BatchId:%String,InternVhossId:%String,ProductieSequentie:APPS.Halux.common.ProductieSequentie</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Resultaat As %String = ""
+	
+	#dim ItemsIterator As TECH.Iterator = ProductieSequentie.GeefItemIterator()
+	
+	While ItemsIterator.HasNext() {
+		#dim ProductieItem As APPS.Halux.common.VHOSSProductieSequentieItem = ItemsIterator.Next()
+		If ProductieItem.VHOSSID = InternVhossId {
+			#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(BatchId, ProductieItem.SequentieNummer)
+			If DnaCodeIterator.HasNext() {
+				#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
+				If ##class(TECH.StringUtils).StartsWith(DnaCode.PalletCode,"O1") {
+					Set Resultaat = DnaCode.PalletCode
+				}
+			}
+		}
+	}
+	If Resultaat = "" {
+		Set Resultaat = InternVhossId
+	}
+	Quit Resultaat
+]]></Implementation>
+</Method>
+
+<Method name="ProbeerEchteVhossIdTeBepalenTBX">
+<FormalSpec>TbxSequentieIterator:TECH.Iterator,VhossMapper:TECH.KeyValue.UniqueList</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Resultaat As %String
+	
+	If TbxSequentieIterator.HasNext() {
+		#dim TbxSequentie as %CacheString = TbxSequentieIterator.Next()
+		
+		If $$$HasLength(VhossMapper.FindByKey(TbxSequentie.GetData(2)).Value) {
+			Set Resultaat = VhossMapper.FindByKey(TbxSequentie.GetData(2)).Value
+		} Else {
+			Set Resultaat = TbxSequentie.GetData(2)
+		}
+	} Else {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalUsageException).%New("TbsSequentieIterator is leeg"))
+	}
+	
+	Quit Resultaat
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper/ProbeerEchteVhossIdTeBepalenTbx/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper/ProbeerEchteVhossIdTeBepalenTbx/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossKastHelper/ProbeerEchteVhossIdTeBepalenTbx/Test.cls.xml	(revision 62605)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper.ProbeerEchteVhossIdTeBepalenTbx.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: vhoss met 1 al gescand item -&gt; echtvhossid teruggeven">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "1"
+	#dim EchtVhossId = "O100000042"
+	
+	Set VhossMapperStub = ##class(TECH.KeyValue.UniqueList).%New()
+	Do VhossMapperStub.Insert(##class(TECH.KeyValuePair).%New(InternVhossId,EchtVhossId))
+	
+	Set ResultSetHeaders = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeaders.Insert("ID")
+	Do ResultSetHeaders.Insert("InternVhossID")
+	Do ResultSetHeaders.Insert("Sequence")
+	Do ResultSetHeaders.Insert("PalletCode")
+	
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,InternVhossId,SequentieNummer,EchtVhossId))
+	
+	#dim TbxIterator = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+		
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New()
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenTBX(TbxIterator, VhossMapperStub)
+	
+	Do $$$AssertEquals(Antwoord,EchtVhossId)
+]]></Implementation>
+</Method>
+
+<Method name="Test: vhoss met 1 al niet gescand item -&gt; intern vhossid teruggeven">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "1"
+	#dim EchtVhossId = "O100000042"
+	
+	Set VhossMapperStub = ##class(TECH.KeyValue.UniqueList).%New()
+	Do VhossMapperStub.Insert(##class(TECH.KeyValuePair).%New(InternVhossId,""))
+	
+	Set ResultSetHeaders = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeaders.Insert("ID")
+	Do ResultSetHeaders.Insert("InternVhossID")
+	Do ResultSetHeaders.Insert("Sequence")
+	Do ResultSetHeaders.Insert("PalletCode")
+	
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,InternVhossId,SequentieNummer,))
+	
+	#dim TbxIterator = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+		
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New()
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenTBX(TbxIterator, VhossMapperStub)
+	
+	Do $$$AssertEquals(Antwoord,InternVhossId)
+]]></Implementation>
+</Method>
+
+<Method name="Test: vhoss met meerdere gescande items">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "3"
+	#dim EchtVhossId = "O100000042"
+	
+	Set VhossMapperStub = ##class(TECH.KeyValue.UniqueList).%New()
+	Do VhossMapperStub.Insert(##class(TECH.KeyValuePair).%New(1,"O100000042"))
+	Do VhossMapperStub.Insert(##class(TECH.KeyValuePair).%New(2,"O100000043"))
+	Do VhossMapperStub.Insert(##class(TECH.KeyValuePair).%New(3,""))
+	Do VhossMapperStub.Insert(##class(TECH.KeyValuePair).%New(4,""))
+	
+	Set ResultSetHeaders = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeaders.Insert("ID")
+	Do ResultSetHeaders.Insert("InternVhossID")
+	Do ResultSetHeaders.Insert("Sequence")
+	Do ResultSetHeaders.Insert("PalletCode")
+	
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,InternVhossId,SequentieNummer,""))
+	
+	#dim TbxIterator = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+		
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New()
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenTBX(TbxIterator, VhossMapperStub)
+	
+	Do $$$AssertEquals(Antwoord,InternVhossId)
+]]></Implementation>
+</Method>
+
+<Method name="aTest: lege iterator -&gt; exceptie">
+<Implementation><![CDATA[
+	#dim BatchId = "123456"
+	#dim SequentieNummer = "42"
+	#dim InternVhossId = "1"
+	#dim EchtVhossId = "O100000042"
+	Set ResultSetHeaders = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeaders.Insert("ID")
+	Do ResultSetHeaders.Insert("InternVhossID")
+	Do ResultSetHeaders.Insert("Sequence")
+	Do ResultSetHeaders.Insert("PalletCode")
+	
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,InternVhossId,SequentieNummer,EchtVhossId))
+	
+	#dim TbxIterator = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+		
+	Set Helper = ##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New()
+	#dim Antwoord As %String = Helper.ProbeerEchteVhossIdTeBepalenTBX(BatchId, ,InternVhossId, TbxIterator)
+	
+	Do $$$AssertEquals(Antwoord,EchtVhossId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62595 -r62605
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62595)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62605)
@@ -784,27 +784,16 @@
 				Do AantallenPerVhoss.Verhoog(DnaCodeTemp.PalletCode)
 			} Else {
 			  	If ##class(TECH.StringUtils).StartsWith(DnaCodeTemp.DnaCode,"T") {
-					
 					#dim TbxSequentieIterator as TECH.Iterator = ..GeefTbxSequentieIterator(RondAfVhossBatchRequest.BatchId, DnaCodeTemp.SequentieNummer)
-					#dim TbxSequentie as %CacheString = TbxSequentieIterator.Next()
-					Do ##class(Tools.Wlip).%New(127).String("getdata 2 = "_TbxSequentie.GetData(2))
-					Do ##class(Tools.Wlip).%New(127).String("getdata 4 = "_TbxSequentie.GetData(4))
-					
-					#dim TeGebruikenVhoss As %String
-					If $$$HasLength(VhossMapper.FindByKey(TbxSequentie.GetData(2)).Value) {
-						Do AantallenPerVhoss.Verhoog(VhossMapper.FindByKey(TbxSequentie.GetData(2)).Value)
-					} Else {
-						Do AantallenPerVhoss.Verhoog(TbxSequentie.GetData(2))
-					}
-					
+					Do AantallenPerVhoss.Verhoog(..ProbeerEchteVhossIdTeBepalenTBX(TbxSequentieIterator, VhossMapper))
 				} Else {
 				  	#dim ProductieItem As APPS.Halux.common.VHOSSProductieSequentieItem = ProductieSequentie.GeefVHOSSProductieSequentieItemViaSequentieNummer(DnaCodeTemp.SequentieNummer)
 				  	Do AantallenPerVhoss.Verhoog(..ProbeerEchteVhossIdTeBepalenNietTBX(RondAfVhossBatchRequest.BatchId,DnaCodeTemp.SequentieNummer,ProductieItem.VHOSSID, ProductieSequentie))
 			  	}
 			}
 			
 		}
-		Do ##class(Tools.Wlip).%New(127).String(AantallenPerVhoss.ToString())
+		
 		#dim FrequentieItemIterator As TECH.ListIterator = AantallenPerVhoss.GeefItemIterator()
 		While FrequentieItemIterator.HasNext(){
 			#dim Aantal As %Double = FrequentieItemIterator.Next()
@@ -894,25 +883,21 @@
 </Method>
 
 <Method name="ProbeerEchteVhossIdTeBepalenTBX">
-<FormalSpec>BatchId:%String,SequentieNummer:%String,InternVhossId:%String,TbxSequentieIterator:TECH.Iterator</FormalSpec>
+<FormalSpec>BatchId:%String,SequentieNummer:%String,VhossMapper:TECH.KeyValue.UniqueList</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Resultaat As %String = ""
-	Do ##class(Tools.Wlip).%New(127).String(BatchId_"/"_SequentieNummer_"/"_InternVhossId)
-	While TbxSequentieIterator.HasNext() {
-	Do ##class(Tools.Wlip).%New(127).String("100")
-		#dim TbxSequentie as %CacheString = TbxSequentieIterator.Next()
-	Do ##class(Tools.Wlip).%New(127).String("100 "_TbxSequentie.GetData(2))
-		If (TbxSequentie.GetData(2) = InternVhossId) && ($$$HasLength(TbxSequentie.GetData(4))) {
-				Set Resultaat = TbxSequentie.GetData(4)
-		}
+	#dim TbxSequentieIterator as TECH.Iterator = ..GeefTbxSequentieIterator(BatchId, SequentieNummer)
+	#dim TbxSequentie as %CacheString = TbxSequentieIterator.Next()
+	Do ##class(Tools.Wlip).%New(127).String("getdata 2 = "_TbxSequentie.GetData(2))
+	Do ##class(Tools.Wlip).%New(127).String("getdata 4 = "_TbxSequentie.GetData(4))
+	
+	#dim TeGebruikenVhoss As %String
+	If $$$HasLength(VhossMapper.FindByKey(TbxSequentie.GetData(2)).Value) {
+		Quit (VhossMapper.FindByKey(TbxSequentie.GetData(2)).Value)
+	} Else {
+		Quit (TbxSequentie.GetData(2))
 	}
-	If Resultaat = "" {
-		Set Resultaat = InternVhossId
-	}
-	Do ##class(Tools.Wlip).%New(127).String("100 resultaat ="_Resultaat)
-	Quit Resultaat
 ]]></Implementation>
 </Method>