From ac328cf5fa58fef739b87bd7d441f8762c4820fd Mon Sep 17 00:00:00 2001 From: Julio Heredia Date: Wed, 8 Mar 2023 16:32:24 -0300 Subject: [PATCH] fixes bug#AL-2308 --- pom.xml | 2 +- .../relatorios/impl/RelatorioBPe.java | 29 +++--- ...PeRejeitadoEnvioContingencia_es.properties | 3 +- ...ejeitadoEnvioContingencia_pt_BR.properties | 3 +- ...atorioBPeRejeitadoEnvioContingencia.jasper | Bin 36380 -> 38191 bytes ...latorioBPeRejeitadoEnvioContingencia.jrxml | 97 +++++++++++------- 6 files changed, 82 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index e1d43ecda..0f974adbd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.67 + 1.0.68 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index c732414f9..3dc7fdaea 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -76,7 +76,8 @@ public class RelatorioBPe extends Relatorio { dataResult.put("valorseguro", rset.getBigDecimal("valorseguro")); dataResult.put("valoroutros", rset.getBigDecimal("valoroutros")); dataResult.put("errocontingencia", rset.getString("errocontingencia")); - + dataResult.put("evento", rset.getString("evento")); + this.dados.add(dataResult); } @@ -105,7 +106,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" SELECT "); sql.append(" dtvenda, hrvenda, locpuntoventa,numPuntoVenta, origem, destino, dtviagem, vlbpe, valortarifa, valortaxa, valorpedagio, "); - sql.append(" valorseguro, valoroutros, chbpe, protocolo, num_bpe, numserie_bpe, status, obs, qrcode, errocontingencia "); + sql.append(" valorseguro, valoroutros, chbpe, protocolo, num_bpe, numserie_bpe, status, obs, qrcode, errocontingencia, evento "); sql.append(" FROM ( "); getSelectFrom(sql, alias); @@ -218,8 +219,6 @@ public class RelatorioBPe extends Relatorio { } sql.append(" locpv.DESCPARADA as locpuntoventa, "); sql.append(" pv.NUMPUNTOVENTA as numPuntoVenta, "); - - sql.append(" TO_CHAR(bol.FECHORVIAJE,'dd/mm/yyyy HH24:MI') as dtviagem, "); sql.append(" COALESCE(bol.PRECIOPAGADO,0) + coalesce(bol.IMPORTETAXAEMBARQUE,0) + coalesce(bol.IMPORTESEGURO,0) + coalesce(bol.IMPORTEPEDAGIO,0) + coalesce(bol.IMPORTEOUTROS,0) as vlbpe, "); @@ -234,29 +233,31 @@ public class RelatorioBPe extends Relatorio { sql.append(" bol.NUM_BPE as num_bpe, "); sql.append(" COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, "); - sql.append(" case bpe.codstat "); - - sql.append(" when '100' then ( "); + sql.append(" CASE bpe.tipoevento WHEN '110111' THEN 'Cancelado' "); + sql.append(" WHEN '110116' THEN 'Alteração de Poltrona' "); + sql.append(" WHEN '110115' THEN 'Não embarcado' ELSE '' END as evento, "); + + sql.append(" case bpe.codstat when '100' then ( "); sql.append(" case "); sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 0 then 'Autorizado' "); sql.append(" when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 1 then 'Aut.Conting.' "); - sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' "); - sql.append(" when bpeSub.bpe_id is not null then 'Autorizado/Substituído' "); + sql.append(" when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' "); + sql.append(" when bpeSub.bpe_id is not null then 'Autorizado/Substituído' "); sql.append(" else 'Autorizado' "); sql.append(" end "); sql.append(" ) "); sql.append(" when '102' then ( "); sql.append(" case "); - sql.append(" when bpe.tiposubstituicao is not null then 'Substituição' "); - sql.append(" when bpeSub.bpe_id is not null then 'Substituído' "); + sql.append(" when bpe.tiposubstituicao is not null then 'Substituição' "); + sql.append(" when bpeSub.bpe_id is not null then 'Substituído' "); sql.append(" end "); sql.append(" ) "); sql.append(" when '135' then ( "); sql.append(" case bpe.tipoevento "); sql.append(" when '110111' then 'Cancelado' "); - sql.append(" when '110115' then 'Não embarcado' "); + sql.append(" when '110115' then 'Não embarcado' "); sql.append(" else '' "); sql.append(" end "); sql.append(" ) "); @@ -264,8 +265,8 @@ public class RelatorioBPe extends Relatorio { sql.append(" when '150' then 'Aut.Conting.' "); sql.append(" when '-1' then 'Pendente Envio' "); sql.append(" when '-2' then 'Pendente Envio' "); - sql.append(" when '-10' then 'Rejeitado Envio Contingência' "); - sql.append(" when '-20' then 'Rejeitado Envio Contingência' "); + sql.append(" when '-10' then 'Rejeitado Envio Contingência' "); + sql.append(" when '-20' then 'Rejeitado Envio Contingência' "); sql.append(" else 'Rejeitado' "); sql.append(" end as status, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties index 47009c601..b721b11ea 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_es.properties @@ -28,4 +28,5 @@ label.numBPe=N label.serie=Série label.status=Status label.obs=Observação -label.erroEnvioContingencia=Erro Envio em Contingência \ No newline at end of file +label.erroEnvioContingencia=Erro Envio em Contingência +label.evento=Tipo Evento \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties index 47009c601..b721b11ea 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPeRejeitadoEnvioContingencia_pt_BR.properties @@ -28,4 +28,5 @@ label.numBPe=N label.serie=Série label.status=Status label.obs=Observação -label.erroEnvioContingencia=Erro Envio em Contingência \ No newline at end of file +label.erroEnvioContingencia=Erro Envio em Contingência +label.evento=Tipo Evento \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPeRejeitadoEnvioContingencia.jasper index f63b9a6e48a863ab76e0c6bb1abb09addca0cb85..9cef4cf4a5db13c3a043c22e4f0c106f3c8819be 100644 GIT binary patch literal 38191 zcmeHQd3;sH^`Ds+l9%Kqgs^XlAX|V05D-L!BqR{X#!CPJYj`9#wJtxGYHL-htxL7;we=@1{b_&SGc$L~ySzN0{imN_;LV-6XXe~9 z=bSlnX70?~TR&rc;xRTMVkC;=t;HKc@lGQaGdiQOM7-FDtPe+w;wAECP~K$nZ~W_m z`KnoNbF`x~+-@ukB|-@{sCq+aQ>Y{yEom@f;ZS?{*wDImV{SF;r?b_DI*f*{*4A)$ zf)%RF?V-r}l7>Vq99fTyc{*dPygd|;AHz;$qC3W>q@rzIC=LRHWw`Vtu&9a+t#7DU zzOb&Tp(0pSTHUmwBG^z>SKG9_YGD-%tcxZR(T43(^+y0mw7M9QOGkwg_yLaBz% zP%}ugpew^IiMG|OAiO>jjT!YJlnf=p(a37nKOC=YkA@QEvRq{}nlNING2YPC(GiMm zsWmnuyRn*$vTm&mC)()VVk6XI#7ZMAW~uyeyfK_;H*}dQmeX#uCKRD%EH@ep8xb%Z z&jqMcVhFEq1J&7-kTjM70H!ADVn7Y@W0b+HYIY*pX=2OY+-5{-qa?w`EuBU+%UKs{ z-nc#nHnb$z!PVe>NxZehr57biFG`5*krv3Uuj1CiaLi~XvJ&i&lm!!bQc18YVil-} zbaenvK;cn*An|8d_Y{-ly*13=0&?RORF zwwHo38;WJN7>Q80U6YfiQVnKB$M=RsWdxqW)@ZCFl&B0fC!(<}wuXb{;SSl}8jM7O z^;Hd{D-mu-J0iOM)JVD@S=k_}Sw0#^f)vNar`(QEIHD_?V7-xLb0s5!R;e*(Mx-L> zsunmDZAGZP3p|^ivbIvJb+&eDsY(@f(W;e})LuWUudS{6QPX;VRK2C)@=0r0W}HL| ztr*vvR+z%gimT=+$ymd(6Glg8dniFTN_xYg>`kLC0YUXiP^;B7>hEq?x>hrLuhmLd zgOoMv?quw#N?6_j_;F=|GoMgbbv)eNSvp|d@lC~a?# zZZ=w~S%0Z0#G{Jt&X^I8OLJ3{lC4XEc3y}nuQL`!Czl8t@tP27GNqTo_0H@lpB*QP z$XX^?fukEM+mfK(F5d!cnNLlLUp5+9N5ZJY9b<>2$<>N>qXV76BG_x_2>lUv1&l^> zTe!U?2AD~sv?$f#xHN@^qg;YbPDvry=g2*`o21@f>IR`KE{(-PTL^FW$*+vO?CH>z zKE|t9Mm&71L3+#bHfJF0i$YV=tW=}Xou~{O?GAkzm|9=*)M!t)!MbyRzq2IF~BPGy#ry{dKN&4F*iNN%&LxrniQeDu2fYZ7yXv&6KwJVk6 zCy_qb%0N9y5AYh+-vN%H>hNY@5)bLkBrZ0&Tp!Y$0hthgw7rF% za4={K$E)z*aI;S5h2!-ttrZ>XjFuL|%+yyl`0z%fu?^O9eVfi3pxf{wTF46Nd%5BG z@(9EMO_9~dBcx02;&)$i(v!KJOSd(z2_0CMMR>}h7zOp_rd6wq;AbwC(Zdl!1Fa}< z+|v9@!#^XG8js04GMrtVgcZ#J>M!*|(~2QQEVMor>TFA}i7BPCBuI^3W+i$%!SG0P zlvGS(rdyS6rBdS(7aI%YP$ij<0eRoeNPjG<#zC4Rd1hL(qa-E4Qk{YtgXRSdja=m9 zTQ{6dC@Yx|%ifF^E6@5HTe;*=D^>=dVIc9Kla@Kh$JidjC_V6+zU ztg9lGVOaf@ZLpo>y~#dOLg4utaFSbOP2#KBFkOO-??O3RGW$;e(Xj@Nj_4+XG>>vf zJ6*;CozZxhMvLV4U|1Vhy)UJzSf9-_(yn5>8^0~^xoA|{O!kjN4I?(dIhccowkeGE znP91ziqW8B2xyjqwg#O35Itc89*Oaq;e4cTqp?M+az;nAMOp$h!)%IcnNI3mrZvc| zl`R)-3uaN88$z5_&4xH`k@2;9O#R?~PNwOHrZLv8cd%MN+{=-shrq2FX!+RET`6zF z5WtYrF$eYZo~guOxC`2)-eUKX>9`Bpvv!n%ED9Woplg_hS<}87X^*a8MpqYf$m}hp z_q!YuKk#4mV5+Y;nB!^;Ry39`hM%nlZqhlY8b5rQ@9RrDPAkE< zU)f z_VT+vdv@C&4*%j)!FVO>vx#O1V4e!>T(w>3abu_7deO+-t#6+tz>Ut*QD8D5>t|;x zQ_k57qhcq$dc}921Kny9T_-ZDKNLyV@R6NC@2c2D!=c=sJ`V{6{cyH+glLeIy5-V1 zmZrO+-Sq}}k?^;=%gMRHqhNJ<8$Y3(m7DrTFPDJ41VcKV6-k}2uhW8fcY`!owo51X zPMOqSX&l{>|LG1eL3){-Cq;3aqclB`?zF68nq8LL4iL$q2&jtE?9yB`WTxuQAYAf} zoPD;uVcA+3?tIE2Z)h`<#z38POBT^aMk19nu2h!^(2Pz4bI56H25MyG)|QF%osccE zf?3pHQqJZ$=UJlN)k>FamMb$ z!8Widr8RY+wtQ6^bq)sft>p2LkgMSDs}Tzfg>?2^cY3vmrfT7a4)LdR}QOMyw=O5Syp(l^Nu~=$nB=Xk7!0fTgO)=-2n8 z4h)A`(26%p#xOCKzu0KsWRO=og$7sZHifzam8_F}SW0Um`>^DB3&nWG9KEEkwr=HK zsJiWJ*h0*xVj|pvso>_euE<6>Aya#sv#_z0QxPyaU-o5khTbs%F0}6kjZnJ&S)>DS0^isNK42TCt^|uMkP5$(|}hxM@fzm>D6pPL6Nz#_`I{OI`_8+pH}wX z%^zKI{PqKk8pGU7jBcGrx{K0auH#Q?K%dnJKQ^aL5iJtUx@9ujZ@ECMW4n^Xyx1at|LNJ|27 z5=CeFhKL?wOQ4^J1OloJUx6DUVzv3$RL5#oA{;2{%ym%o*sL`$xoeh zlJ6YRQ1_v!W_XaqzgO%(jjAJqQ#{zOpdRdZ0$l8O0$l9Z0Fy|I{ii7Y>|+Bc^k9FU zHbHp37LG)n>{k^TmBjz~Xg~F7^Z)K;i(bC+_?oxoTsrk<5ByMh^nUSwEAd|j=X>y9 zK|T2I1i1L`1i1LG0ZIHnf4}(O--G`JjxHdKY5%mEz%+>9+_Xh-$>VqR8!E1N{DLJP z4Ooy^gw|vaA&H@?31HYeBUMKyT?UVtULu4396m#zVAZ0@3 zB6R{>B6R{>BGrH-kzT!DA|2o%QY;3bULC$kG*(t`DEvC~wrM;c0)3pgm{zBLTW02p zE#)8I`0cm<)AIPPn$x@mDpB<=fcr=QGPoPQj$;l$zjr8n_v&lEKKYE--URgIJ=bpm_HiUK%!BvC74Nas zIa(3f6pqq78{Sl7ZAv(;i4n{>_-L4)o)2~IR|iz@EL`~J(ZO31pN*~RyI;~MBx%T? zuZJ`g)I%ChfJ+)qfJ+)0kR*-1`_&SLdq_iDB&^+vV2;xHXTPlD`ZoN=bYBGNMY<#= zwdjVgVSU!&O*W;OcVb>oWlb@!C$nDk)`_2<{oH9Y?a4f{J_DuYIRMW$ zm%-89QMQTIt2vY3K=LuF!jxZ5^PEVr!xC(m>osC&b#+BUV^dw(l8W+1`LKD{Z}X4N z`17`3y?g0FzxhjN`IpJsRsg-V|70nTDL7t)C#qnqho&j0ho(6JE=_X+T$-icMFzz{P1Nz{P0|Fd1NJ^+E@aRWuc+5Afi0rh5XjH%2E#PJoNiPJoNi8j!^3;9fEMz%HWE zF;f?}D^qd$tiG>2`9A+c=!1hR7ThtsX6rt4n$|gT8Lai-w1RqY+6i!R z+6i!RS_6_ey>_oSJ<5aAei&-klw@zLo|ZH%nTpldY@L5u{*AZoj4V6jja9?SZt-R{ zDZsT>Riw^(^^3<4Z8C^>uvK#4i4pVXc%op!?zGGS5`5oIQU-(T!`NiH`H|wA~3NMbI zL=?*41d`GH$>v1m@Zh==;NrRy;NrRlBys%&n@}A~#r4r%TyJhOxh`u!BZx5``7)1* zVdbn8j}%RU^^uDv6D-?W5V*%~6_xBUQkLDIgOaWZtaROZ8(SRiJ=+`9T>v)J?CW8bj!C9T{5^zQRZ@B6x4&$PJoNkPJoNk z8elTOa$v3^p1A%}aeAx=rvu=$oc-Gyb|=pQregQqf4y{K!3R&D-TLvhZ2i2Yhwd}G z?<981;5H9-E2sy%od6fRod6fRH2{p2`ew2FHW#ZYk&4~pJlKtWkZRiJ^*@Y#CvewO-Dki3*5&h`t~qF*IsH7*C4*-@IIW-_oOS|S zTy_FnT-JajE;xJbkdFCz^%WpU@J96?x51;e>_Hoaa?Ogc& zKC^rm(Itb|JXo%v9xQhPTr772TrAgsB$mInS1h0C!SYP^{G7#T_Z%Hw?WdfdQ!Cod z9kjHJ7EX}-bG+2g(u>(?@lOV=6sM(~DbYHXcIv(D3MsAs?w4w%@M?y=V>MXFUB(7) z#_p7$5s!AonvI$;_7+FhH)1IrRui_;c2rCo_PViL?pwtg!h+UtJJw{{%k;o5HVBy3 z(^lPdFqvCL?G5^C=(GoWH)c_9Q<${IRc_q`J?>4uI<2GG~F)w8|~L+}89*dfC19rGAJQm>Y19PM zonXrBq;%tg2F?+|JZ%&!OoGM+Bb*4eB)@Bf9Z1iT+L`#^p-e|LBUQ*Y=gjw8-w&tOKAXm^k=;ql>7)< z0rpa(7qu45_iVUk8<)$y(qDDY@fHVfgo73Jb-~7_^19l_iX$79%Bz+QbCoUBWfzt%mKJr|r2I-8rkeUQFln1No8>=f^1eK)H zh$X?&b=Z1}b!kIGQ*~YG!V2}yN8=tSsgp+u$p&5>rL&)0DDYZaHss~O z>ZZk|#G#-Um7^pkk|Q$G#@JBDV!Y9BH)8r=Ef>-O8fj%!bp_gFLtQnFfOA$lt((0Qg1-(N>%>ndoW>M~k~6;Y2Y8o++UA z!G<`8u$O#tTVv{MSXiXaJjAIhDX^(6;bzWM^wB16GvBxr80D_bbTTTQ>8eaffl*~_ zP+LE{;RC8>C9TckP`nLJNuR7;JD(i1_GKRvmDs)tbF0iF&WKF3VHA%uJzBau=P!`X z;E>IJTu0$o07Vy9<8@PKxZ7x_#MT7kQz>$V^X^6F-OHVKf8k7A!J~&*yaRWssVEJr<(4(8ylSG@waTg?fiaJ#KJfps68diI%sDyA>gkF!PR=N|AE-CACm$!4 zZ_y!VrNDEBqd*F+yF{ISV(JrE63AFm<*bx`=5Py_)sy!e3LLnHEUw+S7_Wq3TX6iW z_jtuQ+mR!A=d2M;a4Bx;+N5zLK+r6rYqGb~C5&zU9BUa^T1SEO5SCIa*M6wXhE)xX z6*Y2OcFGgVNEF3MqVT|&QA@t2YDsd{qj>Kvje6pE=Oa8?pZH#>E7=wDl^i5 z3W+p{%0B6rS5)Rml~5x_BIV`YY0OOj8J;v|rC(liQfq*sQpy(!kg4t}dZEmRdwWUh z#H@0la-j?!;{hnYth39LMmf1G5a`f-{CQL;+f zCw}gWmp}eS;RSbWysCNUrZ;L{OMb02m6iwtm0H0`c;tgU7UziXiCP(ar!qO$BWS1s z;N6>A^I(#LN*@!rw zNjJ*vKw_sov3qJcz5|h21^rYeXUox01#q?;7r@zaTmWawF#$;}CoP{to_VAO8+*{a z%!aDkMVQi}>hvSN;z60^oztezoGw#%Ov;HCDLv;&j8c4V32HASO}{4TL(?6 zEmhTFlw`7Z884^0$v{oUxz_G0z;X{6t70B9b^=^7)_@c;u9HmPgN%vHMQ-6z4ed=q zIbD>dRsB9GW;%ywP&3Xg}s`oxhpJsl1GSEGq zt6x%359vDrt`_bDxTLQEDWu=JU((ODq_0n5f^-L1LsdCphB>5&CxqHL=EKZ(j>%+vs>id1_ptGv zd4McnBU3B$iCnEN#KayQfo%#N&Jv{bsM8+v=j$s@Cmz3TjXf12&fEn2dN z1&35pwQb2X1d?oz(V6d3B2ESuc}Q46JtXV|xFqZZxFoCrCN1W;%y*GVqIFGWuk$Q9 z+UKSfI#`d>>u@d*-nu*fFlSn-$kHgK5lj z(!<=JIKo+{dw3@UN9I=t-gl|SzK_3x|u(bS&SaD3**nnCd0h~XoSs=(-?_leFVSx6;7;20$O;V3pO ztXo+t8`CIV3(KX;d|KCHZd$dt?XU-LeX6)BamVh4qn}t)H_fCRiYxJ}ldwz^qSSeh zt@titnGA0CXvGTZ(Tbe_S1Wb`T&-9GOd_pTe7mE)$tV$I3YvI{sS%RB?Rn+*Y{}$G znQvX4*r?LJYc#i$b!JHtx25}jDEzcatTe!IUOicl#-Vc#&0-l`E_dDIN9f4L;b?AszAR>}*kEgsv|fgV z1u3*-hxhXNGL4DMpuObIh0eA1in9?(4{|K0;A~hD*jl;6amK#6I2%i!tc4()9bn)0 zTD#(f)mrMr*?~!=-K*F*8=jN{E9dmeFD^enpq7lAtkdi2I1a?O2sYm^I2QYGc5o8h zVc;>9cX+9)qpTg%+M zfOzYs76Q5W=$!}2>ytL@v|9hnS-#3|Zt&*hmrz}>ve(M2*Bo0! zs12}IQk{2T(JwbIb2h+S;!mrM%omKDrT%iDgDd9C`MId9h068X5ADK z-M8OlIdePT9dVX;UV-GAVXgfMu!J z;Q{7Xu_FR3Tg4UxSdNO71z4_%Eex=Lid66 zuE@dD&keBi*!dh^0R@hFvQualg*`E;ycY)8Rx59%+>=BoE)K9u=(e9wK&#_^b{U$M z)>zg1<+97!m09cx+@~d!B_@pl_6v3u6cZoC<7}LMEWN}psav-J>lWuubbQ@Q-^yaY zL}l^fv$tN^)tCC&HF&toMEluwsH>*a(RupW4KVfkzSV2`*-bD3j_%UWZh;lh*WOs>vb`Rui-=;O@es&+)zj@Em3HsR%^a~o` z(fj$?19oj4-JYL4glc&8cYgK=jECyz{OmE!9?s8pa%-N_&z`hv>F(3~>?xZq zR%hmCPuq8`Ud+#)Mb+Kim!JJNo}>FMKYIZL>FW0Au>9;L7;k59mBn68&yypak*e)y zzvWErT=BD4!3Wh*`PplTt6s{_-T>u2yC^^V1E|#flb^kXgzlXD>`#|dY~-!S1uQbrPDgl zTIDV^Kl>XRhpY4PvoFCzQ_rZ|@w2aBC+rT#&%Qsu zFM#l{dcTJWQ%`W2FnueBXY#@T@6QK7*u*iTuC+&D5Bp~o&gO%N3xkQt4*O_6Z-t)^ z#YlEk4$tPp1AGJ@3C+Qz6^Ip>L#2z&5vErI0Kc568u+g;`evS^(W17y-OVDwu zvleMkDnC5o=hLj4*0&J+{1D*OCt}Lu`Tcw*T7)jETP!~m^>Cn*CkFZX98_D~g(T%U z*nSSDF8QQoKc8nk1uYy~v;2HMTCXZBPo(hkQY(u#IJ_J_tI9(5fmdJ{rIMcKNBa39 z3xhIKIqWy2;!7YmDIMCUS7Pte^YdynN_+7M2r?USU3&|)kGcS_rxuor7KU50krC25 zRMN~^f$fGsY{&wQ0lu6H^g{s)pxb7S+BO3_Yp{dhJ@_zGFJf5X!7>rUx0&@7zNbvX z^ORTko$?B=Q(ob7$}2ohd4<0zukbeI6~3mt!qb#j_?hwwFH>IOW6CQ$OnHTWDX;J@ zhJW6?mKPj*9Cgl~rq`bnDlvntX@(M3fUg1N^D?CVf zh5sn8@E+wAzN5UtbCg&3jq(bwQC{IQ$}2oZd4<0yukaRe^@FqU?GetvMf^T?CPNm>93eKS5 z%)3xE&Tz^syBkh5O{!*KK#+~0Kt2Wm{o(!(f#Xkt8V$F9JRJVXP`znL&4PPB7mob` zxbzip=9d6k2M4|puKOye<OznW1j-}UZGhFlIQTk*s_;j%NEU@@IHj`Zh zY(Hm*va8r^b}gI3ZeoYA+kyQab~w8qr}aF-j$lu)`Rr*t?Ri$pUS?(N_n?)tv)MUH zP{1TWJ66IMP1?bJRy27ByP#;w4t9}UL#i9Y`|v)XGl$hPR>K}Mmsql$(!wDDU!F^$#Nubx04k} z-f1TnA$hl*tU~f$JGm6e?RK&T$@}eO9g+{)$z@1BY$qF#eAG@ZNAhtyxf01I?BpsW ze`P1vAo*)M`6DEsv6D?mK4&LGNIq{Tn{8RFgI+P{Nnf@ay0r#6auj6!BeoQJvl?&x z!)z_i={gHhd_x;4Y9@w89% z(>^C7GO6$jJ9#RSf47sTA^AUc@(d(*+ewG9Q9Z)XK~O|~h@-#r9ms2j-;C=pK>b$Nh|=ds)+VE*|HZH8=3xNS(Z$`yXfDBlY1!JbP79f1bOY z=iSfy?cf9Z^C8>$Fl1V(iXgF_AAqcnJj6$@+QAP-^ln{hY;q}$dOIJl5%uRq$Yo*K zjE7Ce4Pa@4?r!(ea4RR?!iN9;TxG5ItN) zGZ8&PM%h0QU7(_0AX=uP?<2ZUMRy@usiH4|xMQ~S#gb`kCsI)>bq`V}SgGrfid(5m zkm|BhXCn1unX0O}0X^@%Y`q2RK(ff^Yn-_97b5OMEs4_-onkcr$w) zjp+>@!BG8r_D6mbdl!xBJ$^3+-;c2m`4j9@G_KG13m7B6%Kpw@XS>nJzUJ?-f1siL zFaI1vt=$-re#`p^&ND>@&k+HhEBf-jVlXcd!}tI(nhz9X`A{*14--@Q0b({kP|W3H zL^(fLRPqU;mQNJR_!MyzFBVOFy4b)E5gq(c(amRzAd;>-T z5nmyX`Udj2ZzMks7N+L^O_elf{}NMG`|mSVg!(_lR4sFvDxK1%N~g4`(kX4KbV{2l zq#UM7!?dZ=DQ&8BN}DR3(xytMw5if5ZK`xin<|~!qp9LQL8p5U8D{Z*4ukRw%%xq$zTwxva9oS|s~dS9zX{Vww_)byc1()g&Byb5 zcoE-$X^8vzZ2mA`%OBy*d?(+?pWqSxYkoa{8YTXl-^HKj_wwKH$N0;Dyvm>BzvnOT zU5NdGzs~=}-^Rc9_@DVF{C$|Jk6@}khN=1-rs}USRbRqX{SQplH!xM-!c=_^Q}u%w zD}X&x`ruC1Bkp7K*pTV)3D<5}$|~ zu^UhLRs?++qQRFXR{9FXk-mZADBnoY0#gUf`dI7h#}Y;k(6eVU%7IT)Zwa#G5ce zZ;8I*9T=W>#W3-K7%lz+gYyYY)u%8rU%*uT4W{ZV7?s^HRo}so`~#-ypD-RwG{K;3 z@bwWLzHHI$%Mr)<^2O=CzT!+@f3ej!KwRP*BDVR4itAu#?(`iX?(vNlkNU=loxbtn zdEW%_l5euu<(nej@=X&T`lgFde6z%E-=X4L-&|jY?{Ht1Z-KASSLz$+tMHBV)xcD( gfafY0SUbRLX%W7{ooef*wG3+s-j+7&#Zs~V1BE`|D*ylh literal 36380 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 - + + @@ -7,6 +8,15 @@ + + + + + + + + + @@ -23,10 +33,13 @@ + + + <band height="75" splitType="Stretch"> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="1371" height="41" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="0" y="0" width="1445" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="da52f710-3882-4beb-ba6f-870e03f6800d"/> <textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -34,7 +47,7 @@ <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> </textField> <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> - <reportElement uuid="2f4f1314-9363-4e6d-822f-c85c1890998b" mode="Transparent" x="1639" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="1713" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="2f4f1314-9363-4e6d-822f-c85c1890998b"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -42,7 +55,7 @@ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7" mode="Transparent" x="1371" y="42" width="289" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="1445" y="42" width="289" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -50,7 +63,7 @@ <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442" mode="Transparent" x="1556" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="1630" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -58,7 +71,7 @@ <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="8601bf20-f5f8-4fed-9445-7adfe580d236" mode="Transparent" x="1371" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="1445" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="8601bf20-f5f8-4fed-9445-7adfe580d236"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -66,73 +79,73 @@ <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91" x="1371" y="0" width="185" height="25"/> + <reportElement x="1445" y="0" width="185" height="25" uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91"/> <textElement textAlignment="Right"> <font size="9" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> </textField> <line> - <reportElement uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42" x="-1" y="58" width="1661" height="1"/> + <reportElement x="-1" y="58" width="1661" height="1" uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42"/> </line> <textField isStretchWithOverflow="true"> - <reportElement uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974" x="-1" y="59" width="1661" height="15"/> + <reportElement x="-1" y="59" width="1735" height="15" uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974"/> <textElement verticalAlignment="Middle"> <font size="10" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> </textField> <line> - <reportElement uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6" positionType="Float" x="-1" y="74" width="1661" height="1"/> + <reportElement positionType="Float" x="-1" y="74" width="1661" height="1" uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6"/> </line> </band> - + - + - + - + - + - + - + @@ -140,28 +153,28 @@ - + - + - + - + @@ -169,60 +182,67 @@ - + + + + + + + + - + - + - + - + - + - + - + @@ -231,28 +251,28 @@ - + - + - + - + @@ -260,18 +280,25 @@ - + + + + + + + + - +