Index: APPS/TRANSP/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r40503 -r59933
--- APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
+++ APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 59933)
@@ -22,7 +22,7 @@
 	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
 	#dim itLeveringID As TECH.ListIterator = Rit.GeefLeveringIDIterator()
 
-	Set StatusControleur = ##class(APPS.TRANSP.GLS.impl.StatusControleurDistributeurDataVisitor).%New()		
+	#dim StatusControleur as DOM.TRANSP.DistributeurDataVisitor = ..GeefStatusControleur(Rit)
 	while itLeveringID.HasNext() {
 		#dim Levering As DOM.TRANSP.Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(RitID,itLeveringID.Next())
 		Set DistributeurDataIt = ##class(TECH.ListIterator).%New(Levering.GeefDistributeurDataLijst())
@@ -32,11 +32,30 @@
 		}
 	}
 
-	If 'StatusControleur.ZijnAlleStatussenInOrde() {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%New("Rit '"_RitID_"': "_StatusControleur.GeefInfo()))
+	If $$$Not(StatusControleur.ZijnAlleStatussenInOrde()) {
+		; TODO refactor smijten CommunicationException naar visitor.ZijnAlleStatussenInOrde
+		if ##class(TECH.StringUtils).Equals( Rit.GeefTransporteur(),##class(DOM.TRANSP.enu.Transporteur).VRD(),##class(DOM.TRANSP.enu.Transporteur).DHL()){
+			Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Transsmart.Exceptions.CommunicatieException).%New("Rit '"_RitID_"': "_StatusControleur.GeefInfo()))
+		} else {
+			Do ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%New("Rit '"_RitID_"': "_StatusControleur.GeefInfo()))
+		}
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="GeefStatusControleur">
+<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.TRANSP.DistributeurDataVisitor</ReturnType>
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	If ##class(TECH.StringUtils).Equals(Rit.GeefTransporteur(),Transporteur.VRD,Transporteur.DHL){
+		Quit ##class(APPS.TRANSP.Transsmart.impl.StatusControleurDistributeurDataVisitor).%New()
+	} else {
+		Quit ##class(APPS.TRANSP.GLS.impl.StatusControleurDistributeurDataVisitor).%New()
+	}
+]]></Implementation>
+</Method>
 </Class>