Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml
===================================================================
diff -u -r62611 -r62612
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 62611)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 62612)
@@ -134,6 +134,7 @@
 	Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenNietTBX",Request.BatchId,1,ProductieSequentie).DanReturn("O100000042")
 	Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenNietTBX",Request.BatchId,2,ProductieSequentie).DanReturn("O100000043")
 	Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenNietTBX",Request.BatchId,3,ProductieSequentie).DanReturn("3")
+	Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenNietTBX",Request.BatchId,4,ProductieSequentie).DanReturn("3")
 	
 	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,SequentieService,RondAfVhossKastHelper)
 	
@@ -151,6 +152,102 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: TBX Standaardgedrag: batch met 1 vhoss en alles in buffer -&gt; resultaat leeg">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.RondAfVhossBatchRequest).%New()
+	Set Request.BatchId = "123456"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",$H,"O100000042","42",Request.BatchId)
+	#dim DnaCode2 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDF2",$H,"O100000042","43",Request.BatchId)
+	
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaBatchId",Request.BatchId).DanReturn(DnaCodeIteratorTweeStuks)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCodeEnRecent","O100000042").DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",Request.BatchId,43).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode2))
+	
+	Set ResultSetHeaders = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeaders.Insert("InternVhossID")
+	Do ResultSetHeaders.Insert("PalletCode")
+	
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,42))
+	
+	#dim TbxVhossKastenIterator = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+	
+	Set RondAfVhossKastHelper = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New()
+	Do RondAfVhossKastHelper.IndienMethodCall("GeefTbxVhossKastenIterator",Request.BatchId).DanReturn(TbxVhossKastenIterator)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,,RondAfVhossKastHelper)
+	
+	#dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request)
+	
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.Count(),0)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: TBX batch met 1 vhoss en niet alles in buffer -&gt; resultaat gevuld">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.RondAfVhossBatchRequest).%New()
+	Set Request.BatchId = "123456"
+	
+	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDE1",$H,"O100000042","42",Request.BatchId)
+	#dim DnaCode2 As DOM.Halux.AAP.DnaCode = ..MaakDnaCode("TABCDF2",,"","43",Request.BatchId)
+	
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaBatchId",Request.BatchId).DanReturn(DnaCodeIteratorTweeStuks)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCodeEnRecent","O100000042").DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaBatchIdEnSequentienummer",Request.BatchId,43).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode2))
+	
+	Set ResultSetHeaders = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeaders.Insert("InternVhossID")
+	Do ResultSetHeaders.Insert("PalletCode")
+	
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,42))
+	
+	#dim TbxVhossKastenIterator = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+
+	Set ResultSetHeaders = ##class(%ListOfDataTypes).%New()
+	Do ResultSetHeaders.Insert("ID")
+	Do ResultSetHeaders.Insert("InterneVhossId")
+	Do ResultSetHeaders.Insert("Sequentienummer")
+	Do ResultSetHeaders.Insert("PalletCode")
+	
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,1,42,"O100000042"))
+	#dim TbxSequentieIterator = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+
+	Set ResultSetData = ##class(%ListOfDataTypes).%New()
+	Do ResultSetData.Insert($listbuild(1,1,43,))
+	#dim TbxSequentieIterator2 = ##class(TECH.ResultSetIterator).%New(##class(vhTest.Fake.TECH.ResultSet).%New(ResultSetData, ResultSetHeaders))
+
+
+	Set RondAfVhossKastHelper = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New()
+	Do RondAfVhossKastHelper.IndienMethodCall("GeefTbxVhossKastenIterator",Request.BatchId).DanReturn(TbxVhossKastenIterator)
+	Do RondAfVhossKastHelper.IndienMethodCall("GeefTbxSequentieIterator",Request.BatchId,"42").DanReturn(TbxSequentieIterator)
+	Do RondAfVhossKastHelper.IndienMethodCall("GeefTbxSequentieIterator",Request.BatchId,"43").DanReturn(TbxSequentieIterator2)
+	Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenTBX",TbxSequentieIterator,$$$ElkeWaarde).DanReturn("O100000042")
+	Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenTBX",TbxSequentieIterator2,$$$ElkeWaarde).DanReturn("O100000042")
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,,RondAfVhossKastHelper)
+	
+	#dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request)
+	
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.Count(),1)
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.GetAt(1).Vhosskast,"O100000042")
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.GetAt(1).AantalLades,2)
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.GetAt(1).AantalLadesGescand,1)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="MaakProductieSequentieItem">
 <FormalSpec>VHOSSID:%String,SequentieNummer:%String,BatchId:%String</FormalSpec>
 <Private>1</Private>
@@ -165,12 +262,12 @@
 </Method>
 
 <Method name="MaakDnaCode">
-<FormalSpec>DnaCode:%String,ScanTijdstip:TECH.Horolog="",PalletCode:%String,SequentieNummer:%String,BatchId:%String</FormalSpec>
+<FormalSpec>DnaCodeAsString:%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.DnaCode = DnaCodeAsString
 	Set DnaCode.ScanTijdstip = ScanTijdstip
 	Set DnaCode.PalletCode = PalletCode
 	Set DnaCode.SequentieNummer = SequentieNummer