From 3881892f4ea435dc77d121c09b7bc8f7a54833b0 Mon Sep 17 00:00:00 2001 From: emerson Date: Wed, 22 Aug 2018 21:11:08 +0000 Subject: [PATCH] fixes bug#0011731 dev: lucas qua: junia git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@84493 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioHistoricoCompras.java | 14 ++-- .../RelatorioHistoricoCompras.jasper | Bin 32254 -> 31643 bytes .../templates/RelatorioHistoricoCompras.jrxml | 75 ++++++++---------- 3 files changed, 41 insertions(+), 48 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoCompras.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoCompras.java index d6252f355..bc3b8dec6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoCompras.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoCompras.java @@ -89,11 +89,11 @@ public class RelatorioHistoricoCompras extends Relatorio { sql.append(" ca.corrida_id servico, "); sql.append(" o.descparada origem, "); sql.append(" d.descparada destino, "); - sql.append(" u.nombusuario operador, "); - sql.append(" ca.preciopagado valor, "); + sql.append(" u.cveusuario operador, "); + sql.append(" ca.preciopagado + ca.importeoutros + ca.importepedagio + ca.importeseguro + ca.importetaxaembarque valor, "); sql.append(" ca.fechorviaje viagem, "); sql.append(" ca.numasiento poltrona, "); - sql.append(" pv.nombpuntoventa agencia, "); + sql.append(" pv.numpuntoventa||'-'||pv.nombpuntoventa agencia, "); sql.append(" cli.numtelefonodos celular, "); sql.append(" cli.numtelefono telefone, "); sql.append(" cli.numfax comercial, "); @@ -106,13 +106,11 @@ public class RelatorioHistoricoCompras extends Relatorio { sql.append(" cpf "); sql.append(" FROM "); sql.append(" caja ca "); - sql.append(" INNER JOIN cliente cli ON ca.cliente_id = cli.cliente_id "); + sql.append(" INNER JOIN cliente cli ON ca.clientecomprador_id = cli.cliente_id "); sql.append(" INNER JOIN usuario u ON ca.usuario_id = u.usuario_id "); sql.append(" INNER JOIN punto_venta pv ON ca.puntoventa_id = pv.puntoventa_id "); - sql.append(" INNER JOIN corrida co ON ca.corrida_id = co.corrida_id "); - sql.append(" AND ca.feccorrida = co.feccorrida "); - sql.append(" LEFT JOIN parada o ON co.origen_id = o.parada_id "); - sql.append(" LEFT JOIN parada d ON co.destino_id = d.parada_id "); + sql.append(" LEFT JOIN parada o ON ca.origen_id = o.parada_id "); + sql.append(" LEFT JOIN parada d ON ca.destino_id = d.parada_id "); if (parametros.get("dtVendaInicial") != null && parametros.get("dtEmbarqueInicial") != null) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoCompras.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoCompras.jasper index 4f033ebe4717061e99b9f829344baa3eea2e2fa9..e087f1b5e6113ed18d2a30aae9864a8ca9abc625 100644 GIT binary patch delta 5378 zcmai&X>1$E6~}jVP>hz6by1>8nU*ZsvK(8MWJyr_fOj`B65w;7`3hC zA`0y%4K%Xj9=hUaM7CX4^tVH_Z)n%?)mu*rD*`b$vh(1_1>tr)i?5<^iwfZf2`3*U zOmPGpm`rnqPEood+&~o_Lnt~%nV#r4zWM=7P0Vc$6ID4(T0zI86?9BYFf-jop54Q= z{^-@+M^}FiM8w?T5K)ywq!n~TT0uv|1T)bc^jPNza`|YLe%k3<{S7b?v%z7aDu+oc z=$N#Ej)@6orVX^VX8?U;oHG4kk8kylz(mX@hl#2jCas`j(h52zCYYHv(VGvqh|c_n z56_p14m7gAx%(a-g)cxG0%rxh5k+W<`Gekg;8Fi{JTiUQ8y=rN<_{b_7Du!DkF5&- zflBteL%jII!Ts<+Kx&3C#5f5qZ4+GP0xoqqxJ)qN zI-!K<9Z!V@Su!Di=5g0ZG-|QV=)R{}EEKf6FC=vWAu%0hxTmYvo2b>8ea8Ci;udaqFBY3GI zR9ukfmDF4Y2Pj+sWXuMAI-u73{y<3b!6;(91e>-AHgf@+x*TjK;3@SB*jvEXtcYqO zHnI)69$arXUhGMJy=MkPQWU_62@`PICg98kaO!fvnP37BV{q-x+hT%V7;5M3JiP0~ zXZX0k912N~0WL9T2`+6DT;>8Ubvd|9FyWpx;MSOMH;1>HcU|R(x(bFzPD-;tM@)*) z(KexDF3?ezL&pRYT?*)u>cXux(&2?`&1TX{E;EuwtjNY4T+ zF>3^twh1hA0hYQPSSFZY*9@zo-Uy5AV=a~H(+-V}sa)Byfb*A)X-gNf@YZ!2$ejR-=?EBx>LSKfeh4RDEhgW%FO!DTMsQkR3v1QYHX23)%d z_xFc)XvVA>MkFN8n z^o*>?0M`fmJ=+>Aa6*NJv?H|)mYz6x*0zB{rF z`y<%e(do!`-RRdNF!~)b;!b3EkWMUA#r)AoEIu8K_`E?snM$OS)Tj`_Ofr#{3mo2P z8=gguw&Qr;j>3%JkGczqY`fe8sj!!Z;^kmFwXR_r;AQ<<@3d+@3UxDMFsRs0q zm<30JN;@X&arC{DFjIIE%9EaSVIQwr+d8>haN>ii481$K4{yOyT;ImdM~vXS2#vUGv#QQtmo0D@(FG*OkjG&7r$EntEq=F7AnzI?H^8%}8pqf0tWob#Kip^xwgR0`TNZ0evqQLzkIu+&rZZU2YoDI@N;yGF9Vw;s1xXm~J+PuP}{hooYqTovz!03uW;| zf+s>@G7tK}>2qQolFm3wgfCFXnRf9sfgV@M}x z-+y(2_EnP!sP(Kvylyy~9i~K<&%V}B{CUt;_~|7+gLa%-a(}v`lxU-*o{{6Y;R z@ew&(K0(*d{m`}n9UGvPY@kG+YqjLp;1lyPCr_$!^3)2tJhg%@PbSbKbdDZ10;-*U zRQwptO#kGh`pC2z(=Jhj>To3FpC?L8 z#ErVG<@sxmTSeDKP^i0*P!jX9;>*ltQ)zh|x8U{-^nPNeGd(&6B@}FAtJi?LOv;x= wrRU=fp27ZuJqHK+d%LFxdOdvy1}g*+UAw$1|MK|`mswSWUUH28^_z|V1Ku4r;s5{u delta 5711 zcmai&e@t7~702(x*qEB%HiQ5%zkjTSlwXE0Ac2@4LHHL9aT3yux#p!98QU@D$265_ zQqo46+J@X}n^Y~!AKPEivSps8v{Os7kwsgjX<5~(Qq(n2W&LMrmrm+5Rm*nIx$p7b z^LtS(<>cJ+z4xBax%a+n^IreA@aQYymw&a|idVA{7FH`r8mkO(?W$scH1g*WOt@2Uv^*Kw;O%aX_li8s&|JK*UC{kQ1?%If2?}r z9b2I%5)&B#`!s);MNG8VQdM)97GE zG9vdJjV&+suO*2K3fViJ3?=3x;nAqLD8^Ds1~X)+^pNZ`k!bWRStkw;$pv4U{3&_z zvN0CKIXxsN$|wUcPd&X=TG!g|A*O^F!{KXS+X?yoG)t021fI&&$NwieuzFoL|FPzL z#qoCg#yR)cOJ5ER5wiMOBC!NR{V+7aKG1kOffKDKNhhnKind$L*|0+NinZn&)@grW zcEo?&hvVLOY|45_*?q%Z@Yd1$UmOqqbisb9%JaqJQf~2-ko|XbqkK>904t-4(c`|; zMEzv&k07GC!CrqeNY7P+^lCwqo(q^>>Z42lfd00*S6YGc7I*L=AfWl&0D-Fp2x>ut zzy(B*`sfforysS{2+iq7ElVb+Lw>r*7$L$3@Py%0Qv_U(=#9n-y489(PcXAKH|##? zwOe?b-g4O|xyvEdEYcV*oKziFS;!<4O!VQQs`Ss=ZVS!u%;V#)0JgDE#0c=()8n=Z z;6qc6e7uc(+%@1+3mQI2(D9WszWU1iCCF9CNS;^*uY`F5#vJrl?X5=WEv(Bhbjw`Z z>JGQ91tvk$gy_7D=-f3xR|^_+NzkD;!O~vt%$ZQ=ZJG3@6v=rm5}g-QA{&n%hDMIy zJu2)$3}s(vptDNgC*-BhahnUOK+}a)@HSS#U4tsrf~E>dUkk=^uI(w&jQwPRv3&4nG9vOKX8M$k~s1`JglAvRp2gVWQJQQUzvh!eBiG-dP7x5r)17x}t zKGi4FU+$Z-eFyrWSw?!^MtbfV(5nRvy(H-9mw`U4&=(ufTNCkUDjAQ3zJ`DIIfdI2 zKDryz-0!x%2xXx;k7e;Tmc?Czvebg6EJ@Inbsow(q?A=+P?mW`jLoTQ;un_cG_?-M z`w<>++bDpe*+6jK25>WXhpX*fyaVMmXi#|{Si&VXk#a3=WSnt(CMrEMSff7Umj-33 zJA-c9RiHw11*v!&my^2&%c&MLjFO;ZypqA_&@uk$V6D-2C;WDP4UR(QcW3J%x9#VE zj^-Mo^ERS$*8p8DXwW4=hkh*sy;O((^iZ98c{iKn<-I)Qw!I0AXl^1SZzCgj4H(se zhEWo9j5ir0e81N#2evE|liecOvG}4$&kmNVakrag+628QEnW3r9kk;jkE8 zj)qhT`79|hDxQhQM5Vg}Kyt%uyOM00s3H`CfcvP#3Ls_*C(iItdVAvg0$Zzx{yO^V zq}@_02#G|B{`dJkbaT>Dxx=<2Me-LyE1~_%sYrCcmtA2nGOL!}pR8a5znbh8YH7R2 z$$Y=3n)z|hKIXs7Y%RUUB0Kb559@Q;3t^|XpM__<6^(rAB4uh%JRFLO((H&q%INjy z%IGh=7B=!X-Uc@E9?tR~uao)ZzB)6`LNDbz>1kg%i>>%-Sl=J|YMK9rubKJVzEevehT%7Y9ymDaQiUfvUz#ryW z7o{&97%UhJuAxmq$H=Sf&;*9ZM`2**Wa|(-&(6Kuf6O zo?~7gPsrXW4ao15XyQb#;G`Qf619SZf6Jbt?<}f{5|Qj+~-@K4}$hW!$*sx=KrDe&E>slFeHvOKf@?6#qM9{o%P&Zc%>Q)Pyy48ZF zZb{JAO|L&26yB%i)0?V47p=OoKR)fWZ_9t;LY4U1;b6MxTRlSMCmvEV7fOYe#FRU} zn21Eh5!Pa537^o=Y-7dhp&?inl7|m^5x8r(B&+o5?6jk+ud} - + + @@ -23,9 +24,9 @@ - + - + @@ -35,37 +36,37 @@ - + - + - + - + - + - + @@ -73,76 +74,70 @@ Serviço]]> - + - + - + - + - + - - - - - - - + - + - + - + - + @@ -153,105 +148,105 @@ Serviço]]> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +