Index: WS/Halux/AAP/RondAfVhossBatch/VhossKastenMetAantallen.cls.xml
===================================================================
diff -u -r62509 -r62517
--- WS/Halux/AAP/RondAfVhossBatch/VhossKastenMetAantallen.cls.xml	(.../VhossKastenMetAantallen.cls.xml)	(revision 62509)
+++ WS/Halux/AAP/RondAfVhossBatch/VhossKastenMetAantallen.cls.xml	(.../VhossKastenMetAantallen.cls.xml)	(revision 62517)
@@ -7,11 +7,11 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="AantalKaderdeuren">
+<Property name="AantalLades">
 <Type>%String</Type>
 </Property>
 
-<Property name="AantalKaderdeurenGescand">
+<Property name="AantalLadesGescand">
 <Type>%String</Type>
 </Property>
 </Class>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml	(revision 62517)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.RondAfVhossBatch.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="aTest: 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"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.DnaCode = "LABCDE1"
+	Set DnaCode1.ScanTijdstip = $H
+	Set DnaCode1.PalletCode = "O100000042"
+	Set DnaCode1.BatchId = "123456"
+	
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2.DnaCode = "LABCDF2"
+	Set DnaCode2.ScanTijdstip = $H
+	Set DnaCode2.PalletCode = "O100000042"
+	Set DnaCode2.BatchId = "123456"
+	
+	#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)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request)
+	
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.Count(),0)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Standaardgedrag: 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"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.DnaCode = "LABCDE1"
+	Set DnaCode1.ScanTijdstip = $H
+	Set DnaCode1.PalletCode = "O100000042"
+	Set DnaCode1.SequentieNummer = 42
+	Set DnaCode1.BatchId = "123456"
+	
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2.DnaCode = "LABCDF2"
+	Set DnaCode2.PalletCode = "O100000042"
+	Set DnaCode2.BatchId = "123456"
+	Set DnaCode2.SequentieNummer = 43
+	
+	#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)
+	
+	
+	Set ProductieSequentieItem1 = ##class(APPS.Halux.common.VHOSSProductieSequentieItem).%New()
+	Set ProductieSequentieItem1.VHOSSID = 1
+	Set ProductieSequentieItem1.SequentieNummer = 42
+	Set ProductieSequentieItem1.BatchID = Request.BatchId
+	Set ProductieSequentieItem2 = ##class(APPS.Halux.common.VHOSSProductieSequentieItem).%New()
+	Set ProductieSequentieItem2.VHOSSID = 1
+	Set ProductieSequentieItem2.SequentieNummer = 43
+	Set ProductieSequentieItem2.BatchID = Request.BatchId
+	
+	Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.TaorboxBatch).%New()
+	Do BatchStub.IndienMethodCall("GeefID").DanReturn(Request.BatchId)
+	Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).TAORbox())
+	
+	Set ProductieSequentie = ##class(APPS.Halux.common.ProductieSequentie).%New(BatchStub)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem1)
+	Do ProductieSequentie.VoegToeSequentieItem(ProductieSequentieItem2)
+	
+	Set SequentieService = ##class(vhTest.Mock.APPS.Halux.common.impl.SequentieService).%New()
+	Do SequentieService.IndienMethodCall("HeeftProductieSequentie",Request.BatchId).DanReturn($$$True)
+	Do SequentieService.IndienMethodCall("GeefProductieSequentie",Request.BatchId).DanReturn(ProductieSequentie)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,SequentieService)
+	
+	#dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request)
+	
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.Count(),1)
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.GetAt(1).Vhosskast,"1")
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.GetAt(1).AantalLades,1)
+	Do $$$AssertEquals(Antwoord.VhossKastenMetAantallen.GetAt(1).AantalLadesGescand,0)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62509 -r62517
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62509)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62517)
@@ -63,8 +63,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="SequentieService">
+<Type>APPS.Halux.common.impl.SequentieService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",UGLYPickingWrapper:WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler=""</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",UGLYPickingWrapper:WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="",SequentieService:APPS.Halux.common.impl.SequentieService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -81,6 +86,7 @@
 	Set ..AantalGescandeVhossSequentieItemsBepaler = $$$Inject(AantalGescandeVhossSequentieItemsBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New())
 	Set ..DnaCodeInVhossKastBepaler = $$$Inject(DnaCodeInVhossKastBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New())
 	Set ..VerzendDirectControleur = ##class(BL.MB.UGLYPicking.VerzendDirectControleur).%New()
