Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62548 -r62595
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62548)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62595)
@@ -760,29 +760,51 @@
 		
 		Set DnaCodeTemp = DnaCodeViaBatchIterator.Next()
 		If ##class(TECH.StringUtils).StartsWith(DnaCodeTemp.DnaCode,"T") {
+			#dim TbxVhossKastenIterator As TECH.Iterator = ..GeefTbxVhossKastenIterator(RondAfVhossBatchRequest.BatchId)
+		
+			Set VhossMapper = ##class(TECH.KeyValue.UniqueList).%New()
+						
+						
+			While TbxVhossKastenIterator.HasNext() {
+				#dim TbxVhossKasten as %CacheString = TbxVhossKastenIterator.Next()
+				Do VhossMapper.Insert(##class(TECH.KeyValuePair).%New(TbxVhossKasten.GetData(1),TbxVhossKasten.GetData(2)))
+			}
 		} Else {
 			#dim ProductieSequentie As APPS.Halux.common.ProductieSequentie = ..SequentieService.GeefProductieSequentie(RondAfVhossBatchRequest.BatchId)
 		}
 		
-		Set VhossMapper = ##class(TECH.KeyValue.UniqueList).%New()
 		
 		Set DnaCodeViaBatchIterator = ..DnaCodeRepository.ZoekViaBatchId(RondAfVhossBatchRequest.BatchId)
 			
 		While DnaCodeViaBatchIterator.HasNext() {
+			Do ##class(Tools.Wlip).%New(127).String("in dnatemp iterator")
 			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 {
+					
+					#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))
+					}
+					
+				} 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()
@@ -819,6 +841,32 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefTbxSequentieIterator">
+<FormalSpec>BatchId:%String,SequentieNummer:%String</FormalSpec>
+<Private>1</Private>
+<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>
+<Private>1</Private>
+<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,SequentieNummer:%String,InternVhossId:%String,ProductieSequentie:APPS.Halux.common.ProductieSequentie</FormalSpec>
 <Private>1</Private>
@@ -845,6 +893,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ProbeerEchteVhossIdTeBepalenTBX">
+<FormalSpec>BatchId:%String,SequentieNummer:%String,InternVhossId:%String,TbxSequentieIterator:TECH.Iterator</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)
+		}
+	}
+	If Resultaat = "" {
+		Set Resultaat = InternVhossId
+	}
+	Do ##class(Tools.Wlip).%New(127).String("100 resultaat ="_Resultaat)
+	Quit Resultaat
+]]></Implementation>
+</Method>
+
 <Method name="ZoekViaKlantnummer">
 <FormalSpec>ZoekViaKlantnummerRequest:WS.Halux.AAP.ZoekViaKlantnummerRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.ZoekViaKlantnummerResponse</ReturnType>