Index: vhUnitTest/DOM/VKP/impl/LeverAdresRepository/GeefViaAxLeveradresId.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/VKP/impl/LeverAdresRepository/GeefViaAxLeveradresId.cls.xml	(revision 0)
+++ vhUnitTest/DOM/VKP/impl/LeverAdresRepository/GeefViaAxLeveradresId.cls.xml	(revision 48517)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.VKP.impl.LeverAdresRepository.GeefViaAxLeveradresId">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="TestKlantnaam">
+<Default>TestKlantnaam</Default>
+</Parameter>
+
+<Parameter name="TestKlantnummer">
+<Default>999999</Default>
+</Parameter>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ..VerwijderData()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..VerwijderData()
+	do ##super(aTestName)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ..VerwijderData()
+	do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: geen leveradressen aanwezig">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen leveradres voor combinatie KlantId 'K||' en AdresVolgnummer ''")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.InvalidInputException).%ClassName(1),Substrings))
+	
+	Set LeveradresRepository = ##class(DOM.VKP.impl.LeverAdresRepository).%New()
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeveradresRepository.GeefViaAXLeverAdresId("AXID1234")
+]]></Implementation>
+</Method>
+
+<Method name="Test: geen leveradressen aanwezig BestaatVia geeft false">
+<Implementation><![CDATA[
+	Set LeveradresRepository = ##class(DOM.VKP.impl.LeverAdresRepository).%New()
+	Do $$$AssertFalse(LeveradresRepository.BestaatViaAXLeverAdresId("AXID12341"),"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: 1 leveradres aanwezig">
+<Implementation><![CDATA[
+	Do ..VoegToeLeveradres("1")
+	
+	Set LeveradresRepository = ##class(DOM.VKP.impl.LeverAdresRepository).%New()
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeveradresRepository.GeefViaAXLeverAdresId("AXID12341")
+	
+	Do $$$AssertTrue(LeveradresRepository.BestaatViaAXLeverAdresId("AXID12341"),"")
+	
+	Do $$$AssertEquals(LeverAdres.GeefUniekId(),"84691")
+	Do $$$AssertEquals(LeverAdres.Straat,"TRADEBOULEVARD 5 A")
+	Do $$$AssertEquals(LeverAdres.Postcode,"NL-4761-RL")
+	Do $$$AssertEquals(LeverAdres.Gemeente,"ZEVENBERGEN")
+	Do $$$AssertEquals(LeverAdres.LandNr,"1147")
+	Do $$$AssertEquals(LeverAdres.Telefoon,"0031887651900")
+	Do $$$AssertEquals(LeverAdres.VerzendingWijze,"OD;4")
+	Do $$$AssertEquals(LeverAdres.GeefAdresType(),"L")
+	Do $$$AssertEquals(LeverAdres.GeefKlantId(),"K||"_..#TestKlantnummer)
+]]></Implementation>
+</Method>
+
+<Method name="Test: 2 leveradressen aanwezig (verschillend uniek id)">
+<Implementation><![CDATA[
+	Do ..VoegToeLeveradres("1")
+	Do ..VoegToeLeveradres("2")
+	
+	Set LeveradresRepository = ##class(DOM.VKP.impl.LeverAdresRepository).%New()
+	
+	Do $$$AssertTrue(LeveradresRepository.BestaatViaAXLeverAdresId("AXID12341"),"")
+	Do $$$AssertTrue(LeveradresRepository.BestaatViaAXLeverAdresId("AXID12342"),"")
+	Do $$$AssertFalse(LeveradresRepository.BestaatViaAXLeverAdresId("AXID12343"),"")
+	
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeveradresRepository.GeefViaAXLeverAdresId("AXID12342")
+	
+	Do $$$AssertEquals(LeverAdres.GeefUniekId(),"84692")
+	Do $$$AssertEquals(LeverAdres.Straat,"TRADEBOULEVARD 5 A")
+	Do $$$AssertEquals(LeverAdres.Postcode,"NL-4761-RL")
+	Do $$$AssertEquals(LeverAdres.Gemeente,"ZEVENBERGEN")
+	Do $$$AssertEquals(LeverAdres.LandNr,"1147")
+	Do $$$AssertEquals(LeverAdres.Telefoon,"0031887651900")
+	Do $$$AssertEquals(LeverAdres.VerzendingWijze,"OD;4")
+	Do $$$AssertEquals(LeverAdres.GeefAdresType(),"L")
+	Do $$$AssertEquals(LeverAdres.GeefKlantId(),"K||"_..#TestKlantnummer)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderData">
+<Implementation><![CDATA[
+	Kill ^KKL(..#TestKlantnaam_" "_..#TestKlantnummer)
+	Kill ^KK1(..#TestKlantnummer)
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeLeveradres">
+<FormalSpec>AdresVolgnummer:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ^KK1(..#TestKlantnummer) = ..#TestKlantnaam_" "_..#TestKlantnummer
+	Set ^KKL(..#TestKlantnaam_" "_..#TestKlantnummer,"L"_##class(TECH.StringUtils).AlignRight(AdresVolgnummer," ",3)) = "1\POLVO MOERDIJK CM\CENTRAAL MAGAZIJN\\TRADEBOULEVARD 5 A\NL-4761-RL\ZEVENBERGEN\1147\N\\\L\0031887651900\\\\\\.\\\\\LOSTIJDEN TUSSEN 7.00U EN 11.00U\\OD;4\\8469"_AdresVolgnummer_"\AXID1234"_AdresVolgnummer
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48510 -r48517
--- vhTest/Mock/DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48510)
+++ vhTest/Mock/DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48517)
@@ -8,6 +8,13 @@
 <Super>DOM.VKP.impl.LeverAdresRepository,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="BestaatViaAXLeverAdresId">
+<FormalSpec>AXLeverAdresId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatViaAXLeverAdresId",AXLeverAdresId)
+]]></Implementation>
+</Method>
+
 <Method name="BestaatViaID">
 <FormalSpec>ID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48510 -r48517
--- DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48510)
+++ DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48517)
@@ -61,6 +61,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatViaAXLeverAdresId">
+<FormalSpec>AXLeverAdresId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Query As %String = "SELECT count(ID) from Derde_Klant.LevAdres where AxLeveradresId = ?"
+	#dim Params As %List = $ListBuild(AXLeverAdresId)
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetDynamicResultSet(Query, Params)
+	
+	Do ResultSet.Next()
+	Quit ResultSet.GetData(1)
+]]></Implementation>
+</Method>
+
 <Method name="GeefViaAXLeverAdresId">
 <FormalSpec>AXLeverAdresId:%String</FormalSpec>
 <ReturnType>DOM.VKP.impl.LeverAdres</ReturnType>
@@ -69,11 +82,8 @@
 	#dim Params As %List = $ListBuild(AXLeverAdresId)
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetDynamicResultSet(Query, Params)
 	
-	If ResultSet.HasNext() {
-		Quit ..GeefViaID(ResultSet.Next.GetData())
-	} Else {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen leveradres voor AXLeverAdresId '"_AXLeverAdresId_"'"))
-	}
+	Do ResultSet.Next()
+	Quit ..GeefViaKlantIdEnAdresVolgnummer("K||"_$p(ResultSet.GetData(1),"||",1),##class(TECH.StringUtils).StripAllExceptNumeric($p(ResultSet.GetData(1),"||",2)))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48510 -r48517
--- vhTest/Fake/DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48510)
+++ vhTest/Fake/DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48517)
@@ -14,6 +14,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatViaAXLeverAdresId">
+<FormalSpec>AXLeverAdresId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="Bewaar">
 <Implementation><![CDATA[]]></Implementation>
 </Method>