Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62889 -r62950
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62889)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62950)
@@ -33,11 +33,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="UGLYPickingWrapper">
-<Type>WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="KlantinstellingenRepository">
 <Type>vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository</Type>
 <Private>1</Private>
@@ -73,8 +68,13 @@
 <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>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",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>
@@ -85,14 +85,14 @@
 	Set ..DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
 	Set ..InventarisService = $$$Inject(InventarisService, ##class(APPS.MAG.Inventaris.impl.InventarisService).%New())
 	Set ..DocsV1 = $$$Inject(DocsV1, ##class(BL.PPS.TBX.DocsV1).%New())
-	Set ..UGLYPickingWrapper = $$$Inject(UGLYPickingWrapper, ##class(WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper).%New())
 	Set ..KlantinstellingenRepository = $$$Inject(KlantinstellingenRepository, ##class(DOM.Halux.AAP.KlantinstellingenRepository).%New())
 	Set ..VerkoopAPI = $$$Inject(VerkoopAPI, ##class(DOM.VKP.impl.VerkoopAPI).%New())
 	Set ..AantalGescandeVhossSequentieItemsBepaler = $$$Inject(AantalGescandeVhossSequentieItemsBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New())
 	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())
+	Set ..BufferHelper = ##class(WSimpl.Halux.AAP.DnaCodeService.BufferHelper).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -448,7 +448,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,14 +483,13 @@
 		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)
 		} Else {
 			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
 			Set Response.Header.Omschrijving = "Geen data gevonden voor pallet '"_PalletBijwerkenRequest.Pallet_"'"
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		
 		Set Response.Header.Status = Exception.GeefExceptionCode()
 		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
 		Do ##class(vhLib.Logger).%New().Warning("AAP",Exception.GeefOmschrijving())
@@ -499,46 +498,6 @@
 ]]></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>
@@ -597,14 +556,17 @@
 					
 					If $$$Not(..IsKaderdeurLocatie(NieuwePalletCode)) {
 						If HernoemPalletRequest.OokEWMSverwerken {
+							#dim OudePalletCodeEWMSCompatibel As %String = OudePalletCode
+							#dim NieuwePalletCodeEWMSCompatibel As %String = NieuwePalletCode
+							If ##class(APPS.VisiDot.impl.Tech).IsFrameID(OudePalletCode) {
+								Set OudePalletCodeEWMSCompatibel = ##class(APPS.VisiDot.impl.Tech).GeefVHossIdVanFrameId(OudePalletCode)
+								Set NieuwePalletCodeEWMSCompatibel = ##class(APPS.VisiDot.impl.Tech).GeefVHossIdVanFrameId(NieuwePalletCode)
+							}
 							If $$$Not($$$HasLength(HernoemPalletRequest.EnkelDezeDnaCode)) {
-								Do ..InventarisService.HernoemPallet(OudePalletCode, NieuwePalletCode)
+								Do ..InventarisService.HernoemPallet(OudePalletCodeEWMSCompatibel, NieuwePalletCodeEWMSCompatibel)
 							} Else {
-								Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidUserInputException).%New("Deze actie is niet mogelijk"))
-								/*#dim Locatie As DOM.MAG.MagazijnLocatie = ..InventarisService.GeefLocatieVoorDrager(OudePalletCode).GeefCode()
-								Do ..InventarisService.VerplaatsPallet(OudePalletCode, ##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit())
-								Do ..InventarisService.VoerBijladenUit(OudePalletCode, NieuwePalletCode, ##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit(), DnaCode.ProductNummer, 1)
-								Do ..InventarisService.VerplaatsPallet(OudePalletCode,Locatie)*/
+								Do ..InventarisService.VoerBijladenUit(OudePalletCodeEWMSCompatibel, NieuwePalletCodeEWMSCompatibel, ##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit(), DnaCode.ProductNummer, 1)
+								
 							}
 						}
 					}
@@ -624,7 +586,7 @@
 						Do ..DnaCodeRepository.Bewaar(DnaCode)
 					}
 					
-					If ##class(APPS.VisiDot.impl.Tech).IsFrameID(OudePalletCode) {
+					If ##class(APPS.VisiDot.impl.Tech).IsFrameID(OudePalletCode) && ((HernoemPalletRequest.EnkelDezeDnaCode)= "") {
 						#dim OudePalletCodeAndereKant = ##class(APPS.VisiDot.impl.Tech).GeefFrameIdAndereZijkant(OudePalletCode)
 						#dim NieuwePalletCodeAndereKant = ##class(APPS.VisiDot.impl.Tech).GeefFrameIdAndereZijkant(NieuwePalletCode)
 						Set DnaCodeIterator = ..DnaCodeRepository.ZoekVoorHernoemPallet(OudePalletCodeAndereKant)	
@@ -752,7 +714,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
@@ -838,7 +800,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)
 			}
 		}