Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62904 -r62905
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62904)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62905)
@@ -73,6 +73,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BufferHelper">
+<Type>WSimpl.Halux.AAP.DnaCodeService.BufferHelper</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="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper=""</FormalSpec>
 <Private>1</Private>
@@ -93,6 +98,7 @@
 	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())
+	Set ..BufferHelper = ##class(WSimpl.Halux.AAP.DnaCodeService.BufferHelper).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -448,7 +454,7 @@
 		}
 		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringId(ToeleveringBijwerkenRequest.Toelevering)
 		If DnaCodeIterator.HasNext() {
-			Do ..DnaCodesKlaarmakenVoorBuffer(DnaCodeIterator, ToeleveringBijwerkenRequest.Status, ToeleveringBijwerkenRequest.Toelevering, ,ToeleveringBijwerkenRequest.Header.Initialen)
+			Do ..BufferHelper.DnaCodesKlaarmakenVoorBuffer(DnaCodeIterator, ToeleveringBijwerkenRequest.Status, ToeleveringBijwerkenRequest.Toelevering, ,ToeleveringBijwerkenRequest.Header.Initialen)
 			Set Response.Header.Status = "200"
 		} Else {
 			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
@@ -483,9 +489,9 @@
 		Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaPalletCodeEnNotStatus(PalletBijwerkenRequest.Pallet,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer())
 		If DnaCodeIterator.HasNext() {
 			Set Response.Header.Status = "200"
-			Do ..DnaCodesKlaarmakenVoorBuffer(DnaCodeIterator, PalletBijwerkenRequest.Status, , PalletBijwerkenRequest.Pallet, PalletBijwerkenRequest.Header.Initialen)
+			Do ..BufferHelper.DnaCodesKlaarmakenVoorBuffer(DnaCodeIterator, PalletBijwerkenRequest.Status, , PalletBijwerkenRequest.Pallet, PalletBijwerkenRequest.Header.Initialen)
 			If ##class(APPS.VisiDot.impl.Tech).IsFrameID(PalletBijwerkenRequest.Pallet) {
-				Do ..MogelijkseTbxenBijVhosskastAfmelden(PalletBijwerkenRequest.Pallet, PalletBijwerkenRequest.Header.Initialen)
+				Do ..BufferHelper.MogelijkseTbxenBijVhosskastAfmelden(PalletBijwerkenRequest.Pallet, PalletBijwerkenRequest.Header.Initialen)
 			}
 		} Else {
 			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
@@ -501,103 +507,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="MogelijkseTbxenBijVhosskastAfmelden">
-<FormalSpec>Pallet:%String,Initialen:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim DnaCodeIterator = ..DnaCodeRepository.ZoekVoorHernoemPallet(Pallet)
-	#dim DnaCode As DOM.Halux.AAP.DnaCode
-	If DnaCodeIterator.HasNext() {
-		Set DnaCode = DnaCodeIterator.Next()
-		#dim Query As %String
-		#dim QueryParams As %List
-		#dim ResultSet As TECH.ResultSet
-		#dim InternVhossId As %String
-		#dim InternZijvlakId As %String
-		#dim DnaCodeTemp As DOM.Halux.AAP.DnaCode
-		If ##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode,"T") {
-			Set Query = "SELECT WPVerpak_Unitnr, WPVerpak_SubNr 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 PalletCode = ? "
-			Set QueryParams = $ListBuild(DnaCode.BatchId,Pallet)
-			Set ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, QueryParams)
-			While ResultSet.Next(){
-				Set InternVhossId = ResultSet.GetData(1)
-				Set InternZijvlakId = ResultSet.GetData(2)
-				
-				Set Query = "SELECT DnaCode 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 WPVerpak_Unitnr = ? and WPVerpak_SubNr = ? and not(PalletCode like 'O1%') and dna.status = 'Gescand'"
-				Set QueryParams = $ListBuild(DnaCode.BatchId,InternVhossId,InternZijvlakId)
-				Set ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, QueryParams)
-				Set DnaCodeList = ##class(%ListOfObjects).%New()
-				While ResultSet.Next(){
-					Set DnaCodeTemp = ..DnaCodeRepository.ZoekViaDnaCode(ResultSet.GetData(1)).Next()
-					Do DnaCodeList.Insert(DnaCodeTemp)
-					Do ..DnaCodesKlaarmakenVoorBuffer(##class(TECH.ListIterator).%New(DnaCodeList), ##class(DOM.Halux.AAP.enu.DnaCodeStatus).%New().InBuffer(),,DnaCodeTemp.PalletCode,Initialen)
-				}
-			}
-			
-		} Else {
-			Set Query = "SELECT VHOSSID, ZijvlakId FROM DOM_Halux_AAP.DnaCode as dna join APPS_Halux_common.VHOSSProductieSequentieItem as pps on dna.batchid = pps.batchid and dna.sequentienummer = pps.groepsequentienummer where pps.BatchId = ? and PalletCode = ?"
-			Set QueryParams = $ListBuild(DnaCode.BatchId,Pallet)
-			Set ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, QueryParams)
-			While ResultSet.Next(){
-				Set InternVhossId = ResultSet.GetData(1)
-				Set InternZijvlakId = ResultSet.GetData(2)
-				
-				Set Query = "SELECT DnaCode FROM DOM_Halux_AAP.DnaCode as dna join APPS_Halux_common.VHOSSProductieSequentieItem as pps on dna.batchid = pps.batchid and dna.sequentienummer = pps.groepsequentienummer where pps.BatchId = ? and VHOSSID = ? and ZijvlakId = ? and not(PalletCode like 'O1%') and dna.status = 'Gescand'"
-				Set QueryParams = $ListBuild(DnaCode.BatchId,InternVhossId,InternZijvlakId)
-				Set ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, QueryParams)
-				
-				Set DnaCodeList = ##class(%ListOfObjects).%New()
-				While ResultSet.Next(){
-					Set DnaCodeTemp = ..DnaCodeRepository.ZoekViaDnaCode(ResultSet.GetData(1)).Next()
-					Do DnaCodeList.Insert(DnaCodeTemp)
-					Do ..DnaCodesKlaarmakenVoorBuffer(##class(TECH.ListIterator).%New(DnaCodeList), ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer(),,DnaCodeTemp.PalletCode,Initialen)
-				}
-			}			
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="DnaCodesKlaarmakenVoorBuffer">
-<FormalSpec>DnaCodeIterator:TECH.Iterator,Status:DOM.Halux.AAP.enu.DnaCodeStatus,Toelevering:%String="",Pallet:%String="",Initialen:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim DnaCode As DOM.Halux.AAP.DnaCode = ""
-	#dim VolgNr As %Integer	
-
-	While DnaCodeIterator.HasNext() {
-		Set DnaCode = DnaCodeIterator.Next()
-		If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold() {
-			If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
-				Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).OnHold()
-				Do ..DnaCodeRepository.Bewaar(DnaCode)
-			}
-		}
-	}
-	If $isObject(DnaCode) {	
-		If Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
-			#dim RGID = ..BepaalRGIDviaDnaCode(DnaCode)
-			Set VolgNr = ..UGLYPickingWrapper.BuildBufferViaDnaCode(Toelevering, Pallet, Initialen, RGID)
-			Do ..UGLYPickingWrapper.CloseAndHandleBuffer(VolgNr, RGID)
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="BepaalRGIDviaDnaCode">
-<FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim Resultaat As %String = "~tmp"
-	If ##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode,"K") {
-		Set Resultaat = "KD"
-	} Else {
-		Set Resultaat = "TB"
-	}
-	Quit Resultaat
-]]></Implementation>
-</Method>
-
 <Method name="HernoemPallet">
 <FormalSpec>HernoemPalletRequest:WS.Halux.AAP.HernoemPalletRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.HernoemPalletResponse</ReturnType>
