Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58496 -r58566
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58496)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58566)
@@ -306,7 +306,7 @@
 	Try {
 		If NieuwePalletCode = "" {
 			
-			If $Length(OudePalletCode)=7 {
+			If ..IsDnaCode(OudePalletCode) {
 				Set OudePalletCode = ..GeefPalletCodeVanDnaCode(OudePalletCode)
 			}
 			
@@ -328,10 +328,10 @@
 				Set Response.Header.OmschrijvingVoorLogging = "Ongeldige code: '"_OudePalletCode_"'"
 			}
 		} Else {
-			If $Length(NieuwePalletCode)=7 {
+			If ..IsDnaCode(NieuwePalletCode) {
 				Set NieuwePalletCode = ..GeefPalletCodeVanDnaCode(NieuwePalletCode)
 			}
-			If $Length(OudePalletCode)=7 {
+			If ..IsDnaCode(OudePalletCode) {
 				Set OudePalletCode = ..GeefPalletCodeVanDnaCode(OudePalletCode)
 			}
 			If $$$Not(..PalletCodeValidator.ValideerPalletCode(OudePalletCode)) || $$$Not(..PalletCodeValidator.ValideerPalletCode(NieuwePalletCode)) {
@@ -369,6 +369,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsDnaCode">
+<FormalSpec>Input:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $Length(Input)=7
+]]></Implementation>
+</Method>
+
 <Method name="IsDirecteLevering">
 <FormalSpec>DirecteLeveringRequest:WS.Halux.AAP.DirecteLeveringRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.DirecteLeveringResponse</ReturnType>