Index: APPS/TRANSP/GLS/Bericht/impl/RequestDataBouwer.cls.xml =================================================================== diff -u -r29575 -r31086 --- APPS/TRANSP/GLS/Bericht/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 29575) +++ APPS/TRANSP/GLS/Bericht/impl/RequestDataBouwer.cls.xml (.../RequestDataBouwer.cls.xml) (revision 31086) @@ -228,9 +228,17 @@ Set Request.T861 = $Select($Length(LeveringAdres.Toenaam):LeveringAdres.Toenaam,1:" ") Set Request.T863 = LeveringAdres.Straat Set Request.T864 = LeveringAdres.Woonplaats + If $IsObject(LeveringAdres.Opmerkingen){ - Set:(LeveringAdres.Opmerkingen.Count()>=1) Request.T920 = LeveringAdres.Opmerkingen.GetAt(1) - Set:(LeveringAdres.Opmerkingen.Count()>=2) Request.T921 = LeveringAdres.Opmerkingen.GetAt(2) + if $$$HasLength(LeveringAdres.Volmacht) { + Set:(LeveringAdres.Opmerkingen.Count()>=1) Request.T920 = LeveringAdres.Opmerkingen.GetAt(1) + Set:(LeveringAdres.Opmerkingen.Count()>=2) Request.T920 = $$$IfLength(Request.T920,""," ")_LeveringAdres.Opmerkingen.GetAt(2) + set Request.T920 = ..BeperktLengteTot(Request.T920,50) + set Request.T921 = ..BeperktLengteTot(LeveringAdres.Volmacht,50) + } else { + Set:(LeveringAdres.Opmerkingen.Count()>=1) Request.T920 = ..BeperktLengteTot(LeveringAdres.Opmerkingen.GetAt(1),50) + Set:(LeveringAdres.Opmerkingen.Count()>=2) Request.T921 = ..BeperktLengteTot(LeveringAdres.Opmerkingen.GetAt(2),50) + } } #dim Land As DOM.common.Land = ##class(DOM.DomeinContext).Instance().GeefLocatieAPI().GeefLand($$LAND^vhRtn1(LeveringAdres.LandCode,"I")) Index: vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request01.txt =================================================================== diff -u -r29575 -r31086 --- vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request01.txt (.../Request01.txt) (revision 29575) +++ vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request01.txt (.../Request01.txt) (revision 31086) @@ -1 +1 @@ -T050:VanHoecke |T051:V 1.0 |T084:P |T090:NOPRINT |T100:BE |T206:BP |T207:DEP |T330:9100 |T400:1123456789 |T530:8,3 |T545:30.06.2011 |T750:Deposit-Service |T751:VOLM10.04.12 ACHTER GARAGE PLAATSEN |T752:Goed aanbellen |T758:0479-82 17 95 |T759:Adreske |T805:100670616 |T810:VAN HOECKE nv |T820:EUROPARK - NOORD 9 |T821:BE |T822:9100 |T823:SINT-NIKLAAS |T852:1 |T854:12345X123456P |T860:Adreske |T861: |T863:TestStraat 1 |T864:TestGemeente |T8700:BE6700 |T8748: |T8904:001 |T8905:003 |T8914:056aaabECi |T8915:0560005353 |T920:Goed aanbellen | \ No newline at end of file +T050:VanHoecke |T051:V 1.0 |T084:P |T090:NOPRINT |T100:BE |T206:BP |T207:DEP |T330:9100 |T400:1123456789 |T530:8,3 |T545:30.06.2011 |T750:Deposit-Service |T751:volmacht opmerking GLS |T752:Opmerking 1 |T758:0479-82 17 95 |T759:Adreske |T805:100670616 |T810:VAN HOECKE nv |T820:EUROPARK - NOORD 9 |T821:BE |T822:9100 |T823:SINT-NIKLAAS |T852:1 |T854:12345X123456P |T860:Adreske |T861: |T863:TestStraat 1 |T864:TestGemeente |T8700:BE6700 |T8748: |T8904:001 |T8905:003 |T8914:056aaabECi |T8915:0560005353 |T920:Opmerking 1 Opmerking 2 |T921:volmacht opmerking GLS | \ No newline at end of file Index: vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request03.txt =================================================================== diff -u -r29575 -r31086 --- vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request03.txt (.../Request03.txt) (revision 29575) +++ vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request03.txt (.../Request03.txt) (revision 31086) @@ -1 +1 @@ -T050:VanHoecke |T051:V 1.0 |T084:P |T090:NOPRINT |T100:BE |T206:BP |T207:DEP |T330:9100 |T400:1123456791 |T530:8,3 |T545:30.06.2011 |T750:Deposit-Service |T751:VOLM10.04.12 ACHTER GARAGE PLAATSEN |T752:Goed aanbellen |T758:0479-82 17 95 |T759:Adreske |T805:100670616 |T810:VAN HOECKE nv |T820:EUROPARK - NOORD 9 |T821:BE |T822:9100 |T823:SINT-NIKLAAS |T852:1 |T854:12345X123456P |T860:Adreske |T861: |T863:TestStraat 1 |T864:TestGemeente |T8700:BE6700 |T8748: |T8904:003 |T8905:003 |T8914:056aaabECi |T8915:0560005353 |T920:Goed aanbellen | \ No newline at end of file +T050:VanHoecke |T051:V 1.0 |T084:P |T090:NOPRINT |T100:BE |T206:BP |T207:DEP |T330:9100 |T400:1123456791 |T530:8,3 |T545:30.06.2011 |T750:Deposit-Service |T751:volmacht opmerking GLS |T752:Opmerking 1 |T758:0479-82 17 95 |T759:Adreske |T805:100670616 |T810:VAN HOECKE nv |T820:EUROPARK - NOORD 9 |T821:BE |T822:9100 |T823:SINT-NIKLAAS |T852:1 |T854:12345X123456P |T860:Adreske |T861: |T863:TestStraat 1 |T864:TestGemeente |T8700:BE6700 |T8748: |T8904:003 |T8905:003 |T8914:056aaabECi |T8915:0560005353 |T920:Opmerking 1 Opmerking 2 |T921:volmacht opmerking GLS | \ No newline at end of file Index: vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/TestMultiColliBEDeposit.cls.xml =================================================================== diff -u -r29059 -r31086 --- vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/TestMultiColliBEDeposit.cls.xml (.../TestMultiColliBEDeposit.cls.xml) (revision 29059) +++ vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/TestMultiColliBEDeposit.cls.xml (.../TestMultiColliBEDeposit.cls.xml) (revision 31086) @@ -19,7 +19,7 @@ #dim LeveringID As %String = LeveringIDIt.Next() set ^TRANSP("D",..#RitID,"D",LeveringID,"Q",##class(DOM.TRANSP.enu.VerpakkingEenheidType).Colli()) = $$$Aantal set $piece(^TRANSP("D",..#RitID,"D",LeveringID),"\",3) = $$$Gewicht - Set ^TRANSP("D",..#RitID,"D",LeveringID,"A") = "1\Adreske\\BVBA\TestStraat 1\9100\TestGemeente\1019\N\\\\0479-82 17 95\\\\\\\\\\VOLM10.04.12 ACHTER GARAGE PLAATSEN\Goed aanbellen\\DI1\" + Set ^TRANSP("D",..#RitID,"D",LeveringID,"A") = "1\Adreske\\BVBA\TestStraat 1\9100\TestGemeente\1019\N\\\\0479-82 17 95\\\\\\\\\\volmacht opmerking GLS\Opmerking 1\Opmerking 2\DI1\" } ]]> Index: vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request02.txt =================================================================== diff -u -r29575 -r31086 --- vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request02.txt (.../Request02.txt) (revision 29575) +++ vhTestFiles/IntegratieTests/Magazijn.Transport.GLS.BerichtEnEtiket/TestMultiColliBEDeposit/Request02.txt (.../Request02.txt) (revision 31086) @@ -1 +1 @@ -T050:VanHoecke |T051:V 1.0 |T084:P |T090:NOPRINT |T100:BE |T206:BP |T207:DEP |T330:9100 |T400:1123456790 |T530:8,3 |T545:30.06.2011 |T750:Deposit-Service |T751:VOLM10.04.12 ACHTER GARAGE PLAATSEN |T752:Goed aanbellen |T758:0479-82 17 95 |T759:Adreske |T805:100670616 |T810:VAN HOECKE nv |T820:EUROPARK - NOORD 9 |T821:BE |T822:9100 |T823:SINT-NIKLAAS |T852:1 |T854:12345X123456P |T860:Adreske |T861: |T863:TestStraat 1 |T864:TestGemeente |T8700:BE6700 |T8748: |T8904:002 |T8905:003 |T8914:056aaabECi |T8915:0560005353 |T920:Goed aanbellen | \ No newline at end of file +T050:VanHoecke |T051:V 1.0 |T084:P |T090:NOPRINT |T100:BE |T206:BP |T207:DEP |T330:9100 |T400:1123456790 |T530:8,3 |T545:30.06.2011 |T750:Deposit-Service |T751:volmacht opmerking GLS |T752:Opmerking 1 |T758:0479-82 17 95 |T759:Adreske |T805:100670616 |T810:VAN HOECKE nv |T820:EUROPARK - NOORD 9 |T821:BE |T822:9100 |T823:SINT-NIKLAAS |T852:1 |T854:12345X123456P |T860:Adreske |T861: |T863:TestStraat 1 |T864:TestGemeente |T8700:BE6700 |T8748: |T8904:002 |T8905:003 |T8914:056aaabECi |T8915:0560005353 |T920:Opmerking 1 Opmerking 2 |T921:volmacht opmerking GLS | \ No newline at end of file