Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62605 -r62611
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62605)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62611)
@@ -68,8 +68,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="RondAfVhossKastHelper">
+<Type>WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper</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="",SequentieService:APPS.Halux.common.impl.SequentieService=""</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="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -87,6 +92,7 @@
 	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())
+	Set ..RondAfVhossKastHelper = $$$Inject(RondAfVhossKastHelper,##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -760,11 +766,10 @@
 		
 		Set DnaCodeTemp = DnaCodeViaBatchIterator.Next()
 		If ##class(TECH.StringUtils).StartsWith(DnaCodeTemp.DnaCode,"T") {
-			#dim TbxVhossKastenIterator As TECH.Iterator = ..GeefTbxVhossKastenIterator(RondAfVhossBatchRequest.BatchId)
+			#dim TbxVhossKastenIterator As TECH.Iterator = ..RondAfVhossKastHelper.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)))
@@ -773,22 +778,20 @@
 			#dim ProductieSequentie As APPS.Halux.common.ProductieSequentie = ..SequentieService.GeefProductieSequentie(RondAfVhossBatchRequest.BatchId)
 		}
 		
-		
 		Set DnaCodeViaBatchIterator = ..DnaCodeRepository.ZoekViaBatchId(RondAfVhossBatchRequest.BatchId)
 			
 		While DnaCodeViaBatchIterator.HasNext() {
-			Do ##class(Tools.Wlip).%New(127).String("in dnatemp iterator")
 			Set DnaCodeTemp = DnaCodeViaBatchIterator.Next()
 			If $$$HasLength(DnaCodeTemp.ScanTijdstip) {
 				Do AantallenGescandPerVhoss.Verhoog(DnaCodeTemp.PalletCode)
 				Do AantallenPerVhoss.Verhoog(DnaCodeTemp.PalletCode)
 			} Else {
 			  	If ##class(TECH.StringUtils).StartsWith(DnaCodeTemp.DnaCode,"T") {
-					#dim TbxSequentieIterator as TECH.Iterator = ..GeefTbxSequentieIterator(RondAfVhossBatchRequest.BatchId, DnaCodeTemp.SequentieNummer)
-					Do AantallenPerVhoss.Verhoog(..ProbeerEchteVhossIdTeBepalenTBX(TbxSequentieIterator, VhossMapper))
+					#dim TbxSequentieIterator as TECH.Iterator = ..RondAfVhossKastHelper.GeefTbxSequentieIterator(RondAfVhossBatchRequest.BatchId, DnaCodeTemp.SequentieNummer)
+					Do AantallenPerVhoss.Verhoog(..RondAfVhossKastHelper.ProbeerEchteVhossIdTeBepalenTBX(TbxSequentieIterator, VhossMapper))
 				} Else {
 				  	#dim ProductieItem As APPS.Halux.common.VHOSSProductieSequentieItem = ProductieSequentie.GeefVHOSSProductieSequentieItemViaSequentieNummer(DnaCodeTemp.SequentieNummer)
-				  	Do AantallenPerVhoss.Verhoog(..ProbeerEchteVhossIdTeBepalenNietTBX(RondAfVhossBatchRequest.BatchId,DnaCodeTemp.SequentieNummer,ProductieItem.VHOSSID, ProductieSequentie))
+				  	Do AantallenPerVhoss.Verhoog(..RondAfVhossKastHelper.ProbeerEchteVhossIdTeBepalenNietTBX(RondAfVhossBatchRequest.BatchId,ProductieItem.VHOSSID, ProductieSequentie))
 			  	}
 			}
 			
@@ -830,77 +833,6 @@
 ]]></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>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim Resultaat As %String = ""
-	
-	#dim ItemsIterator As TECH.Iterator = ProductieSequentie.GeefItemIterator()
-	
-	While ItemsIterator.HasNext() {
-		#dim ProductieItem As APPS.Halux.common.VHOSSProductieSequentieItem = ItemsIterator.Next()
-		If ProductieItem.VHOSSID = InternVhossId {
-			#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaBatchIdEnSequentienummer(BatchId, ProductieItem.SequentieNummer)
-			#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
-			If ##class(TECH.StringUtils).StartsWith(DnaCode.PalletCode,"O1") {
-				Set Resultaat = DnaCode.PalletCode
-			}
-		}
-	}
-	If Resultaat = "" {
-		Set Resultaat = InternVhossId
-	}
-	Quit Resultaat
-]]></Implementation>
-</Method>
-
-<Method name="ProbeerEchteVhossIdTeBepalenTBX">
-<FormalSpec>BatchId:%String,SequentieNummer:%String,VhossMapper:TECH.KeyValue.UniqueList</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim TbxSequentieIterator as TECH.Iterator = ..GeefTbxSequentieIterator(BatchId, 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) {
-		Quit (VhossMapper.FindByKey(TbxSequentie.GetData(2)).Value)
-	} Else {
-		Quit (TbxSequentie.GetData(2))
-	}
-]]></Implementation>
-</Method>
-
 <Method name="ZoekViaKlantnummer">
 <FormalSpec>ZoekViaKlantnummerRequest:WS.Halux.AAP.ZoekViaKlantnummerRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.ZoekViaKlantnummerResponse</ReturnType>