Index: vhTest/Mock/APPS/VKP/Offerte/OfferteRepository.cls.xml
===================================================================
diff -u -r36838 -r38777
--- vhTest/Mock/APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 36838)
+++ vhTest/Mock/APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 38777)
@@ -8,6 +8,13 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.VKP.Offerte.OfferteRepository,vhTest.Mock.TECH.Persistentie.Repository</Super>
 <Inheritance>right</Inheritance>
+
+<Method name="BestaatViaExterneId">
+<FormalSpec>ExterneId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatViaExterneId",ExterneId)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r38771 -r38777
--- vhTest/Mock/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 38771)
+++ vhTest/Mock/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 38777)
@@ -58,14 +58,14 @@
 </Method>
 
 <Method name="MaakOfferte">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String=""</FormalSpec>
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakOfferte",KlantID,PersonalityID,ExterneId)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakWinkelKar">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String=""</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("MaakWinkelKar",KlantID,PersonalityID,ExterneId)
 ]]></Implementation>
 </Method>
Index: APPS/VKP/Offerte/OfferteRepository.cls.xml
===================================================================
diff -u -r36838 -r38777
--- APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 36838)
+++ APPS/VKP/Offerte/OfferteRepository.cls.xml	(.../OfferteRepository.cls.xml)	(revision 38777)
@@ -3,6 +3,12 @@
 <Class name="APPS.VKP.Offerte.OfferteRepository">
 <Abstract>1</Abstract>
 <Super>TECH.Persistentie.Repository</Super>
+
+<Method name="BestaatViaExterneId">
+<Abstract>1</Abstract>
+<FormalSpec>ExterneId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakWinkelkar/Test.cls.xml
===================================================================
diff -u -r38759 -r38777
--- vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 38759)
+++ vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 38777)
@@ -20,6 +20,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Maakwinkelkar controleert op bestaande ExterneId">
+<Implementation><![CDATA[
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = $$$DummyInteger
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+	#dim ExterneId As %String = $$$DummyInteger
+	
+	#dim WinkelkarServiceMock As vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService).%New()
+	Do WinkelkarServiceMock.IndienMethodCall("MaakWinkelkar", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
+
+	#dim OfferteServiceMock As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceMock.VerwachtMethodCall("ControleerOfferteViaExterneId", ExterneId).DanDoeNiks()
+	
+	#dim VerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteServiceMock, WinkelkarServiceMock)
+	Do VerkoopService.MaakWinkelKar(KlantID,PersonalityID, ExterneId)
+	
+	Do OfferteServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefApplicatie">
 <Private>1</Private>
 <ReturnType>APPS.common.dto.Applicatie</ReturnType>
Index: APPS/VKP/impl/OfferteService.cls.xml
===================================================================
diff -u -r37534 -r38777
--- APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 37534)
+++ APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 38777)
@@ -49,6 +49,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ControleerOfferteViaExterneId">
+<FormalSpec>ExterneId:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	If ..OfferteRepository.BestaatViaExterneId(ExterneId) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Er bestaat reeds een offerte met ExterneId "_ExterneId_" waardoor de bewerking niet wordt uitgevoerd."))			
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GeefDocument">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>APPS.VKP.impl.Offerte</ReturnType>
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml
===================================================================
diff -u -r38762 -r38777
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 38762)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 38777)
@@ -8,7 +8,7 @@
 	#dim KlantID As %String = "K||1000"
 	
 	#dim VerkoopServiceMock As vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do VerkoopServiceMock.VerwachtMethodCall("MaakWinkelKar",KlantID,##class(DOM.common.enu.Personality).VanHoecke()).DanDoeNiks()
