Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r55687 -r55688
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 55687)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 55688)
@@ -143,35 +143,27 @@
 		} Else {
 			#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
 			
-			If ($$$HasLength(DnaCodeAfmeldenRequest.Toelevering) && $$$Not(DnaCode.Toelevering = DnaCodeAfmeldenRequest.Toelevering)) {
-				Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
-				Set Response.Header.Omschrijving = "Toeleveringen verschillend: '"_DnaCodeAfmeldenRequest.Toelevering_"' en '"_DnaCode.Toelevering_"'"
-			} Else {
-				If $$$HasLength(DnaCode.PalletCode) {
-					Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
-					Set Response.Header.Omschrijving = "PalletCode reeds ingevuld voor '"_DnaCodeAfmeldenRequest.DnaCode_"' ("_DnaCode.PalletCode_")"
-				} Else {
+			If ..ValideerInput(DnaCodeAfmeldenRequest, .Response, DnaCode) {
+				Set DnaCode.InitialenScanner = DnaCodeAfmeldenRequest.Header.Initialen
+				Set DnaCode.PalletCode = DnaCodeAfmeldenRequest.PalletCode
 				
-					Set DnaCode.InitialenScanner = DnaCodeAfmeldenRequest.Header.Initialen
-					Set DnaCode.PalletCode = DnaCodeAfmeldenRequest.PalletCode
-					
-					Set ToeleveringId = DnaCode.Toelevering
-					
-					Do ..DnaCodeRepository.Bewaar(DnaCode)
-					
-					Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringId(ToeleveringId)
-					
-					If DnaCodeIterator.HasNext() {
-						Set Response.Header.Status = "200"
-						While DnaCodeIterator.HasNext() {
-							Do Response.DnaCodes.Insert(..DnaCodeNaarDto(DnaCodeIterator.Next()))
-						}
-					} Else {
-						Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
-						Set Response.Header.Omschrijving = "Geen data gevonden voor DNACode '"_ToeleveringId_"'"
+				Set ToeleveringId = DnaCode.Toelevering
+				
+				Do ..DnaCodeRepository.Bewaar(DnaCode)
+				
+				Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringId(ToeleveringId)
+				
+				If DnaCodeIterator.HasNext() {
+					Set Response.Header.Status = "200"
+					While DnaCodeIterator.HasNext() {
+						Do Response.DnaCodes.Insert(..DnaCodeNaarDto(DnaCodeIterator.Next()))
 					}
+				} Else {
+					Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
+					Set Response.Header.Omschrijving = "Geen data gevonden voor DNACode '"_ToeleveringId_"'"
 				}
 			}
+				
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -183,6 +175,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ValideerInput">
+<FormalSpec>DnaCodeAfmeldenRequest:WS.Halux.AAP.DnaCodeAfmeldenRequest,Response:WS.Halux.AAP.DnaCodeAfmeldenResponse,DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Geslaagd As %Boolean = $$$True
+	If ($$$HasLength(DnaCodeAfmeldenRequest.Toelevering) && $$$Not(DnaCode.Toelevering = DnaCodeAfmeldenRequest.Toelevering)) {
+		Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
+		Set Response.Header.Omschrijving = "Toeleveringen verschillend: '"_DnaCodeAfmeldenRequest.Toelevering_"' en '"_DnaCode.Toelevering_"'"
+		Set Geslaagd = $$$False
+	} Else {
+		If $$$HasLength(DnaCode.PalletCode) {
+			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
+			Set Response.Header.Omschrijving = "PalletCode reeds ingevuld voor '"_DnaCodeAfmeldenRequest.DnaCode_"' ("_DnaCode.PalletCode_")"
+			Set Geslaagd = $$$False
+		}
+	}
+	Quit Geslaagd
+]]></Implementation>
+</Method>
+
 <Method name="DnaCodeNaarDto">
 <FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
 <Private>1</Private>