Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfKaderdeurDag/Test.cls.xml
===================================================================
diff -u -r60604 -r61283
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfKaderdeurDag/Test.cls.xml	(.../Test.cls.xml)	(revision 60604)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfKaderdeurDag/Test.cls.xml	(.../Test.cls.xml)	(revision 61283)
@@ -195,6 +195,58 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: meerdere toelevering (lades en kaderdeuren) met nog meerdere te scannen dnacodes -&gt; 1 item per toelevering in resultaat, enkel van de kaderdeuren">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.RondAfKaderdeurDagRequest).%New()
+	Set Request.DnaCode = "KABCDE1"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.DnaCode = "KABCDE1"
+	Set DnaCode1.Toelevering = "222222"
+	Set DnaCode1.ScanTijdstip = $H
+	Set DnaCode1.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand()
+	
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2.DnaCode = "KABCDF2"
+	Set DnaCode2.Toelevering = "222222"
+	Set DnaCode2.ScanTijdstip = $H
+	Set DnaCode2.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
+	
+	Set DnaCode3 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode3.DnaCode = "LABCDG3"
+	Set DnaCode3.Toelevering = "222223"
+	Set DnaCode3.ScanTijdstip = $H
+	Set DnaCode3.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
+	
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
+	#dim DnaCodeIteratorDrieStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2, DnaCode3)
+	#dim DnaCodeIteratorTweedeToelevering As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode3)
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDatum",DnaCode1.ScanTijdstip).DanReturn(DnaCodeIteratorDrieStuks)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode3.Toelevering).DanReturn(DnaCodeIteratorTweedeToelevering)
+	
+	#dim VolgNr As %Integer = 1
+	Set UGLYPickingWrapperStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper).%New()
+	Do UGLYPickingWrapperStub.IndienMethodCall("BuildBufferViaDnaCode",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VolgNr)
+	Do UGLYPickingWrapperStub.IndienMethodCall("CloseAndHandleBuffer",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks()
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,UGLYPickingWrapperStub)
+	
+	#dim Antwoord As WS.Halux.AAP.RondAfKaderdeurDagResponse = DnaCodeService.RondAfKaderdeurDag(Request)
+	
+	If $$$AssertEquals(Antwoord.ToeleveringMetAantallen.Count(),1) {
+		Do $$$AssertEquals(Antwoord.ToeleveringMetAantallen.GetAt(1).ToeleveringID,DnaCode1.Toelevering )
+		Do $$$AssertEquals(Antwoord.ToeleveringMetAantallen.GetAt(1).AantalKaderdeuren,2)
+		Do $$$AssertEquals(Antwoord.ToeleveringMetAantallen.GetAt(1).AantalKaderdeurenGescand,1)
+	}
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r61095 -r61283
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61095)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61283)
@@ -321,8 +321,6 @@
 				
 				If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
 					Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode)
-					
-					Do ##class(Tools.Wlip).%New(127).ObjToXML(Response)
 					Set Response.Header.Status = "200"
 				} Else {
 					Set ToeleveringId = DnaCode.Toelevering
@@ -665,8 +663,12 @@
 		#dim DnaCodeViaDatumIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaDatum(LaatsteDnaCode.ScanTijdstip)
 		
 		Set FrequentieTabel = ##class(TECH.FrequentieTabel).%New()
+		#dim DnaCodeTemp As DOM.Halux.AAP.DnaCode
 		While DnaCodeViaDatumIterator.HasNext() {
-			Do FrequentieTabel.Verhoog(DnaCodeViaDatumIterator.Next().Toelevering)
+			Set DnaCodeTemp = DnaCodeViaDatumIterator.Next()
+			If ##class(TECH.StringUtils).StartsWith(DnaCodeTemp.DnaCode,"K") {
+				Do FrequentieTabel.Verhoog(DnaCodeTemp.Toelevering)
+			}
 		}
 		
 		#dim ToeleveringIdIterator As TECH.Iterator = FrequentieTabel.GeefItemIterator()