Index: WS/TBX/DataIOWWW.cls.xml
===================================================================
diff -u
--- WS/TBX/DataIOWWW.cls.xml	(revision 0)
+++ WS/TBX/DataIOWWW.cls.xml	(revision 40580)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WS.TBX.DataIOWWW">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="PeekServer">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="WSOrdToWWW">
+<Abstract>1</Abstract>
+<FormalSpec>WSOrd:WS.TBX.Order,SecureKey:%String,Opties:%String=""</FormalSpec>
+<ReturnType>%List</ReturnType>
+</Method>
+
+<Method name="GetWSOrdFromWWW">
+<Abstract>1</Abstract>
+<FormalSpec>WSOrderID:%String,SecureKey:%String</FormalSpec>
+<ReturnType>WS.TBX.Order</ReturnType>
+</Method>
+
+<Method name="UpdateWSOrdPropts">
+<Abstract>1</Abstract>
+<FormalSpec>WSOrderID:%String,SecureKey:%String,ProptName:%String,ProptValue:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="DeleteWSOrdOnWWW">
+<Abstract>1</Abstract>
+<FormalSpec>WSOrderID:%String,SecureKey:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/TBX/DataIOWWWSoap.cls.xml
===================================================================
diff -u -r39107 -r40580
--- WS/TBX/DataIOWWWSoap.cls.xml	(.../DataIOWWWSoap.cls.xml)	(revision 39107)
+++ WS/TBX/DataIOWWWSoap.cls.xml	(.../DataIOWWWSoap.cls.xml)	(revision 40580)
@@ -3,7 +3,7 @@
 <Class name="WS.TBX.DataIOWWWSoap">
 <ClassType/>
 <ProcedureBlock>0</ProcedureBlock>
-<Super>%SOAP.WebClient,WS.SOAPClientExt</Super>
+<Super>%SOAP.WebClient,WS.SOAPClientExt,WS.TBX.DataIOWWW</Super>
 <Inheritance>right</Inheritance>
 
 <Parameter name="XMLIGNORENULL">
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test.cls.xml
===================================================================
diff -u -r40572 -r40580
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 40572)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 40580)
@@ -143,18 +143,33 @@
 	
 	#dim Aanvraag1 As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag1.Order.Lijnen = Orderlijnen
+	Set Aanvraag1.Order.CommissieReferentie = "De Commissiereferentie 1"
 	
 	#dim Aanvraag2 As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag2.Order.Lijnen = Orderlijnen
