Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering/VoerUit.cls.xml
===================================================================
diff -u -r60515 -r71955
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering/VoerUit.cls.xml	(.../VoerUit.cls.xml)	(revision 60515)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering/VoerUit.cls.xml	(.../VoerUit.cls.xml)	(revision 71955)
@@ -11,108 +11,206 @@
 <Default>654321</Default>
 </Parameter>
 
-<Property name="Levering">
-<Type>DOM.TRANSP.Levering</Type>
-<Private>1</Private>
-</Property>
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Property Levering As DOM.TRANSP.Levering [ Private ];
 
-<Property name="Rit">
-<Type>DOM.TRANSP.Rit</Type>
-<Private>1</Private>
-</Property>
+Property Rit As DOM.TRANSP.Rit [ Private ];
 
-<Property name="TransportAPI">
-<Type>vhTest.Mock.APPS.TRANSP.TransportAPI</Type>
-<Private>1</Private>
-</Property>
+Property TransportAPI As vhTest.Mock.APPS.TRANSP.TransportAPI [ Private ];
 
-<Property name="TransportService">
-<Type>vhTest.Mock.APPS.TRANSP.TransportService</Type>
-<Private>1</Private>
-</Property>
+Property TransportService As vhTest.Mock.APPS.TRANSP.TransportService [ Private ];
 
-<Property name="TranssmartWSClient">
-<Type>vhTest.Mock.WS.Transsmart.TboxServicePort</Type>
-<Private>1</Private>
-</Property>
+Property TranssmartWSClient As vhTest.Mock.WS.Transsmart.TboxServicePort [ Private ];
 
-<Property name="ProjectSettingsAPI">
-<Type>vhTest.Mock.DOM.common.ProjectSettingsAPI</Type>
-<Private>1</Private>
-</Property>
+Property ProjectSettingsAPI As vhTest.Mock.DOM.common.ProjectSettingsAPI [ Private ];
 
-<Property name="RequestBouwer">
-<Type>vhTest.Mock.APPS.TRANSP.Transsmart.RequestDataBouwer</Type>
-<Private>1</Private>
-</Property>
+Property RequestBouwer As vhTest.Mock.APPS.TRANSP.Transsmart.RequestDataBouwer [ Private ];
 
-<Property name="ResponseControleur">
-<Type>vhTest.Mock.APPS.TRANSP.Transsmart.impl.ResponseControleur</Type>
-<Private>1</Private>
-</Property>
+Property ResponseControleur As vhTest.Mock.APPS.TRANSP.Transsmart.impl.ResponseControleur [ Private ];
 
-<Property name="VerzendWijzeBepaler">
-<Type>vhTest.Mock.APPS.TRANSP.Transsmart.VerzendWijzeBepaler</Type>
-<Private>1</Private>
-</Property>
+Property VerzendWijzeBepaler As vhTest.Mock.APPS.TRANSP.Transsmart.VerzendWijzeBepaler [ Private ];
 
-<Property name="VerzendDataRepository">
-<Type>vhTest.Mock.APPS.TRANSP.Transsmart.data.VerzendDataRepository</Type>
-<Private>1</Private>
-</Property>
+Property VerzendDataRepository As vhTest.Mock.APPS.TRANSP.Transsmart.data.VerzendDataRepository [ Private ];
 
-<Property name="EtiketService">
-<Type>vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketService</Type>
-<Private>1</Private>
-</Property>
+Property EtiketService As vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketService [ Private ];
 
+Property QueryAPI As vhTest.Mock.TECH.Query.QueryAPI [ Private ];
+*/
+]]></Content>
+</UDLText>
+
 <Method name="%OnNew">
 <FormalSpec>AManager:Tools.Test.Manager</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do ##super(AManager)	
