Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r55670 -r55685
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 55670)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 55685)
@@ -103,10 +103,8 @@
 	
 	Try {
 		Do ..HeaderValidator.ValidateHeader(ZoekViaToeleveringRequest.Header)
-
-		#dim ToeleveringId As %String = ##class(TECH.StringUtils).ToUpper(ZoekViaToeleveringRequest.Toelevering)
 		
-		#dim DnaCodeIterator As TECH.Iteraot = ..DnaCodeRepository.ZoekViaToeleveringId(ToeleveringId)
+		#dim DnaCodeIterator As TECH.Iteraot = ..DnaCodeRepository.ZoekViaToeleveringId(ZoekViaToeleveringRequest.Toelevering)
 		
 		If DnaCodeIterator.HasNext() {
 			Set Response.Header.Status = "200"
@@ -115,7 +113,7 @@
 			}
 		} Else {
 			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
-			Set Response.Header.Omschrijving = "Geen data gevonden voor pallet "_ToeleveringId
+			Set Response.Header.Omschrijving = "Geen data gevonden voor pallet "_ZoekViaToeleveringRequest.Toelevering
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -131,7 +129,46 @@
 <ReturnType>WS.Halux.AAP.DnaCodeAfmeldenResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	#dim ToeleveringId As %String = ""
 	Set Response = ##class(WS.Halux.AAP.DnaCodeAfmeldenResponse).%New()
+	
+	Try {
+		Do ..HeaderValidator.ValidateHeader(DnaCodeAfmeldenRequest.Header)
+
+		#dim DnaCodeIterator As TECH.Iterator = ..DnaCodeRepository.ZoekViaDnaCode(DnaCodeAfmeldenRequest.DnaCode)
+		
+		If $$$Not(DnaCodeIterator.HasNext()) {
+			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
+			Set Response.Header.Omschrijving = "Geen DNACode-data gevonden voor DNACode '"_DnaCodeAfmeldenRequest.DnaCode_"'"
+		} Else {
+			#dim DnaCode As DOM.Halux.AAP.DnaCode = DnaCodeIterator.Next()
+			
+			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 ##class(Tools.Wlip).%New(127).String("radaa")
+					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()
+		Set Response.Header.Status = Exception.GeefExceptionCode()
+		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
+	}
+	
 	Quit Response
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(revision 55685)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.DnaCodeAfmelden.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Standaardgedrag: 1 Bestaande code afmelden (geen toelevering meegegeven)">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
+	Set Request.DnaCode = "DnaCode"
+	
+	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
+	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode1.Toelevering = "333333"
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2.Toelevering = "333333"
+	#dim DnaCodeIteratorEenStuk As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
+	#dim DnaCodeIteratorTweeStuks As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaDnaCode",Request.DnaCode).DanReturn(DnaCodeIteratorEenStuk)
+	Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringId",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock, DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
+	Do HeaderValidatorMock.Verifieer()
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: DnaCode niet gevonden -&gt; exception">
+</Method>
+
+<Method name="Test: Meegeleverde toelevering verschillend van DnaCode-Toelevering -&gt; exception">
+</Method>
+
+<Method name="Test: DnaCode heeft al LocatieId ingevuld -&gt; exception">
+</Method>
+</Class>
+
+
+</Export>