Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml =================================================================== diff -u -r59889 -r59952 --- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 59889) +++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 59952) @@ -10,9 +10,7 @@ Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New() Set Request = ##class(WS.Transsmart.tns.doBooking).%New() - Set Request.bookingInfo = ..GeefBookingInfoDoBooking(LeveringInfo,Rit) - Do:($$$Not($Length(Request.bookingInfo.carrier))) ##class(Tools.Wlip).%New(207).String("Geene transporteur !") - + Set Request.bookingInfo = ..GeefBookingInfoDoBooking(LeveringInfo,Rit) Set Request.shipmentInfo = ..GeefShipmentInfo(LeveringInfo,Rit) Quit Request @@ -117,6 +115,7 @@ Set ShipmentInfo.loadmeter = 0 Set ShipmentInfo.noOfPackages = LeveringInfo.AantalVerpakkingEenhedenTotaal Set ShipmentInfo.instruction = ..GeefInstruction(LeveringInfo) + Set ShipmentInfo.description = ..BeperkLengteTot(..GeefOpmerking1en2(LeveringInfo),48) ; op etiket voor VRD #dim GewichtPerEenheid as %Numeric = ##class(TECH.Math).Round(LeveringInfo.Gewicht / LeveringInfo.AantalVerpakkingEenhedenTotaal,2) set it = ##class(TECH.ListIterator).%New(LeveringInfo.VerpakkingEenheden) #dim Linecounter as %Integer = 0 @@ -169,13 +168,17 @@ #dim LeveringAdres As APPS.TRANSP.dto.LeveringAdres = LeveringInfo.LeverAdres #dim Instruction as %String = "" If ($$$HasLength(LeveringAdres.Volmacht)) { + Do ##class(Tools.Wlip).%New(207).String("Volmacht " _ LeveringAdres.Volmacht) Set Instruction = LeveringAdres.Volmacht } If (LeveringAdres.Opmerkingen.Count() > 0) { - set Instruction = $Select($Length(Instruction):$$$CRLF,1:"")_ LeveringAdres.Opmerkingen.GetAt(1) + Do ##class(Tools.Wlip).%New(207).String("Opmerking Count " _ LeveringAdres.Opmerkingen.Count()) + Do ##class(Tools.Wlip).%New(207).String("Opmerking 1 " _LeveringAdres.Opmerkingen.GetAt(1)) + set Instruction = Instruction _ $Select($Length(Instruction):$$$CRLF,1:"")_ LeveringAdres.Opmerkingen.GetAt(1) } If (LeveringAdres.Opmerkingen.Count() > 1) { - set Instruction = $Select($Length(Instruction):$$$CRLF,1:"")_ LeveringAdres.Opmerkingen.GetAt(2) + Do ##class(Tools.Wlip).%New(207).String("Opmerking 1 " _LeveringAdres.Opmerkingen.GetAt(2)) + set Instruction = Instruction _ $Select($Length(Instruction):$$$CRLF,1:"")_ LeveringAdres.Opmerkingen.GetAt(2) } Quit ..BeperkLengteTot(Instruction,128) ]]> @@ -249,7 +252,7 @@ set Opmerking = LeveringInfo.LeverAdres.Opmerkingen.GetAt(1) } If (LeveringInfo.LeverAdres.Opmerkingen.Count() > 1) { - set Opmerking = $Select($Length(Opmerking):" ",1:"")_ LeveringInfo.LeverAdres.Opmerkingen.GetAt(2) + set Opmerking = Opmerking _ $Select($Length(Opmerking):" ",1:"")_ LeveringInfo.LeverAdres.Opmerkingen.GetAt(2) } Quit Opmerking ]]>