+	Do VerkoopServiceMock.VerwachtMethodCall("MaakWinkelKar",KlantID,##class(DOM.common.enu.Personality).VanHoecke(), "").DanDoeNiks()
 
 	#dim LegacyPartijAPIMock As vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
 	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID",KlantID).DanReturn($$$True)
@@ -30,7 +30,7 @@
 	#dim KlantID As %String = "1000"
 	
 	#dim VerkoopServiceMock As vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do VerkoopServiceMock.VerwachtMethodCall("MaakWinkelKar","K||1000",##class(DOM.common.enu.Personality).VanHoecke()).DanDoeNiks()
+	Do VerkoopServiceMock.VerwachtMethodCall("MaakWinkelKar","K||1000",##class(DOM.common.enu.Personality).VanHoecke(), "").DanDoeNiks()
 
 	#dim LegacyPartijAPIMock As vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
 	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID",KlantID).DanReturn($$$False)
@@ -53,7 +53,7 @@
 	#dim KlantID As %String = "K||1000"
 	
 	#dim VerkoopServiceMock As vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do VerkoopServiceMock.VerwachtMethodCall("MaakWinkelKar","K||1000",##class(DOM.common.enu.Personality).VanHoecke()).DanDoeNiks()
+	Do VerkoopServiceMock.VerwachtMethodCall("MaakWinkelKar","K||1000",##class(DOM.common.enu.Personality).VanHoecke(),"").DanDoeNiks()
 
 	#dim LegacyPartijAPIMock As vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
 	Do LegacyPartijAPIMock.IndienMethodCall("IsKlantPartijID",KlantID).DanReturn($$$True)
Index: vhTest/Mock/APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r37430 -r38777
--- vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 37430)
+++ vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 38777)
@@ -9,6 +9,12 @@
 <Super>APPS.VKP.OfferteService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="ControleerOfferteViaExterneId">
+<FormalSpec>ExterneId:%String=""</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ControleerOfferteViaExterneId",ExterneId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefBestelStatusUpdater">
 <ReturnType>APPS.VKP.Offerte.BestelStatusUpdater</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefBestelStatusUpdater")
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml
===================================================================
diff -u -r38432 -r38777
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 38432)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 38777)
@@ -12,7 +12,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID,"").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID").ExactAantalKeer(0)
 	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
@@ -47,7 +47,7 @@
 <Method name="Test: Indien geen lijnen, wordt er geen offerte gemaakt">
 <Implementation><![CDATA[
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).ExactAantalKeer(0)
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").ExactAantalKeer(0)
 
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock,,,,)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(..GeefAanvraag())
@@ -63,7 +63,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID")
 		
@@ -86,7 +86,7 @@
 <Method name="Test: Bij ongeldige Leverdatum wordt verwijder offerte opgeroepen en bevat het resultaat een exceptie, natuurlijk wordt de offerte dan niet besteld">
 <Implementation><![CDATA[
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("BestelOfferte","OfferteID",..#KlantID,..#PersonalityID).ExactAantalKeer(0)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID")
 	
@@ -112,7 +112,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	
 	Set Orderlijnen = ##class(%ListOfDataTypes).%New()
@@ -141,7 +141,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	
 	Set Orderlijnen = ##class(%ListOfDataTypes).%New()
@@ -170,7 +170,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	
 	Set Orderlijnen = ##class(%ListOfDataTypes).%New()
@@ -199,7 +199,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).ExactAantalKeer(0)
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").ExactAantalKeer(0)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(0)
 	
 	Set Orderlijnen = ##class(%ListOfDataTypes).%New()
@@ -226,7 +226,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).ExactAantalKeer(0)
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").ExactAantalKeer(0)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(0)
 
 	Set Orderlijnen = ##class(%ListOfDataTypes).%New()
@@ -254,7 +254,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	
 	Set Orderlijnen = ##class(%ListOfDataTypes).%New()
@@ -284,7 +284,7 @@
 <Implementation><![CDATA[
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID, "").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	
 	Set Orderlijnen = ##class(%ListOfDataTypes).%New()
@@ -502,7 +502,7 @@
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID,"").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID")
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	
@@ -576,7 +576,7 @@
 
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID).DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
+	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID,"").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID").ExactAantalKeer(1)
 	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
Index: APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml
===================================================================
diff -u -r38774 -r38777
--- APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 38774)
+++ APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 38777)
@@ -55,7 +55,7 @@
 <Method name="MaakWinkelKar">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String=""</FormalSpec>
 <Implementation><![CDATA[
-	Do ..ControleerOfferteViaExterneId(ExterneId)
+	Do ..OfferteService.ControleerOfferteViaExterneId(ExterneId)
 	Do ..WinkelkarService.MaakWinkelkar(..Applicatie, KlantID, PersonalityID)
 ]]></Implementation>
 </Method>