@@ -811,7 +720,7 @@
 					Set AantalKaderdeurenGescand = AantalKaderdeurenGescand + 1
 				}
 			}
-			Do ..DnaCodesKlaarmakenVoorBuffer(..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId), ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer(), ToeleveringId, ,RondAfKaderdeurDagRequest.Header.Initialen)
+			Do ..BufferHelper.DnaCodesKlaarmakenVoorBuffer(..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId), ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer(), ToeleveringId, ,RondAfKaderdeurDagRequest.Header.Initialen)
 			If $$$Not(AantalKaderdeuren = AantalKaderdeurenGescand) {
 				Set ToeleveringMetAantallen = ##class(WS.Halux.AAP.RondAfKaderdeurDag.ToeleveringMetAantallen).%New()
 				Set ToeleveringMetAantallen.ToeleveringID = ToeleveringId
@@ -897,7 +806,7 @@
 			Do PalletIterator.Next()
 			#dim Pallet As %String = PalletIterator.Key()
 			If ##class(TECH.StringUtils).StartsWith(Pallet, "O1") {
-				Do ..DnaCodesKlaarmakenVoorBuffer(..DnaCodeRepository.ZoekViaPalletCodeEnRecent(Pallet), ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer(), , Pallet, RondAfVhossBatchRequest.Header.Initialen)
+				Do ..BufferHelper.DnaCodesKlaarmakenVoorBuffer(..DnaCodeRepository.ZoekViaPalletCodeEnRecent(Pallet), ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer(), , Pallet, RondAfVhossBatchRequest.Header.Initialen)
 			}
 		}