Index: APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml
===================================================================
diff -u -r59700 -r75040
--- APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 59700)
+++ APPS/TRANSP/Transsmart/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 75040)
@@ -3,11 +3,6 @@
 <Class name="APPS.TRANSP.Transsmart.impl.EtiketService">
 <Super>TECH.Mockable</Super>
 
-<Property name="TransportAPI">
-<Type>APPS.TRANSP.TransportAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="EtiketPrinter">
 <Type>APPS.TRANSP.Transsmart.impl.EtiketPrinter</Type>
 <Private>1</Private>
@@ -33,36 +28,36 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PrintAPI">
+<Type>APPS.common.Print.PrintAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI="",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>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..TransportAPI = $$$Inject(TransportAPI,##class(DOM.DomeinContext).Instance().GeefTransportAPI())
 	Set ..EtiketPrinter = $$$Inject(EtiketPrinter,##class(APPS.TRANSP.Transsmart.impl.EtiketPrinter).%New())
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
-	
 	Set ..ProjectSettingsAPI = $$$Inject(ProjectSettingsAPI, ##class(DOM.common.impl.ProjectSettingsAPI).%New())
 
 	If ..ConfigMgr.GeefOmgeving()="PROD" {
 		Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
-		Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 	}
 	else {
-		if ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving()
-		{ 
+		if ..ProjectSettingsAPI.GebruikTranssmartAcceptOmgeving(){
 			Set ..TranssmartWSClient = $$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.TboxServicePort).%New())
-			Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 		} else {		
-			Set ..TranssmartWSClient=##class(WS.Transsmart.impl.LoggingTboxServicePort).%New()		
+			Set ..TranssmartWSClient=$$$Inject(TranssmartWSClient,##class(WS.Transsmart.impl.LoggingTboxServicePort).%New())
 		}
 	}
+	Do ..TranssmartWSClient.ZetLocationVoorOmgeving(..ConfigMgr.GeefOmgeving())
 	Do ..SetSSLConfiguration("Transsmart")
-	Do ..ZetAuthenticationHeader()
 	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>
@@ -74,7 +69,7 @@
 
 <Method name="SetSSLConfiguration">
 <FormalSpec>SSLConfiguration:%String</FormalSpec>
-<Implementation><![CDATA[	Set ..TranssmartWSClient.SSLConfiguration = SSLConfiguration
+<Implementation><![CDATA[	Do ..TranssmartWSClient.ZetSSLConfiguration(SSLConfiguration)
 ]]></Implementation>
 </Method>
 
@@ -121,25 +116,71 @@
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Implementation><![CDATA[
 	#dim Etiketten as List of %String = ..GeefEtiketten(Levering)
-
 	#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() {	
+		If ..ProjectSettingsAPI.VRDDueOutEtiketEnA4() ! ..ProjectSettingsAPI.DD1StockerenBijVRDIndienVroegerGeproduceerd(){
+			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 "_Aantal_" 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, "3" _ $Extract(ShipmentReference,6,10))
+		Set BartenderPrinter = ..PrintAPI.GeefLabelPrinter("TRANSP_VRDDUEOUTA4",ComputerNaam).GeefDevice()
+		do DocsV1.VRDDueOutA4Etiket(Dag,Maand,BartenderPrinter,Aantal, "3" _ $Extract(ShipmentReference,6,10))
+	} else {
+
+		Do ##class(vhLib.Logger).%New().Info("VRDDueOut Etiketten","VRD DueOut 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>
 <Implementation><![CDATA[
 	quit:$$$Not(..IsActief()) ##class(%ListOfDataTypes).%New()
-		
 	#dim ShipmentInfoReference As %String = ..GeefShipmentInfoReference(Levering)
 	#dim Request as WS.Transsmart.tns.getDocs = ..RequestBouwer.MaakgetDocsRequest(ShipmentInfoReference)
 	#dim Response As WS.Transsmart.tns.getDocsResponse = ..GeefDocs(Request)
 	#dim ZlpEtiketten As %ListOfObjects = ..MaakEtikettenLijst(Response)
-	
 	Quit ZlpEtiketten
 ]]></Implementation>
 </Method>
@@ -149,10 +190,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim ConcatineerSymboolReference As %String = "X"
 	#dim RitID As %String = $$$Trim(Levering.GeefRitID())
-	#dim Uitlevering As %String = $$$Trim(Levering.GeefID())
-	#dim Reference As %String = RitID_ConcatineerSymboolReference_Uitlevering
+	#dim Uitlevering As %String = $Extract($$$Trim(Levering.GeefID()),*-4,*)
+	#dim Reference As %String = RitID_Uitlevering
 	Quit Reference
 ]]></Implementation>
 </Method>
@@ -167,6 +207,7 @@
 		#dim Response As WS.Transsmart.tns.getDocsResponse = ..TranssmartWSClient.getDocs(Request)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(vhLib.Logger).LogExceptie(Exception)
 		Do ##class(vhLib.Logger).%New("Transsmart").ErrorMail("VerwerkRequest","Verzenden bericht mislukt."_$C(13,10)_$C(13,10)_Exception.ToString())
 		Set Error =##class(APPS.TRANSP.Transsmart.Error).%New("VH99",Exception.GeefOmschrijving())
 		do ..ThrowError(Error)