@@ -64,7 +64,7 @@
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String=""</FormalSpec>
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
 <Implementation><![CDATA[
-	Do ..ControleerOfferteViaExterneId(ExterneId)
+	Do ..OfferteService.ControleerOfferteViaExterneId(ExterneId)
 	#dim Offerte As APPS.VKP.impl.Offerte = ..OfferteService.MaakNieuwOfferte(KlantID, PersonalityID)
 	
 	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.MaakWinkelkar(..Applicatie, KlantID, PersonalityID)
@@ -190,16 +190,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ControleerOfferteViaExterneId">
-<FormalSpec>ExterneId:%String=""</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If ..OfferteRepository.BestaatViaExterneId(ExterneId) {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Er bestaat reeds een offerte met ExterneId "_ExterneId_" waardoor de bewerking niet wordt uitgevoerd."))			
-	}
-]]></Implementation>
-</Method>
-
 <Method name="ZetOfferteHoofding">
 <FormalSpec>OfferteID:%String,Hoofding:APPS.EC.dto.Hoofding</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/APPS/VKP/impl/OfferteService/ControleerOfferteViaterneId/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VKP/impl/OfferteService/ControleerOfferteViaterneId/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VKP/impl/OfferteService/ControleerOfferteViaterneId/Test.cls.xml	(revision 38777)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.VKP.impl.OfferteService.ControleerOfferteViaterneId.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Reeds bestaande ExterneId geeft een foutmelding">
+<Implementation><![CDATA[
+	#dim OfferteRepositoryMock As vhTest.Mock.APPS.VKP.Offerte.OfferteRepository = ##class(vhTest.Mock.APPS.VKP.Offerte.OfferteRepository).%New()
+	Do OfferteRepositoryMock.IndienMethodCall("BestaatViaExterneId",$$$DummyInteger).DanReturn($$$True)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Er bestaat reeds een offerte met ExterneId 0 waardoor de bewerking niet wordt uitgevoerd.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
+	
+	#dim OfferteService As APPS.VKP.impl.OfferteService = ##class(APPS.VKP.impl.OfferteService).%New(OfferteRepositoryMock)
+	Do OfferteService.ControleerOfferteViaExterneId($$$DummyInteger)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Niet bestaande ExterneId geeft geen foutmelding">
+<Implementation><![CDATA[
+	#dim OfferteRepositoryMock As vhTest.Mock.APPS.VKP.Offerte.OfferteRepository = ##class(vhTest.Mock.APPS.VKP.Offerte.OfferteRepository).%New()
+	Do OfferteRepositoryMock.IndienMethodCall("BestaatViaExterneId",$$$DummyInteger).DanReturn($$$False)
+	
+	#dim OfferteService As APPS.VKP.impl.OfferteService = ##class(APPS.VKP.impl.OfferteService).%New(OfferteRepositoryMock)
+	Do OfferteService.ControleerOfferteViaExterneId($$$DummyInteger)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r37430 -r38777
--- APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 37430)
+++ APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 38777)
@@ -4,6 +4,11 @@
 <Abstract>1</Abstract>
 <Super>APPS.VKP.DocumentService</Super>
 
+<Method name="ControleerOfferteViaExterneId">
+<Abstract>1</Abstract>
+<FormalSpec>ExterneId:%String=""</FormalSpec>
+</Method>
+
 <Method name="GeefOfferte">
 <Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String</FormalSpec>
Index: APPS/EC/Verkoop/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r38771 -r38777
--- APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 38771)
+++ APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 38777)
@@ -20,12 +20,12 @@
 
 <Method name="MaakWinkelKar">
 <Abstract>1</Abstract>
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String=""</FormalSpec>
 </Method>
 
 <Method name="MaakOfferte">
 <Abstract>1</Abstract>
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality,ExterneId:%String=""</FormalSpec>
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>