Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r56640 -r58207
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 56640)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 58207)
@@ -156,13 +156,41 @@
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"PalletCode reeds ingevuld voor '"_Request.DnaCode_"' (TBX12345)")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
 	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test: DnaCode heeft al status &apos;gescand&apos; -&gt; foutcode">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand()
+	Set DnaCode1.DnaCode = "DnaCode"
+	Set DnaCode1.PalletCode = "TBX12345"
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCode",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(0)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).InvalidInput())
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"DnaCode '"_DnaCode1.DnaCode_"' reeds gescand ("_DnaCode1.PalletCode_")")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
+	Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Aantal = -1 -&gt; afmelden ongedaan maken">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58133 -r58207
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58133)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58207)
@@ -388,15 +388,21 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Geslaagd As %Boolean = $$$True
-	If ($$$HasLength(DnaCodeAfmeldenRequest.Toelevering) && $$$Not(DnaCode.Toelevering = DnaCodeAfmeldenRequest.Toelevering)) {
+	If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
 		Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
-		Set Response.Header.Omschrijving = "Toeleveringen verschillend: '"_DnaCodeAfmeldenRequest.Toelevering_"' en '"_DnaCode.Toelevering_"'"
+		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
+			}
 		}
 	}
 	Quit Geslaagd