Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58903 -r58909
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58903)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58909)
@@ -243,34 +243,11 @@
 		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaToeleveringId(ToeleveringBijwerkenRequest.Toelevering)
 		If DnaCodeIterator.HasNext() {
 			Set Response.Header.Status = "200"
-			While DnaCodeIterator.HasNext() {
-				Set DnaCode = DnaCodeIterator.Next()
-				
-				If ToeleveringBijwerkenRequest.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 ToeleveringBijwerkenRequest.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
-					Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(ToeleveringBijwerkenRequest.Toelevering, , ToeleveringBijwerkenRequest.Header.Initialen,.VolgNr)
-					
-					If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
-						Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()
-						Do ..DnaCodeRepository.Bewaar(DnaCode)
-					}
-					
-					Do ##class(BL.MB.UGLYPicking.Receptie).CloseAndHandleBuffer("~tmp",VolgNr)
-				}
-				
-			}
+			Do ..DnaCodesKlaarmakenVoorBuffer(DnaCodeIterator, ToeleveringBijwerkenRequest.Status, ToeleveringBijwerkenRequest.Toelevering, ,ToeleveringBijwerkenRequest.Header.Initialen)
 		} Else {
 			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
 			Set Response.Header.Omschrijving = "Geen data gevonden voor toelevering '"_ToeleveringBijwerkenRequest.Toelevering_"'"
 		}
-
-		
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set Response.Header.Status = Exception.GeefExceptionCode()
@@ -292,35 +269,11 @@
 		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaPalletCode(PalletBijwerkenRequest.Pallet)
 		If DnaCodeIterator.HasNext() {
 			Set Response.Header.Status = "200"
-			While DnaCodeIterator.HasNext() {
-				Set DnaCode = DnaCodeIterator.Next()
-				
-				If PalletBijwerkenRequest.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 PalletBijwerkenRequest.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
-					Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(, PalletBijwerkenRequest.Pallet, PalletBijwerkenRequest.Header.Initialen,.VolgNr)
-					
-					If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
-						Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()
-						Set DnaCode.Locatie = ##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit()
-						Do ..DnaCodeRepository.Bewaar(DnaCode)
-					}
-					
-					Do ##class(BL.MB.UGLYPicking.Receptie).CloseAndHandleBuffer("~tmp",VolgNr)
-				}
-				
-			}
+			Do ..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()
@@ -330,6 +283,39 @@
 ]]></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 %String		
+
+	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 Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer() {
+			Do ##class(BL.MB.UGLYPicking.Receptie).BuildBufferViaDnaCode(Toelevering, Pallet, Initialen,.VolgNr)
+			
+			If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
+				Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()
+				Set DnaCode.Locatie = ##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit()
+				Do ..DnaCodeRepository.Bewaar(DnaCode)
+			}
+			
+			Do ##class(BL.MB.UGLYPicking.Receptie).CloseAndHandleBuffer("~tmp",VolgNr)
+		}
+		
+	}
+]]></Implementation>
+</Method>
+
 <Method name="HernoemPallet">
 <FormalSpec>HernoemPalletRequest:WS.Halux.AAP.HernoemPalletRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.HernoemPalletResponse</ReturnType>