Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/EtiketService/Test.cls.xml
===================================================================
diff -u -r60521 -r66965
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/EtiketService/Test.cls.xml	(.../Test.cls.xml)	(revision 60521)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/EtiketService/Test.cls.xml	(.../Test.cls.xml)	(revision 66965)
@@ -8,6 +8,12 @@
 	#dim ProjectSettingsAPIMock as DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
 	Do ProjectSettingsAPIMock.VerwachtMethodCall("GebruikTranssmartAcceptOmgeving").DanReturn($$$False)
 	Do ProjectSettingsAPIMock.VerwachtMethodCall("IsTranssmartActive").DanReturn($$$True)
+
+	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
+	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).DHL())
+
+	#dim TransportAPIMock as vhTest.Mock.DOM.TRANSP.TransportAPI = ##class(vhTest.Mock.DOM.TRANSP.TransportAPI).MockInstance()
+	Do TransportAPIMock.VerwachtMethodCall("GeefRit","54321").DanReturn(RitMock)
 		
 	Set EtiketPrinterMock = ##class(vhTest.Mock.APPS.TRANSP.Transsmart.impl.EtiketPrinter).%New()
 	Set DummyList = ##class(%ListOfDataTypes).%New()
@@ -39,6 +45,8 @@
 	Do TranssmartWSClientMock.Verifieer()
 	Do EtiketPrinterMock.Verifieer()
 	Do RequestBouwerMock.Verifieer()
+	Do TransportAPIMock.Verifieer()
+	Do RitMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r60520 -r66965
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 60520)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 66965)
@@ -28,8 +28,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PrintAPI">
+<Type>APPS.common.Print.PrintAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
+<FormalSpec>EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",PrintAPI:APPS.common.Print.impl.PrintAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -52,6 +57,7 @@
 	Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 	Do ..SetSSLConfiguration("Transsmart")
 	Set ..RequestBouwer = $$$Inject(RequestBouwer,##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New())
+	Set ..PrintAPI = $$$Inject(PrintAPI,##class(APPS.common.Print.impl.PrintAPI).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -113,9 +119,57 @@
 	#dim Computernaam As %String = $Piece(##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam(),".",1)
 	Set Computernaam = ##class(TECH.StringUtils).ToUpper(Computernaam)	
 	Do ..EtiketPrinter.PrintEtiketten(Etiketten,Computernaam,"TRANSSMART_ZPL")
+	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(Levering.GeefRitID())
+	if Rit.GeefTransporteur() = ##class(DOM.TRANSP.enu.Transporteur).VRD() {		
+	;	Do ..PrintVRDDueoutEtiketten(..GeefShipmentInfoReference(Levering),Computernaam,Etiketten.Count())
+	}
 ]]></Implementation>
 </Method>
 
+<Method name="PrintVRDDueoutEtiketten">
+<FormalSpec>ShipmentReference:%String,ComputerNaam:%String,Aantal:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	#dim PickupDate as %Date = ..GeefShipmentPickupDate(ShipmentReference)
+	if (PickupDate > +$h ){
+		Do ##class(vhLib.Logger).%New().Info("VRDDueOut Etiketten","Afdrukken VRD DueOut Etiketten voor shipment met reference " _ShipmentReference _ " met pickupdatum " _ $zd(PickupDate,2))
+		#dim Dag = $Piece($zd(PickupDate,2)," ",1) 
+		#dim Maand = $$$UCase($Piece($ZD(PickupDate,2)," ",2))	
+		#dim BartenderPrinter as %String = ..PrintAPI.GeefLabelPrinter("TRANSP_DI1",ComputerNaam).GeefDevice()
+
+		Set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
+		do DocsV1.VRDDueOutEtiket(Dag,Maand,BartenderPrinter,Aantal)		
+
+	} else {
+
+		Do ##class(vhLib.Logger).%New().Info("VRDDueOut Etiketten","Niet nodig voor shipment met reference " _ShipmentReference _ " met pickupdatum " _ $zd(PickupDate,2))
+
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefShipmentPickupDate">
+<FormalSpec>ShipmentReference:%String</FormalSpec>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[
+	#dim Request as WS.Transsmart.tns.doBooking = ..GeefDoBookingRequestVoorShipment(ShipmentReference)
+	#dim PickupDate as %Date = $ZDh(Request.shipmentInfo.pickupDate,3)
+	Quit PickupDate
+]]></Implementation>
+</Method>
+
+<Method name="GeefDoBookingRequestVoorShipment">
+<FormalSpec>ShipmentReference:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
+<Implementation><![CDATA[
+	Set VerzenddataRepo = ##class(APPS.TRANSP.Transsmart.data.VerzendDataRepository).%New()
+	#dim Verzenddata as APPS.TRANSP.Transsmart.data.VerzendData = VerzenddataRepo.GeefViaReference(ShipmentReference)
+	Set XmlCorrelater = ##class(TECH.XMLCorrelater).%New()	
+	#dim Request as WS.Transsmart.tns.doBooking
+	Set Request = XmlCorrelater.FromStream(Verzenddata.RequestAsStream,"WS.Transsmart.tns.doBooking","doBooking")
+	Quit Request
+]]></Implementation>
+</Method>
+
 <Method name="GeefEtiketten">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r60520 -r66965
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 60520)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 66965)
@@ -9,19 +9,33 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer=""</FormalSpec>
+<FormalSpec>EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",PrintAPI:APPS.common.Print.impl.PrintAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="GeefDoBookingRequestVoorShipment">
+<FormalSpec>ShipmentReference:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefDoBookingRequestVoorShipment",ShipmentReference)
+]]></Implementation>
+</Method>
+
 <Method name="GeefEtiketten">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEtiketten",Levering)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefShipmentPickupDate">
+<FormalSpec>ShipmentReference:%String</FormalSpec>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefShipmentPickupDate",ShipmentReference)
+]]></Implementation>
+</Method>
+
 <Method name="IsActief">
 <Implementation><![CDATA[	do ..VerwerkMethodCall("IsActief")
 ]]></Implementation>
@@ -33,6 +47,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="PrintVRDDueoutEtiketten">
+<FormalSpec>ShipmentReference:%String,ComputerNaam:%String,Aantal:%Integer</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("PrintVRDDueoutEtiketten",ShipmentReference,ComputerNaam,Aantal)
+]]></Implementation>
+</Method>
+
 <Method name="SetSSLConfiguration">
 <FormalSpec>SSLConfiguration:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("SetSSLConfiguration",SSLConfiguration)
Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59700 -r66965
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 66965)
@@ -12,13 +12,33 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeefDoBookingRequestVoorShipment">
+<FormalSpec>ShipmentReference:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefEtiketten">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
+<Method name="GeefShipmentPickupDate">
+<FormalSpec>ShipmentReference:%String</FormalSpec>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="PrintVRDDueoutEtiketten">
+<FormalSpec>ShipmentReference:%String,ComputerNaam:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="IsActief">
 <Implementation><![CDATA[]]></Implementation>
 </Method>