+	Set ..SequentieService = $$$Inject(SequentieService,##class(APPS.Halux.common.impl.SequentieService).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -746,12 +752,57 @@
 	Try {
 		Set Response = ##class(WS.Halux.AAP.RondAfVhossBatchResponse).%New()
 		
+		#dim DnaCodeViaBatchIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaBatchId(RondAfVhossBatchRequest.BatchId)
+		#dim DnaCodeTemp As DOM.Halux.AAP.DnaCode
+
+		Set AantallenPerVhoss = ##class(TECH.FrequentieTabel).%New()
+		Set AantallenGescandPerVhoss = ##class(TECH.FrequentieTabel).%New()
 		
+		Set DnaCodeTemp = DnaCodeViaBatchIterator.Next()
+		If ##class(TECH.StringUtils).StartsWith(DnaCodeTemp.DnaCode,"T") {
+		} Else {
+			#dim ProductieSequentie As APPS.Halux.common.ProductieSequentie = ..SequentieService.GeefProductieSequentie(RondAfVhossBatchRequest.BatchId)
+		}
 		
+		Set DnaCodeViaBatchIterator = ..DnaCodeRepository.ZoekViaBatchId(RondAfVhossBatchRequest.BatchId)
+			
+		While DnaCodeViaBatchIterator.HasNext() {
+			Set DnaCodeTemp = DnaCodeViaBatchIterator.Next()
+			#dim ProductieItem As APPS.Halux.common.VHOSSProductieSequentieItem = ProductieSequentie.GeefVHOSSProductieSequentieItemViaSequentieNummer(DnaCodeTemp.SequentieNummer)
+			
+			If $$$HasLength(DnaCodeTemp.ScanTijdstip) {
+				Do AantallenGescandPerVhoss.Verhoog(DnaCodeTemp.PalletCode)
+				Do AantallenPerVhoss.Verhoog(DnaCodeTemp.PalletCode)
+			} Else {
+			  	If ##class(TECH.StringUtils).StartsWith(DnaCodeTemp.DnaCode,"T") {
+			  	} Else {
+				  	Do ##class(Tools.Wlip).%New(127).ObjToXML(ProductieItem)
+				  	Do AantallenPerVhoss.Verhoog(ProductieItem.VHOSSID)
+			  	}
+			}
+			
+		}
+		
+		#dim FrequentieItemIterator As TECH.ListIterator = AantallenPerVhoss.GeefItemIterator()
+		While FrequentieItemIterator.HasNext(){
+			#dim Aantal As %Double = FrequentieItemIterator.Next()
+			Set VhossKastMetAantallen = ##class(WS.Halux.AAP.RondAfVhossBatch.VhossKastenMetAantallen).%New()
+			Set VhossKastMetAantallen.Vhosskast = FrequentieItemIterator.Key()
+			Set VhossKastMetAantallen.AantalLades = Aantal
+			Set VhossKastMetAantallen.AantalLadesGescand = AantallenGescandPerVhoss.GeefFrequentieVanItem(VhossKastMetAantallen.Vhosskast)
+			If $$$Not(VhossKastMetAantallen.AantalLades = VhossKastMetAantallen.AantalLadesGescand) {
+				Do Response.VhossKastenMetAantallen.Insert(VhossKastMetAantallen)
+			}
+		}
+		
+		Do ##class(Tools.Wlip).%New(127).String(AantallenPerVhoss.ToString())
+		Do ##class(Tools.Wlip).%New(127).String(AantallenGescandPerVhoss.ToString())
+		
 		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()
 	}