-	set ..ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	Do ..ProjectSettingsAPI.IndienMethodCall("IsTranssmartActive").DanReturn($$$True)
-	Do ..ProjectSettingsAPI.IndienMethodCall("GebruikTranssmartAcceptOmgeving").DanReturn($$$True)
-
-	Set ..TransportAPI = ##class(vhTest.Mock.APPS.TRANSP.TransportAPI).MockInstance()
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Test standaard gedrag">
 <Implementation><![CDATA[
-	Set ..TranssmartWSClient = ..GeefWSClient()
-	Set ..RequestBouwer = ..GeefRequestBouwer()
-	Set ..ResponseControleur = ..GeefResponseControleur()
-	Set ..VerzendWijzeBepaler = ..GeefVerzendwijzeBepaler()
-	Set ..TransportService = ..GeefTransportService()
-	Do ..TransportAPI.VerwachtMethodCall("GeefTransportService").DanReturn(..TransportService)
+	#dim ProjectSettingsAPI As vhTest.Mock.DOM.common.ProjectSettingsAPI = ..GeefProjectSettingsAPI()
+	#dim TransportService As vhTest.Mock.APPS.TRANSP.TransportService  = ..GeefTransportService()	
+	#dim TransportAPI As vhTest.Mock.APPS.TRANSP.TransportAPI = ##class(vhTest.Mock.APPS.TRANSP.TransportAPI).MockInstance()
+	Do TransportAPI.VerwachtMethodCall("GeefTransportService").DanReturn(TransportService)
 	
-	Set ..VerzendDataRepository = ..GeefVerzendDataRepository()
-	Set ..EtiketService = ..GeefEtiketService()
+	#dim TranssmartWSClient As vhTest.Mock.WS.Transsmart.TboxServicePort  = ..GeefWSClient()
+	#dim RequestBouwer As vhTest.Mock.APPS.TRANSP.Transsmart.RequestDataBouwer = ..GeefRequestBouwer()
+	#dim ResponseControleur As vhTest.Mock.APPS.TRANSP.Transsmart.impl.ResponseControleur  = ..GeefResponseControleur()
+	#dim VerzendWijzeBepaler As vhTest.Mock.APPS.TRANSP.Transsmart.VerzendWijzeBepaler  = ..GeefVerzendwijzeBepaler()
+	#dim VerzendDataRepository As vhTest.Mock.APPS.TRANSP.Transsmart.data.VerzendDataRepository = ..GeefVerzendDataRepository()
+	#dim EtiketService As vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketService  = ..GeefEtiketService()
+	#dim QueryAPI As vhTest.Mock.TECH.Query.QueryAPI  = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
+
+	#dim GeenOpoZendingenResultSet as TECH.ResultSet = ..GeefOPOTransportResultSet(0)
+	Do QueryAPI.VerwachtMethodCall("GetResultSet",..Matches.IsA(##class(TECH.DynamicQuery).%ClassName(1))).DanReturn(GeenOpoZendingenResultSet)
+		
+	#dim Rit as vhTest.Mock.DOM.TRANSP.Rit = ..GeefRit()
+	#dim Levering as vhTest.Mock.DOM.TRANSP.Levering = ..GeefLevering()
 	
+	Set RegistreerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering).%New(,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository,VerzendWijzeBepaler,Rit,Levering,EtiketService,QueryAPI)
+	Do RegistreerLevering.VoerUit()
+	Do TranssmartWSClient.Verifieer()	
+	Do VerzendWijzeBepaler.Verifieer()
+	Do TransportService.Verifieer()
+	Do TransportAPI.Verifieer()
+	Do RequestBouwer.Verifieer()
+ 	Do ResponseControleur.Verifieer()
+	Do VerzendDataRepository.Verifieer()
+	Do Rit.Verifieer()
+	Do EtiketService.Verifieer()
+	Do Levering.Verifieer()
+	Do QueryAPI.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Zending OPO op een Leeg Transport of transport zonder andere zendingen is ok">
+<Implementation><![CDATA[
+	#dim ProjectSettingsAPI As vhTest.Mock.DOM.common.ProjectSettingsAPI = ..GeefProjectSettingsAPI()
+	#dim TransportService As vhTest.Mock.APPS.TRANSP.TransportService  = ..GeefTransportService()	
+	#dim TransportAPI As vhTest.Mock.APPS.TRANSP.TransportAPI = ##class(vhTest.Mock.APPS.TRANSP.TransportAPI).MockInstance()
+	Do TransportAPI.VerwachtMethodCall("GeefTransportService").DanReturn(TransportService)
+	
+	#dim TranssmartWSClient As vhTest.Mock.WS.Transsmart.TboxServicePort  = ..GeefWSClient()
+	#dim RequestBouwer As vhTest.Mock.APPS.TRANSP.Transsmart.RequestDataBouwer = ..GeefRequestBouwer()
+	#dim ResponseControleur As vhTest.Mock.APPS.TRANSP.Transsmart.impl.ResponseControleur  = ..GeefResponseControleur()
+	#dim VerzendWijzeBepaler As vhTest.Mock.APPS.TRANSP.Transsmart.VerzendWijzeBepaler  = ..GeefVerzendwijzeBepaler()
+	#dim VerzendDataRepository As vhTest.Mock.APPS.TRANSP.Transsmart.data.VerzendDataRepository = ..GeefVerzendDataRepository()
+	#dim EtiketService As vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketService  = ..GeefEtiketService()
+	#dim QueryAPI As vhTest.Mock.TECH.Query.QueryAPI  = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
+
+	#dim GeenOpoZendingenResultSet as TECH.ResultSet = ..GeefOPOTransportResultSet(0)
+	Do QueryAPI.VerwachtMethodCall("GetResultSet",..Matches.IsA(##class(TECH.DynamicQuery).%ClassName(1))).DanReturn(GeenOpoZendingenResultSet)
+		
 	#dim Rit as vhTest.Mock.DOM.TRANSP.Rit = ..GeefRit()
+	#dim Levering as vhTest.Mock.DOM.TRANSP.Levering = ..GeefLevering("K||304677")
+	
+	Set RegistreerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering).%New(,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository,VerzendWijzeBepaler,Rit,Levering,EtiketService,QueryAPI)
+	Do RegistreerLevering.VoerUit()
+	Do TranssmartWSClient.Verifieer()	
+	Do VerzendWijzeBepaler.Verifieer()
+	Do TransportService.Verifieer()
+	Do TransportAPI.Verifieer()
+	Do RequestBouwer.Verifieer()
+ 	Do ResponseControleur.Verifieer()
+	Do VerzendDataRepository.Verifieer()
+	Do Rit.Verifieer()
+	Do EtiketService.Verifieer()
+	Do Levering.Verifieer()
+	Do QueryAPI.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Andere klant op Dachser transport voor OPO geeft exception">
+<Implementation><![CDATA[
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Dit is een transport voor OPO. Andere klanten niet samen met andere OPO in één transport.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.TRANSP.Transsmart.Exceptions.CommunicatieException", Substrings))
+	#dim ProjectSettingsAPI As vhTest.Mock.DOM.common.ProjectSettingsAPI = ..GeefProjectSettingsAPI()
+	#dim TransportService As vhTest.Mock.APPS.TRANSP.TransportService  = ..GeefTransportService($$$True)	
+	#dim TransportAPI As vhTest.Mock.APPS.TRANSP.TransportAPI = ##class(vhTest.Mock.APPS.TRANSP.TransportAPI).MockInstance()
+	Do TransportAPI.IndienMethodCall("GeefTransportService").DanReturn(TransportService)
+	
+	#dim TranssmartWSClient As vhTest.Mock.WS.Transsmart.TboxServicePort  = ..GeefWSClient()
+	#dim RequestBouwer As vhTest.Mock.APPS.TRANSP.Transsmart.RequestDataBouwer = ..GeefRequestBouwer()
+	#dim ResponseControleur As vhTest.Mock.APPS.TRANSP.Transsmart.impl.ResponseControleur  = ..GeefResponseControleur()
+	#dim VerzendWijzeBepaler As vhTest.Mock.APPS.TRANSP.Transsmart.VerzendWijzeBepaler  = ..GeefVerzendwijzeBepaler()
+	#dim VerzendDataRepository As vhTest.Mock.APPS.TRANSP.Transsmart.data.VerzendDataRepository = ..GeefVerzendDataRepository()
+	#dim EtiketService As vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketService  = ..GeefEtiketService()
+	#dim QueryAPI As vhTest.Mock.TECH.Query.QueryAPI  = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
+
+	#dim WelOpoZendingenResultSet as TECH.ResultSet = ..GeefOPOTransportResultSet(5)
+	Do QueryAPI.VerwachtMethodCall("GetResultSet",..Matches.IsA(##class(TECH.DynamicQuery).%ClassName(1))).DanReturn(WelOpoZendingenResultSet)
+		
+	#dim Rit as vhTest.Mock.DOM.TRANSP.Rit = ..GeefRit()
 	#dim Levering as vhTest.Mock.DOM.TRANSP.Levering = ..GeefLevering()
 	
-	Set RegistreerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering).%New(,..ProjectSettingsAPI,..TranssmartWSClient,..RequestBouwer,..ResponseControleur,..VerzendDataRepository,..VerzendWijzeBepaler,Rit,Levering,..EtiketService)
+	Set RegistreerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering).%New(,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository,VerzendWijzeBepaler,Rit,Levering,EtiketService,QueryAPI)
+	Do RegistreerLevering.VoerUit()
 	
+	Do TranssmartWSClient.Verifieer()	
+	Do VerzendWijzeBepaler.Verifieer()
+	Do RequestBouwer.Verifieer()
+ 	Do ResponseControleur.Verifieer()
+	Do VerzendDataRepository.Verifieer()
+	Do Rit.Verifieer()
+	Do EtiketService.Verifieer()
+	Do Levering.Verifieer()
+	Do QueryAPI.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test OPO op Dachser transport voor Andere klanten geeft exception">
+<Implementation><![CDATA[
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Reeds andere klanten dan OPO op dit transport. OPO niet samen met andere klanten in één transport.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.TRANSP.Transsmart.Exceptions.CommunicatieException", Substrings))
+	#dim ProjectSettingsAPI As vhTest.Mock.DOM.common.ProjectSettingsAPI = ..GeefProjectSettingsAPI()
+	#dim TransportService As vhTest.Mock.APPS.TRANSP.TransportService  = ..GeefTransportService($$$True)	
+	#dim TransportAPI As vhTest.Mock.APPS.TRANSP.TransportAPI = ##class(vhTest.Mock.APPS.TRANSP.TransportAPI).MockInstance()
+	Do TransportAPI.IndienMethodCall("GeefTransportService").DanReturn(TransportService)
+	
+	#dim TranssmartWSClient As vhTest.Mock.WS.Transsmart.TboxServicePort  = ..GeefWSClient()
+	#dim RequestBouwer As vhTest.Mock.APPS.TRANSP.Transsmart.RequestDataBouwer = ..GeefRequestBouwer()
+	#dim ResponseControleur As vhTest.Mock.APPS.TRANSP.Transsmart.impl.ResponseControleur  = ..GeefResponseControleur()
+	#dim VerzendWijzeBepaler As vhTest.Mock.APPS.TRANSP.Transsmart.VerzendWijzeBepaler  = ..GeefVerzendwijzeBepaler()
+	#dim VerzendDataRepository As vhTest.Mock.APPS.TRANSP.Transsmart.data.VerzendDataRepository = ..GeefVerzendDataRepository()
+	#dim EtiketService As vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketService  = ..GeefEtiketService()
+	#dim QueryAPI As vhTest.Mock.TECH.Query.QueryAPI  = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
+
+	#dim AndereZendingenResultSet as TECH.ResultSet = ..GeefOPOTransportResultSet(5)
+	Do QueryAPI.VerwachtMethodCall("GetResultSet",..Matches.IsA(##class(TECH.DynamicQuery).%ClassName(1))).DanReturn(AndereZendingenResultSet)
+		
+	#dim Rit as vhTest.Mock.DOM.TRANSP.Rit = ..GeefRit()
+	#dim Levering as vhTest.Mock.DOM.TRANSP.Levering = ..GeefLevering("K||30467")
+	
+	Set RegistreerLevering = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.RegistreerLevering).%New(,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository,VerzendWijzeBepaler,Rit,Levering,EtiketService,QueryAPI)
 	Do RegistreerLevering.VoerUit()
 	
-	Do ..TranssmartWSClient.Verifieer()
-	Do ..VerzendWijzeBepaler.Verifieer()
-	Do ..TransportService.Verifieer()
-	Do ..TransportAPI.Verifieer()
-	Do ..RequestBouwer.Verifieer()
-	Do ..ResponseControleur.Verifieer()
-	Do ..VerzendDataRepository.Verifieer()
+	Do TranssmartWSClient.Verifieer()	
+	Do VerzendWijzeBepaler.Verifieer()
+	Do RequestBouwer.Verifieer()
+ 	Do ResponseControleur.Verifieer()
+	Do VerzendDataRepository.Verifieer()
 	Do Rit.Verifieer()
-	Do ..EtiketService.Verifieer()
+	Do EtiketService.Verifieer()
 	Do Levering.Verifieer()
+	Do QueryAPI.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProjectSettingsAPI">
+<ReturnType>vhTest.Mock.DOM.common.ProjectSettingsAPI</ReturnType>
+<Implementation><![CDATA[
+	#dim ProjectSettingsAPI As vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Do ProjectSettingsAPI.IndienMethodCall("IsTranssmartActive").DanReturn($$$True)
+	Do ProjectSettingsAPI.IndienMethodCall("GebruikTranssmartAcceptOmgeving").DanReturn($$$True)
+	Quit ProjectSettingsAPI
+]]></Implementation>
+</Method>
+
 <Method name="GeefEtiketService">
 <Private>1</Private>
 <ReturnType>vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketService</ReturnType>
@@ -136,18 +234,22 @@
 </Method>
 
 <Method name="GeefTransportService">
+<FormalSpec>Indien:%Boolean="0"</FormalSpec>
 <ReturnType>vhTest.Mock.APPS.TRANSP.TransportService</ReturnType>
 <Implementation><![CDATA[
 	Set TransportService = ##class(vhTest.Mock.APPS.TRANSP.TransportService).%New()
 	Set LeveringInfo=##class(APPS.TRANSP.dto.LeveringInfo).%New()
-	Do TransportService.VerwachtMethodCall("GeefLeveringInfo",..#RitNr,..#LeveringNr).DanReturn(LeveringInfo)
+	Do:($$$Not(Indien)) TransportService.VerwachtMethodCall("GeefLeveringInfo",..#RitNr,..#LeveringNr).DanReturn(LeveringInfo)
+	Do:(Indien) TransportService.IndienMethodCall("GeefLeveringInfo",..#RitNr,..#LeveringNr).DanReturn(LeveringInfo)
 	Set VerzendDataLijst = ##class(APPS.TRANSP.dto.DistributeurVerzendDataLijst).%New()
-	Do TransportService.VerwachtMethodCall("GeefVerzendDataLijst",..#RitNr,..#LeveringNr).DanReturn(VerzendDataLijst)
+	Do:($$$Not(Indien)) TransportService.VerwachtMethodCall("GeefVerzendDataLijst",..#RitNr,..#LeveringNr).DanReturn(VerzendDataLijst)
+	Do:(Indien) TransportService.IndienMethodCall("GeefVerzendDataLijst",..#RitNr,..#LeveringNr).DanReturn(VerzendDataLijst)
 	Quit TransportService
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLevering">
+<FormalSpec>KlantID:%String="KLANTID"</FormalSpec>
 <Private>1</Private>
 <ReturnType>vhTest.Mock.DOM.TRANSP.Levering</ReturnType>
 <Implementation><![CDATA[
@@ -157,6 +259,8 @@
 	Do Levering.VerwachtMethodCall("GeefNettoGewicht").DanReturn(1)
 	Do Levering.VerwachtMethodCall("GeefAantalColli").DanReturn(0) ;want test is VRD -> geen colli
 	Do Levering.VerwachtMethodCall("VoegToeEnBewaarDistributeurDataID","").DanDoeNiks()
+	Do Levering.VerwachtMethodCall("GeefRitID").DanReturn(..#RitNr)
+	Do Levering.VerwachtMethodCall("GeefGeleverdAanKlantID").DanReturn(KlantID)
 	Quit Levering
 ]]></Implementation>
 </Method>
@@ -214,6 +318,16 @@
 	Quit RequestBouwer
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOPOTransportResultSet">
+<FormalSpec>Count:%String</FormalSpec>
+<ReturnType>TECH.ResultSet</ReturnType>
+<Implementation><![CDATA[
+	#dim Data As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes( Count )
+	Set ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(Data)
+	Quit ResultSet
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml
===================================================================
diff -u -r60532 -r71955
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml	(.../RegistreerLevering.cls.xml)	(revision 60532)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/RegistreerLevering.cls.xml	(.../RegistreerLevering.cls.xml)	(revision 71955)
@@ -8,15 +8,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",ResponseControleur:APPS.TRANSP.Transsmart.impl.ResponseControleur="",VerzendDataRepository:APPS.TRANSP.Transsmart.data.VerzendDataRepository="",VerzendWijzeBepaler:APPS.TRANSP.Transsmart.VerzendWijzeBepaler="",Rit:DOM.TRANSP.Rit,Levering:DOM.TRANSP.Levering,EtiketService:APPS.TRANSP.Transsmart.impl.EtiketService=""</FormalSpec>
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",ResponseControleur:APPS.TRANSP.Transsmart.impl.ResponseControleur="",VerzendDataRepository:APPS.TRANSP.Transsmart.data.VerzendDataRepository="",VerzendWijzeBepaler:APPS.TRANSP.Transsmart.VerzendWijzeBepaler="",Rit:DOM.TRANSP.Rit,Levering:DOM.TRANSP.Levering,EtiketService:APPS.TRANSP.Transsmart.impl.EtiketService="",QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Do ##super(ConfigMgr,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository,VerzendWijzeBepaler,Rit,Levering)
 	Set ..EtiketService = $$$Inject(EtiketService,##class(APPS.TRANSP.Transsmart.impl.EtiketService).%New())
+	Set ..QueryAPI = $$$Inject(QueryAPI, ##class(TECH.Context).Instance().GeefQueryAPI())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -27,9 +33,7 @@
 	
 	#dim Request as WS.Transsmart.tns.doBooking = ..RequestBouwer.MaakdoBookingRequest(..LeveringInfo,..Rit)
 	do ..ControleerLevering()
-	
 	do ..VerwerkRequest(Request)
-	
 	Do ..PrintEtiketten(..Levering)
 ]]></Implementation>
 </Method>
@@ -112,6 +116,39 @@
 		    Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Transsmart.Exceptions.CommunicatieException).%New(Bericht))
 		}
 	}
+	
+	
+	#dim TransportNr as %String = ..Levering.GeefRitID()
+	#dim SqlStatement as %String = ""
+	#dim OPOKlantnr as %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).OPO())
+	if (..Levering.GeefGeleverdAanKlantID() = ##class(DOM.VKP.enu.Klant).OPO()) {
+		// check of er andere klanten op transport zitten -> fout.
+		Set SqlStatement = "select count(*) from flow_cons.Transport t "
+		                 _ "join flow_cons.TransportAdres a on a.transport = t. id "
+		                 _ "where t.id = ? and a.klant != ?"
+		
+		Set Query = ##class(TECH.DynamicQuery).%New(SqlStatement,$ListBuild(TransportNr,OPOKlantnr))
+		#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(Query)
+		Do ResultSet.Next()
+		If (ResultSet.GetData(1) > 0){
+		 	Set Bericht = "Reeds andere klanten dan OPO op dit transport. OPO niet samen met andere klanten in één transport."
+			Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Transsmart.Exceptions.CommunicatieException).%New(Bericht))			
+		}
+	} else {
+		//Check of er op het transport al zendingen voor OPO zitten	
+		Set SqlStatement = "select count(*) from flow_cons.Transport t "
+		                 _ "join flow_cons.TransportAdres a on a.transport = t. id "
+		                 _ "where t.id = ? and a.klant = ?"
+		
+		Set Query = ##class(TECH.DynamicQuery).%New(SqlStatement,$ListBuild(TransportNr,OPOKlantnr))
+		Set ResultSet = ..QueryAPI.GetResultSet(Query)
+		Do ResultSet.Next()
+		If (ResultSet.GetData(1) > 0){
+		 	Set Bericht = "Dit is een transport voor OPO. Andere klanten niet samen met andere OPO in één transport."
+			Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Transsmart.Exceptions.CommunicatieException).%New(Bericht))			
+		}
+		
+	}
 ]]></Implementation>
 </Method>