Index: WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml
===================================================================
diff -u -r62821 -r62822
--- WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml	(.../AantalGescandeVhossSequentieItemsBepaler.cls.xml)	(revision 62821)
+++ WSimpl/Halux/AAP/DnaCodeService/AantalGescandeVhossSequentieItemsBepaler.cls.xml	(.../AantalGescandeVhossSequentieItemsBepaler.cls.xml)	(revision 62822)
@@ -54,6 +54,7 @@
 	Set AantallenPerVhoss = ##class(TECH.FrequentieTabel).%New()
 	Set AantallenGescandPerVhoss = ##class(TECH.FrequentieTabel).%New()
 	#dim VhossidVanDnaCode As %String = ""
+	#dim ZijvlakIdVanDnaCode As %String = ""
 	#dim TbxSequentie As %CacheString
 	
 	While ItemIterator.HasNext() {
@@ -64,13 +65,14 @@
 		}
 		If DnaCode.SequentieNummer = TbxSequentie.GetData(3) {
 			Set VhossidVanDnaCode = TbxSequentie.GetData(2)
+			Set ZijvlakIdVanDnaCode = TbxSequentie.GetData(4)
 		}
 	}
 	
 	Set ItemIterator = ..GeefTbxSequentieIterator(DnaCode.BatchId)
 	While ItemIterator.HasNext() {
 		Set TbxSequentie = ItemIterator.Next()
-		If TbxSequentie.GetData(2) = VhossidVanDnaCode {
+		If ((TbxSequentie.GetData(2) = VhossidVanDnaCode) && (TbxSequentie.GetData(4) = ZijvlakIdVanDnaCode)) {
 			Do Resultaat.DnaCodes.Insert(..DnaCodeNaarDto(..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(DnaCode.BatchId,TbxSequentie.GetData(3)).Next()))
 		}
 	}
@@ -228,7 +230,7 @@
 <Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	#dim Query As %String = "SELECT ID, WPVerpak_Unitnr, Sequence FROM PPS.TBX_Queue WHERE BatchID = ? "
+	#dim Query As %String = "SELECT ID, WPVerpak_Unitnr, Sequence, WPVerpak_SubNr FROM PPS.TBX_Queue WHERE BatchID = ? "
 	#dim QueryParams As %List = $ListBuild(BatchId)
 	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, QueryParams)