From fe848bfed75b47060353b2ac5014da4e6c9b8786 Mon Sep 17 00:00:00 2001 From: walace Date: Fri, 10 Nov 2017 19:16:45 +0000 Subject: [PATCH] fixes bug #9451 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76309 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioVendasPTA.java | 9 ++++----- .../templates/RelatorioVendasPTA.jasper | Bin 44414 -> 44210 bytes .../templates/RelatorioVendasPTA.jrxml | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java index 807ed0b91..9376e1231 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java @@ -221,10 +221,10 @@ public class RelatorioVendasPTA extends Relatorio { sql.append("INNER JOIN PARADA po ON (ORIGINAL.ORIGEN_ID = po.PARADA_ID) "); sql.append("INNER JOIN PARADA pd ON (ORIGINAL.DESTINO_ID = pd.PARADA_ID) "); sql.append("WHERE to_date(original.FECHORVENTA,'dd/MM/yy') BETWEEN :DATA_INICIAL AND :DATA_FINAL "); - sql.append(" AND ORIGINAL.INDSTATUSBOLETO IN('C') "); + sql.append(" AND ORIGINAL.INDSTATUSBOLETO IN('C') AND ORIGINAL.MOTIVOCANCELACION_ID in ("+motivoCancelacion+") "); sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49,81) "); - sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (ORIGINAL.PUNTOVENTA_ID in (" + agencia + ") "); - sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " OR utilizado.PUNTOVENTA_ID in (" + agencia + ")) "); + sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (utilizado.PUNTOVENTA_ID in (" + agencia + ")) AND ORIGINAL.MOTIVOCANCELACION_ID IN ( "+motivoCancelacion+") "); + sql.append("AND ORIGINAL.EMPRESACORRIDA_ID =" + empresa.getEmpresaId() + " "); } else { // somente cancelados @@ -256,8 +256,7 @@ public class RelatorioVendasPTA extends Relatorio { sql.append("WHERE to_date(original.FECHORVENTA,'dd/MM/yy') BETWEEN :DATA_INICIAL AND :DATA_FINAL "); sql.append(" AND ORIGINAL.INDSTATUSBOLETO IN('C') "); sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49,81) "); - sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (ORIGINAL.PUNTOVENTA_ID in (" + agencia + ") "); - sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " OR utilizado.PUNTOVENTA_ID in (" + agencia + ")) AND ORIGINAL.MOTIVOCANCELACION_ID = "+motivoCancelacion+" "); + sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (utilizado.PUNTOVENTA_ID in (" + agencia + ")) AND ORIGINAL.MOTIVOCANCELACION_ID IN ("+motivoCancelacion+") "); } return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jasper index cf9e00101bff164c9e3b6cc8c4f1878b16aba928..aae3405fdcf4f2052ffca1332b91141f4c58b526 100644 GIT binary patch delta 3938 zcmeHJYfMx}6rOX=6%lKwps1+Dk~X$lZ~^5J3Pz>%NqwMFYZX`7%IXU0uA+#nRT0GJ zGKen}soJenYXwDHQ)?t4jY$*zX&a;dXhT9YB^Z;YsqMLU*7dGzVw%{rO}gX^-#6cx zneWcdnY)jFz@}UH@Fjj8gV zOmn9>!5{$Kckk<N zT25Iz)g8)fYDN>%eN82Vc3(3|$)3wIvqoGkva(l}vCa=&p=rR1jB64dTiy1h_H_0j_*PcUPkfSJfMISDwPb@{bL} z;cYp*bd1ksap@Z{Rvs(OgYm|hi{3cHJyCaUG+9AhD>aB~vk>6gECjgr3D3A5Sf*uh zSHOoIQF}9#?T56X*B^g-Wph|vMXT*aNr`i9h51%zQsRu+Se+m=`z1x4}sR+n{B(Q0cb zY?G@zuPodSqPK%pN4%@ZWp#wY4u6N!>c}q&g^E6DEEI83r*R<$ceH(EZ%QbJ#hGIm$UCM+3)Mj@umV99=vcaD-n5%RKEO zBxQRk&4lAj_*ET~%ISX@X8Q;9dMe=WPX}P9ssATa|1DGh_an}WO)Zde71FZ3_^q6A zs(4kj>D=aJqtahBFmh$S_C29ENigoWw9!!3>7; z6ij3|U%}xF7brM{VV;70l{Y!})WEUO$^AB?AAV-IRKXt^+7-OP*|S<;*;R04d*K?h zwSIP9o;fviSlLyuw7|zLP|gY4d1QqeS#}v5^DaWA?9({7M-^+ivi@k4%s6^5oS8Vz zQ|&djs7iJ;<|XYkMhV^iZUu*P#uQ^QJ%13h_x!9kr|oSnuI~wM4@|@wn2L2U4eMbB zdSNCu!W_H+bMX>RAUkkX-uGQml9aFGMnQ8BEi z64*%PP)3!onIvqXTBx7~sH79Hlg`2}Y61`4hHAPCwbQ5__EQHOrY@+XM{rC7XwWn` zsfEL*S_Cv|(agQ8a? zm@2}gyPqcfBPG(C%g|RNHFD;W0WYFR-20wWBwQX&-h%^bkC@q*aY^uw8Kq;|AK&)8 z%w3yRx>xjJQsp1}X18p&(9>&-42McDRfH?+H>^`&VCsT<#-KH{Ts#OVUCN5X? zHH&kcU1Bg(h3k*t=4JM=xXqth!K}>B)-&7cXUmyAb6Rx!zID{1J_kIne)m1^@`wy} zdz75iZx77D8qCEyd>`xaL-gVTY(y(wz{Pk8Kf+dAifyXqWXDb9z^zn_|2dN2<&}}?QckvUx zJ@7bnpqIMvGkS!lHNZ2PhUc_!Y|8o=MLRaq3cNstc!^eHD><=^&vhrQ!-rH#F|?6l>0^qc&19i% zlui|tNju0+JIO(NshB)eLi?zkYN?VAk)*?n>ZyT_(Fy)LODCy`PSI^@q`UORWNPQG z4r-<@I!}-2k_PmZrqMTAI9<^q=$aNy*SP`?@tYF`xJ3V;KXzRrQ6}^pA`8w${RzZ7 BhME8X delta 3983 zcmd^CeNa?Y6u;-3Yoa8XAVx7_4wH$-z~Ty2n}s@-LZWCyeyppInJWvjeuAv{{jr63 z6%|=4wIDxAg<1S4b;ubfCjZbG%kqzAYO-Of8JlKmni{9`-hHe~Z1qPq)%2Ki`JH=y z_uSvR`_6g0CqBkopWv~Z^M+HpJ*!+)(`c_4U`x%mWu#@=N88hkD?KyQh-7*NrH{6^ z3@l#M4|=P$&1^j@=r!ebND{O zUOH;-rD24=Pji<#Pr-! z2m0$kVc0!c0add!)}}LP&fK0H;}*N!tc+1Uw?omgLQBSyWs@9(4H@Q;7(s@PMv$Qc zri^e-HyKu-hm1s1hHrV7jBl5Zb&ND*m_teg89Ew4h7OoA!a3b!Sb-igQdF7eA@%u+ zDb{IBUOCp0ZOAZ(%m^}cG=dBrFlB^uy2-EtJ!E8>GM=dHl5w>1K^Uh#th8IQ9;kW{ zCaB3(PMByuJMUNJJ0=@4%^^2}OdX9NQwI#06T&&&WLkk9GIM#R+r<*}bKUa6s!GV- z-Er&mSs_F!1VD_KTH7&x@ zwv3k5zTCU}ck2dGuts%kOCGWg*7t={*Z^WcShH|>T~B%zyP{x|im4l%u@ywLn_G!H z)$8%P+)?mSXrjX9F7`x0Er`C0D(0t_ddBhED5z7;y21T+fW5Ey5q9>4B-p98)TKo2 z;Td)sTHdLP?{oK8LJAT>j)A=U4)Ono)#nXseXT;^IkpbAYiu`!pg6W1wtTkPY<{)| zwq~{<+Xc2OoPkeAMzh7UC9~PiKw6P(gN(c;ni+=k!|*r*ljdZdfoY)yBf|ni!WP7Z z%}3py$DeP{^e%>zHS{x_qG1ig z0u7fkoUY+QhJ_l=VOXT$bcQoDoXBvNhGQ5yH5_$YM=U%NgfZ%e#+We}$BYuq=)-Wn z3E>vQ1sZ!t?b#q;3KYl1J>TN?5{QsV;2kH*4^AgtmQYk37D%WoC?f>3=P(t=PE zgpIs-GjlfUtkq}0UDO6!R88PM@T)+e8%)A;kc;h*j~y@tFTr%Y2G8Jicn)vC4D19a z#lajJ1jUpCB{UuuP(Hj!1yD+}!9y;nAU}Ai7M4>3te^m_qGqV3!?1>eu$E52M!Eo- z=py*(3cN&Dp-u|eE(z*$Wi;%PF|b$0L!(T9S7kE1CWpc6(gtrxI~pVj@wMX>l zsWqD3B>J(lCA4;U54O*w?=Tr|O|Q}pm)%cH-xTt`VQ+g^D)DKLRA#1nP0*RRthH!y zoY^Z)FRc7I=J)Y7J2|)^MBT_ETbGOr}4Oi@^L8@ z;7Xc}mE=Mn`EfPX;yP-;^%TI()Qnr`FuqJdtff<^=mPGbi@2Mv;2ye)0V!~wB;3!f z1rNv=Y?ATVEEDjEOva;f7#^24JR$8Elny-0&1Cm~rM3JIUbBB|Guivc&18th`ORkX zH@t?AA2Mo%oY+S5@EjFmJH3D%v;Z&BBD_YWc%2sG4XVIST1IiSoCZ-9<J)IfCmoMAnm17^a@>|SLq@hq$~6~U8Ohq%j6+R z^wv`{n%k diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml index 5aa652c95..7dcddc0db 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -194,7 +194,7 @@ - +