Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r58226 -r58902
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 58226)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 58902)
@@ -164,13 +164,15 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: DnaCode heeft al status &apos;gescand&apos; -&gt; foutcode">
+<Method name="Test: DnaCode heeft al status &apos;InBuffer&apos; -&gt; -1 niet toegelaten">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
+	Set Request.Aantal = -1
+	Set Request.PalletCode = "TBX12345"
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode1.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand()
+	Set DnaCode1.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()
 	Set DnaCode1.DnaCode = "DnaCode"
 	Set DnaCode1.PalletCode = "TBX12345"
 	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
@@ -183,7 +185,7 @@
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidUserInput())
-	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"DnaCode '"_DnaCode1.DnaCode_"' reeds gescand ("_DnaCode1.PalletCode_")")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Reeds afgesloten. Gebruik 'Hernoem Pallet')")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58648 -r58902
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58648)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58902)
@@ -481,23 +481,30 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Geslaagd As %Boolean = $$$True
-	If ((DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand()) && $$$Not(DnaCodeAfmeldenRequest.Aantal = -1)) {
+	If ((DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer()) && (DnaCodeAfmeldenRequest.Aantal = -1)) {
 		Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidUserInput()
-		Set Response.Header.Omschrijving = "DnaCode '"_DnaCode.DnaCode_"' reeds gescand ("_DnaCode.PalletCode_")"
+		Set Response.Header.Omschrijving = "Reeds afgesloten. Gebruik 'Hernoem Pallet')"
 		Set Geslaagd = $$$False
 	} Else {
-		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_"'"
+		If ((DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand()) && $$$Not(DnaCodeAfmeldenRequest.Aantal = -1)) {
+			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidUserInput()
+			Set Response.Header.Omschrijving = "DnaCode '"_DnaCode.DnaCode_"' reeds gescand ("_DnaCode.PalletCode_")"
 			Set Geslaagd = $$$False
 		} Else {
-			If $$$HasLength(DnaCode.PalletCode) && $$$Not(DnaCodeAfmeldenRequest.Aantal=-1) {
+			If ($$$HasLength(DnaCodeAfmeldenRequest.Toelevering) && $$$Not(DnaCode.Toelevering = DnaCodeAfmeldenRequest.Toelevering)) {
 				Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
-				Set Response.Header.Omschrijving = "PalletCode reeds ingevuld voor '"_DnaCodeAfmeldenRequest.DnaCode_"' ("_DnaCode.PalletCode_")"
+				Set Response.Header.Omschrijving = "Toeleveringen verschillend: '"_DnaCodeAfmeldenRequest.Toelevering_"' en '"_DnaCode.Toelevering_"'"
 				Set Geslaagd = $$$False
+			} Else {
+				If $$$HasLength(DnaCode.PalletCode) && $$$Not(DnaCodeAfmeldenRequest.Aantal=-1) {
+					Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
+					Set Response.Header.Omschrijving = "PalletCode reeds ingevuld voor '"_DnaCodeAfmeldenRequest.DnaCode_"' ("_DnaCode.PalletCode_")"
+					Set Geslaagd = $$$False
+				}
 			}
 		}
 	}
+	Do ##class(Tools.Wlip).%New(127).String(Geslaagd)
 	Quit Geslaagd
 ]]></Implementation>
 </Method>