+	Set Aanvraag2.Order.CommissieReferentie = "De Commissiereferentie 2"
 	
 	#dim StandaardKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
 	Set VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
 	Do VerkoopAPI.IndienMethodCall("GeefKlant",..#KlantID).DanReturn(StandaardKlant)
 	
-	Set TandemboxBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller).%New(VerkoopAPI)
+	Set WebOrder1 = ##class(WS.TBX.Order).%New()
+	Set WebOrder1.CommissieReferentie = "De Commissiereferentie 1"
+	Set WebOrder2 = ##class(WS.TBX.Order).%New()
+	Set WebOrder2.CommissieReferentie = "De Commissiereferentie 2"
+	
+	Set DataIOWWWMock = ##class(vhTest.Mock.WS.TBX.DataIOWWW).%New()
+	Set Matcher1 = ##class(vhUnitTest.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.MaakOfferte.Test.WebOrderReferentieMatcher).%New(WebOrder1)
+	Do DataIOWWWMock.IndienMethodCall("WSOrdToWWW",Matcher1,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($lb("78"))
+	Set Matcher2 = ##class(vhUnitTest.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.MaakOfferte.Test.WebOrderReferentieMatcher).%New(WebOrder2)
+	Do DataIOWWWMock.IndienMethodCall("WSOrdToWWW",Matcher2,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($lb("2"))
+	
+	Set TandemboxBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller).%New(VerkoopAPI,,DataIOWWWMock)
 	#dim Resultaat1 As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Resultaat = TandemboxBesteller.MaakOfferte(Aanvraag1)
 	#dim Resultaat2 As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Resultaat = TandemboxBesteller.MaakOfferte(Aanvraag2)
 	Do $$$AssertNotEquals(Resultaat1.OfferteIDTBX,Resultaat2.OfferteIDTBX)
+	Do $$$AssertEquals(Resultaat1.Exceptie,"")
+	Do $$$AssertEquals(Resultaat2.Exceptie,"")
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test/WebOrderReferentieMatcher
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test/WebOrderReferentieMatcher	(revision 0)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test/WebOrderReferentieMatcher	(revision 40580)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+</Export>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller.cls.xml
===================================================================
diff -u -r40572 -r40580
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller.cls.xml	(.../TandemboxBesteller.cls.xml)	(revision 40572)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller.cls.xml	(.../TandemboxBesteller.cls.xml)	(revision 40580)
@@ -45,7 +45,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>VerkoopAPI:DOM.VKP.VerkoopAPI,ProductlijnToevoeger:APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.ProductlijnToevoeger</FormalSpec>
+<FormalSpec>VerkoopAPI:DOM.VKP.VerkoopAPI,ProductlijnToevoeger:APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.ProductlijnToevoeger,DataIoWebClient:WS.TBX.DataIOWWW</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -55,7 +55,7 @@
 	Set ..ProductlijnToevoeger = $$$Inject(ProductlijnToevoeger,##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.ProductlijnToevoeger).%New())
 	Set ..OrderVerwerker = ##class(APPS.TBXWeb.impl.OrderVerwerker).%New()
 	Set ..NietmeeleverenToevoeger = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.NietmeeleverenToevoeger).%New()
-	Set ..TBXDataIoWebClient = ##class(WS.TBX.DataIOWWWSoap).%New()
+	Set ..TBXDataIoWebClient = $$$Inject(DataIoWebClient,##class(WS.TBX.DataIOWWWSoap).%New())
 	Set ..LandRepository = ##class(DOM.common.Locatie.impl.LandRepository).%New()
 	Quit $$$OK
 ]]></Implementation>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test/WebOrderReferentieMatcher.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test/WebOrderReferentieMatcher.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/MaakOfferte/Test/WebOrderReferentieMatcher.cls.xml	(revision 40580)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.MaakOfferte.Test.WebOrderReferentieMatcher">
+<Super>TECH.RegisteredObject,Tools.Mock.ArgumentMatcher</Super>
+
+<Property name="VerwachtObject">
+<Type>%Base</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Object">
+<Type>%Base</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>VerwachtObject:%Base</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..VerwachtObject = VerwachtObject
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Matches">
+<FormalSpec>Object:%Base</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Matches As %Boolean = ( Object.CommissieReferentie = ..VerwachtObject.CommissieReferentie )
+	set:$$$Not(Matches) ..Object = Object
+	quit Matches
+]]></Implementation>
+</Method>
+
+<Method name="OmschrijfMismatch">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "CommissieReferentie komt niet overeen '"_..Object.CommissieReferentie_"' <> '"_..VerwachtObject.CommissieReferentie_"'"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WS/TBX/DataIOWWW.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WS/TBX/DataIOWWW.cls.xml	(revision 0)
+++ vhTest/Mock/WS/TBX/DataIOWWW.cls.xml	(revision 40580)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WS.TBX.DataIOWWW">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WS.TBX.DataIOWWW,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="DeleteWSOrdOnWWW">
+<FormalSpec>WSOrderID:%String,SecureKey:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("DeleteWSOrdOnWWW",WSOrderID,SecureKey)
+]]></Implementation>
+</Method>
+
+<Method name="GetWSOrdFromWWW">
+<FormalSpec>WSOrderID:%String,SecureKey:%String</FormalSpec>
+<ReturnType>WS.TBX.Order</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetWSOrdFromWWW",WSOrderID,SecureKey)
+]]></Implementation>
+</Method>
+
+<Method name="PeekServer">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("PeekServer")
+]]></Implementation>
+</Method>
+
+<Method name="UpdateWSOrdPropts">
+<FormalSpec>WSOrderID:%String,SecureKey:%String,ProptName:%String,ProptValue:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("UpdateWSOrdPropts",WSOrderID,SecureKey,ProptName,ProptValue)
+]]></Implementation>
+</Method>
+
+<Method name="WSOrdToWWW">
+<FormalSpec>WSOrd:WS.TBX.Order,SecureKey:%String,Opties:%String=""</FormalSpec>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("WSOrdToWWW",WSOrd,SecureKey,Opties)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>