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 @@ 1 + +APPS.common.Print.PrintAPI +1 + + -EtiketPrinter:APPS.TRANSP.Transsmart.impl.EtiketPrinter="",ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="" +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="" 1 1 %Status @@ -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 ]]> @@ -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()) + } ]]> + +ShipmentReference:%String,ComputerNaam:%String,Aantal:%Integer + +$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)) + + } +]]> + + + +ShipmentReference:%String +%Date + + + + +ShipmentReference:%String +WS.Transsmart.tns.doBooking + + + Levering:DOM.TRANSP.Levering %ListOfObjects