Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaLadecode/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaLadecode/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaLadecode/Test.cls.xml	(revision 60796)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.ZoekViaLadecode.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Standaardgedrag: data gevonden">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.ZoekViaLadecodeRequest).%New()
+	Set Request.Ladecode = "L.AB.CD.1"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaLadecodeEnRecent",Request.Ladecode).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaLadecode(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen data gevonden">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.ZoekViaLadecodeRequest).%New()
+	Set Request.Ladecode = "L.AB.CD.1"
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaLadecodeEnRecent",Request.Ladecode).DanReturn(..EmptyIterator())
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.ZoekViaLadecodeResponse = DnaCodeService.ZoekViaLadecode(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor Ladecode '"_Request.Ladecode_"'")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r60765 -r60796
--- DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60765)
+++ DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60796)
@@ -113,18 +113,21 @@
 
 <Method name="ZoekViaKlantnummer">
 <FormalSpec>Klantnummer:%String</FormalSpec>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("KlantNummer = ? and (AanmaakTijdstip > current_date - 90)",$lb(Klantnummer))
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("KlantNummer = ? and (AanmaakTijdstip > current_date - 90)",$lb(##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(Klantnummer)))
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaOrdernummer">
 <FormalSpec>Ordernummer:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	Quit ..ZoekViaFilter("OrderId = ? and (AanmaakTijdstip > current_date - 90)",$lb(Ordernummer))
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaLadecodeEnRecent">
 <FormalSpec>Ladecode:%String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	Quit ..ZoekViaFilter("LadeCode = ? and (AanmaakTijdstip > current_date - 30)",$lb(Ladecode))
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r60765 -r60796
--- vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60765)
+++ vhTest/Mock/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60796)
@@ -115,19 +115,22 @@
 
 <Method name="ZoekViaKlantnummer">
 <FormalSpec>Klantnummer:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZoekViaKlantnummer",Klantnummer)
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaKlantnummer",Klantnummer)
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaLadecodeEnRecent">
 <FormalSpec>Ladecode:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZoekViaLadecodeEnRecent",Ladecode)
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaLadecodeEnRecent",Ladecode)
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaOrdernummer">
 <FormalSpec>Ordernummer:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZoekViaOrdernummer",Ordernummer)
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaOrdernummer",Ordernummer)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml
===================================================================
diff -u -r60765 -r60796
--- vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60765)
+++ vhTest/Fake/DOM/Halux/AAP/DnaCodeRepository.cls.xml	(.../DnaCodeRepository.cls.xml)	(revision 60796)
@@ -21,20 +21,20 @@
 
 <Method name="ZoekViaKlantnummer">
 <FormalSpec>Klantnummer:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="ZoekViaLadecodeEnRecent">
 <FormalSpec>Ladecode:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="ZoekViaOrdernummer">
 <FormalSpec>Ordernummer:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwijderDnaCodesVoorBatchId">
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaKlantnummer/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaKlantnummer/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaKlantnummer/Test.cls.xml	(revision 60796)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.ZoekViaKlantnummer.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Standaardgedrag: data gevonden">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.ZoekViaKlantnummerRequest).%New()
+	Set Request.Klantnummer = "1234"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaKlantnummer",Request.Klantnummer).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaKlantnummer(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen data gevonden">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.ZoekViaKlantnummerRequest).%New()
+	Set Request.Klantnummer = "1234"
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaKlantnummer",Request.Klantnummer).DanReturn(..EmptyIterator())
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaKlantnummer(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor Klantnummer '"_Request.Klantnummer_"'")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaOrdernummer/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaOrdernummer/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaOrdernummer/Test.cls.xml	(revision 60796)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.ZoekViaOrdernummer.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Standaardgedrag: data gevonden">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.ZoekViaOrdernummerRequest).%New()
+	Set Request.Ordernummer = "1234"
+	
+	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaOrdernummer",Request.Ordernummer).DanReturn(DnaCodeIterator)
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaOrdernummer(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,"200")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen data gevonden">
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Halux.AAP.ZoekViaOrdernummerRequest).%New()
+	Set Request.Ordernummer = "1234"
+	
+	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaOrdernummer",Request.Ordernummer).DanReturn(..EmptyIterator())
+	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	
+	#dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaOrdernummer(Request)
+	
+	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor Ordernummer '"_Request.Ordernummer_"'")
+	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
+	Do DnaCodeRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>