From 08ad948a61cdfded9cb917e19e6915774a80817a Mon Sep 17 00:00:00 2001 From: "thiago.clemente" Date: Fri, 30 Aug 2019 19:30:05 +0000 Subject: [PATCH] fixes bug#15134 dev: qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97128 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioMovimentacaoBilhete.java | 13 +++++++++---- ...RelatorioMovimentacaoBilhete_es.properties | 2 +- .../RelatorioMovimentacaoBilhete.jasper | Bin 73737 -> 73747 bytes .../RelatorioMovimentacaoBilhete.jrxml | 10 +++++----- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java index 7b87699cf..2cab82de5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoBilhete.java @@ -163,6 +163,7 @@ public class RelatorioMovimentacaoBilhete extends Relatorio { gratuidadeBean.setCodOrigem(rset.getString("codOrigem")); gratuidadeBean.setCodDestino(rset.getString("codDestino")); gratuidadeBean.setDescorgao(rset.getString("descorgao")); + gratuidadeBean.setTpp(rset.getBigDecimal("importetpp")); // Mantis 15134 gratuidadeBean.setDireccionnumero(rset.getString("direccionnumero")); @@ -172,6 +173,8 @@ public class RelatorioMovimentacaoBilhete extends Relatorio { gratuidadeBean.setSerie(rset.getString("serie")); gratuidadeBean.setSubserie(rset.getString("subserie")); gratuidadeBean.setNumbpe(rset.getString("num_bpe")); + gratuidadeBean.setChavebpe(rset.getString("chbpe")); + gratuidadeBean.setProtocolobpe(rset.getString("nprot")); if (indstatusboleto.equalsIgnoreCase("TROCA PASSAGEM") || indstatusboleto.equalsIgnoreCase("TRANSFERÊNCIA") @@ -263,13 +266,14 @@ public class RelatorioMovimentacaoBilhete extends Relatorio { sb.append(" r.prefixo,"); sb.append(" aidf.serie serie, "); sb.append(" aidf.subserie subserie, "); - sb.append(" bpe.num_bpe num_bpe, "); + sb.append(" b.num_bpe num_bpe, "); sb.append(" bpe.chbpe chbpe, "); sb.append(" bpe.nprot nprot, "); sb.append(" 'N/A' as serienovo , "); sb.append(" 'N/A' as subserienovo , "); sb.append(" 'N/A' as ccfnovo , "); - sb.append(" 'N/A' as bpenovo "); + sb.append(" 'N/A' as bpenovo, "); + sb.append(" b.importetpp "); sb.append(" FROM boleto b"); sb.append(" JOIN categoria ca ON b.categoria_id = ca.categoria_id"); sb.append(" JOIN parada ori ON ori.parada_id = b.origen_id"); @@ -397,13 +401,14 @@ public class RelatorioMovimentacaoBilhete extends Relatorio { sb.append(" r.prefixo,"); sb.append(" aidf.serie serie, "); sb.append(" aidf.subserie subserie, "); - sb.append(" bpe.num_bpe num_bpe, "); + sb.append(" c.num_bpe num_bpe, "); sb.append(" bpe.chbpe chbpe, "); sb.append(" bpe.nprot nprot, "); sb.append(" cori.ccf as ccfnovo, "); sb.append(" aidf_ori.serie serienovo, "); sb.append(" aidf_ori.subserie subserienovo, "); - sb.append(" bpe_ori.num_bpe bpenovo "); + sb.append(" bpe_ori.num_bpe bpenovo, "); + sb.append(" c.importetpp "); sb.append(" FROM caja c"); sb.append(" JOIN categoria ca ON c.categoria_id = ca.categoria_id"); sb.append(" JOIN parada ori ON ori.parada_id = c.origen_id"); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentacaoBilhete_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentacaoBilhete_es.properties index 9a30a9eea..d3d3cbd53 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentacaoBilhete_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentacaoBilhete_es.properties @@ -51,4 +51,4 @@ detail.tpp=TPP detail.status=Status detail.chave=Ch. BP-e detail.protocolo=Pt. BP-e -detail.total=Total \ No newline at end of file +detail.total=Total: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jasper index 5b91e11082bf258084d7515d76a9e53d182c4c1b..2ab19ccd8a5537e37da5d20fb3f0dc1fdb1c5cd7 100644 GIT binary patch delta 8499 zcmaKxe{fXQ70365B?-I)fsKKLKp?C?Dj_Bz5M!kh!itgnVv`^gY6bJm-){2yAg{C+YMtJ5&V9Rg^RD%e z<2mp9z4vqOeRubU2QF!*Ql5%>Rpf`bb#)ZNfcvfo0A5kNz~wfZ<7?v{J30$U+iD7Lq7J;9X+REmprz zvJ2&N*-*hb{V>2W96~tN3b-sJ!DS%{E(9C=5W5%A~Y6Z$*=U?@QV)d&zN04P-egkS@dAfUE%Kwks^4BtZl)d&zN z2b55%00_YbU?Y2{KUOq}9i2Cz*8&2=GDJ{~2$8}XC{-YYU_&g!HB6cRp1v9Y7*-*G zY6OTB0F){KLa+f=A>i=^LwW}QFtj0nY6OTB0F){KLa+haIN&dOH%yKpijz}~lZzB4 zr&KYy5Nwl2vHP})Q~C}7VAzfTsu3Vk08pv`2*C!}j)37?U)T2n0K;wsP>leQ0)SEl zKnOO#ZUij8?YRCV05I%F0M!T(DF7%{0EA!z>_@J z@5({_A^$qoyD@S-n<5E%)H@W&`GFcd3rq#}+|1mWShn$A+Ve_{8!f?he3VXj9-wMI5CHoaNy-;j!W1TAs^t z8jrc*ZcV`uRp3ZP9Hk1J<>5HtvEk^V-r6+ahMP78!*&IZRK!uLz*!!S6CN9muI-WL zlWw?oQ!wmS;7COrr3#$o;W**3;ph^->+V4}+`=gs_A79tB92l8&hl`a@Yry4rN6ZD zr29p{VR%7-BNcI!DsYyE{&Z~B0L!z z41_w2ge?mmj`Nw3NTAiIZcPZ;An0v=Uxyjl7%)*XtCZkxAud0iH@M)UJIMzi@WG=HeO z(})K6!ln61fn6E>hG;86vAv~SX!jaEU7H!?%?6?|Kc6}NZm$8^3A>zlM(-P*EirwG z$8J#lA@{&mey7JnqBj2W@+=x9)@5i@F~ z<6@no)_ORe)~Sncn9pooGWvwl5ZbVILs}sT?bvw$_NcWHgBV|@XycdgIK>(jI_?=$nR z%Ektdx5evesP{He{}5JmN85L(Jh?Z)`M*qFuqFD*n>^{0qhmp*}{; zIFY7msjXbuQdQqv7oT*`+Psu8eJs2opSSSnhO*hC1~gWAs~ehXJk|ifG2^}&Y-})x zx1Jx&<>PJ*=B0~q+3fsB*=bhGTY_$GdNw$nn_dmh;Q1ede65dl-pbSOcFyFF*L2R} zd2iLZD=OXL!qg~af| zi)#4SLDJ$=@2IZfznr(4f{p(;1RMYN5Ue`GoNrO{N3yRIHsnsiS%XHXy=bv%2K|P$ zt89mPBOf|q=H>Qj4tNE6U489hPi=$O(^zSdxXdZvnA6CbBdp__8=EV=)%7jaOOl4Q%q~IX2MU|Z{Pk?z=lt)G(67gOVE@Tq%nbm(n{Zb zQJT8+m(o@pI4n(_{wt}S$gic@K6y#n1J6-OIovPpLGH^^Z`%i?-u^oH`;_=Q{N&^j zEAM}1s3yLgqo<^a+h3K2zyF%Fg{7}cJwNk?gdF>(RBSja%{F{anqdChQt`xZq%q&T zBW;xLx03DLyHYzv?@Kmz{-4^k4{98f;U61Of2_*v3L$iIDcdjpfW_e;i(QZAEECaWTK%TT07IZkabf&7o q-@pv5cQ7SQ+plYv2A`U&P0ir{=MS&ZCXN~#V-tsF?E6=~mi<3pK3dfP delta 8284 zcmZ{pe{fXQ7034_n*?|Wh6PDtek}%#qOfq>IG9YsK=9c5@ooQ_)CKYGtOcXx00UHRj1 z&ij7v`J8v(uRz!-=Z;g(SGN|k-Q^Rq9J{(5n;g5?|B7=mFlE{^u3~XC6an!;hvV(0 z5dVWtvKwWtOtI2*f2Z$*qZsxw&F#vhnr)fjDx_4=2?e%)uPcvM?gIn@TjH?2%sr`` zjVw8%9|i!1LkOT607aB40K&sZ%@rOS;1B|~l%CN00f362%s7Plqvwi0|4Q%0ZwzkHT?oK$8a8+XJE>*Pw*>AlA<{Y44Mm%t@(MJ z{#e=D`eguMxP;SFjnh-A00<8NgvSQBgn-Gn_v+UHfZ-Yfs73V`qcKzM9`Ys~oZ zKlJ}Va}3{NbE>g9rHbal1I>lU*8E$X{+r1s^(+q1Fl4Zr>8>KGscVDu_>d=yJw4Tx zNglS}d;6eb^3IGWR5GeqJ-3D+W;Org8^b!DIa3g?f1%Lzu zh!gZScH#VnQ(VPTqE>dVN z?6&52C| zq<|B48!j7hmlu5CaRUxRkpf4m0!ISkL<%@zx8aHqx4iC*=MKPOC|BS}Rp3ZKoJavD z>^59E;?6I8%`*#d817QwNLAoSK%7VcC+s%dU5Klyf6KD~a2Vz*aHJ}5Bp^$6QqJ@B(D-}gYj2foB<7qQWZE75GPW=3A+tP zpLK27G0$%Shv9$%N2&rx0^&ppIAOQp4&ZawvAoaI3pfl%6gW~9I1&&iQosqj4R?g? zf6%8D^=3R2c4nUqMID(|*xzmjBLE*{1MT@^;AmE>8HxIXR`T#oa5$~AOB}iUaKX)R zBqQJtt}>Fgv2bv>&kBeAtwwEYQn&>Kz0LHkvcjwVMu(Y{azMI?6Ma#C$Xaa%qf$fd zEPKlsr{QShz&HYo!B|(TP5%$LwzDooQT3stcv0zj&bfs@B4Nd)dk5o4ALjC#4 z7!f}|ZK;3qR8y}HZ6s`h?Hc95sf_0B+N=N{)*p$QymR8pjt1EYdz?H*R~wGamG_fw zjfmME3&+iTJ4Qi+^jI{U+*(>6GFy%I#P%edQF`ameI;5(jc6>A5K<7xi-aE>_R^z*9SQFUc4wtrzo$Q#v>nk0(JpaBUFAGpnM;W`? zQov?(X7i&9It#hO-&w@-9i0U{zx;51R{AbY<4%@+bu9a|GgDeu$c6`Q=H9$OfjD{x z?^ehj3XIREMUI;qyo>7_np*1W=hW1BX)gxZQ-OTG?3F+XM+^o^=Lqx7!rWB5(A%=S zeo@?ygO2GiRvQ(us6SBAS^$=eX02Ch}P1=p&^D&j*M)-;~?SZ7~73ii)6w@fJGZ|=o4_j=*+Ov>;v)9$-RsNuzty$;croMIcC47L)IrVi*7A~^89XNkAo3wsXHXol~bZ2+8)r5DA z^ETG9K5w)*QHMj!x_$l3B65z2T2Uj=5;414@a4_Ff@0m3^#!96>!8&Nrf;a^<9Id{ zXt%NF+j3ZB!wT&Qc45Okn#IOE(q0k+8-{M&V2AwEHVLez$yG;bj6Cu$T80QKq<&I=h*BPkC?I#<`ldogLZg(!y-ZriRidVG<0ApNvU(lHJ(mx{r*CNn~Nj zBto!F!hcTQQ_i+-Zb%IB6=j7^HDa z346470o%Bxtn?)q2*W|eK&0Y8lqv?2g&_k8!8XuA9H?pQLy3Xj-RdocUmiIzi2qF+ za7h&A_UtY{P$9OirCAKZcYp``>`KsFS4i0-4mVf!8{nwC^m*voQG1y zJhCuk9wFG~IfEN>=i|!~^BjEKTlyCm1jC1lK}f|xC{+w13quAGf^Cowage<~|7&89 z$F@z##Fxb(_I~m0?1OFkuxWYPJo z1UuI z*CkJ9#7U`h_nXrCzr7{x;j95^=)Q3kLfQ~$^;?O9#B+J9(_mNSz7%@2;&QdjhRTBJ?;KNJ!A1ONa4 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml index 11c3d5738..5f1064b36 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml @@ -1,8 +1,8 @@ - - + + @@ -45,7 +45,7 @@ - + @@ -467,7 +467,7 @@ - + @@ -491,7 +491,7 @@ - +