From dd3b971d49b04d3ba3945141d28d859a11311d17 Mon Sep 17 00:00:00 2001 From: "lucas.calixto" Date: Wed, 15 Mar 2017 17:34:40 +0000 Subject: [PATCH] fixes bug#8752 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@66883 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasComissao.java | 67 ++++++++----- ...ioVendasComissaoCancelamento_es.properties | 4 +- ...endasComissaoCancelamento_pt_BR.properties | 4 +- .../RelatorioVendasComissao_es.properties | 3 +- .../RelatorioVendasComissao_pt_BR.properties | 3 +- .../templates/RelatorioVendasComissao.jasper | Bin 37332 -> 37577 bytes .../templates/RelatorioVendasComissao.jrxml | 15 +-- ...RelatorioVendasComissaoCancelamento.jasper | Bin 31195 -> 32270 bytes .../RelatorioVendasComissaoCancelamento.jrxml | 90 +++++++++++------- ...latorioVendasComissaoCancelamentoBean.java | 10 ++ .../RelatorioVendasComissaoController.java | 10 ++ 11 files changed, 141 insertions(+), 65 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java index 45b3b2d68..db8b85ebd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -13,6 +13,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.Constantes; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasComissaoBean; @@ -32,6 +33,7 @@ public class RelatorioVendasComissao extends Relatorio { private Timestamp fecFinal; private Integer empresaId; private Boolean apenasCancelados; + private PuntoVenta puntoVenta; public RelatorioVendasComissao(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); @@ -48,6 +50,13 @@ public class RelatorioVendasComissao extends Relatorio { } apenasCancelados = (Boolean) parametros.get("apenasCancelados"); + Object puntoVentaParam = parametros.get("puntoVenta"); + if (puntoVentaParam != null) { + puntoVenta = (PuntoVenta) puntoVentaParam; + parametros.put("nombPuntoVenta", puntoVenta.getNombpuntoventa()); + } else { + parametros.put("nombPuntoVenta", "Todas;"); + } Connection conexao = this.relatorio.getConexao(); processarVendasComissao(conexao); @@ -118,18 +127,21 @@ public class RelatorioVendasComissao extends Relatorio { if(indice > -1) { relatorioVendaComissao = lsDadosRelatorio.get(indice); } + + BigDecimal total = rset.getBigDecimal("TOTAL"); + BigDecimal totalTaxas = rset.getBigDecimal("TOTAL_TAXAS"); if(isVenda(indstatusboleto, indreimpresion) || isTroca(indstatusboleto, indreimpresion)) { - relatorioVendaComissao.setTotalVendas(relatorioVendaComissao.getTotalVendas().add(rset.getBigDecimal("TOTAL") != null ? rset.getBigDecimal("TOTAL") : new BigDecimal(0))); - relatorioVendaComissao.setTotalTaxasVendas(relatorioVendaComissao.getTotalTaxasVendas().add(rset.getBigDecimal("TOTAL_TAXAS") != null ? rset.getBigDecimal("TOTAL_TAXAS") : new BigDecimal(0))); + relatorioVendaComissao.setTotalVendas(relatorioVendaComissao.getTotalVendas().add(total)); + relatorioVendaComissao.setTotalTaxasVendas(relatorioVendaComissao.getTotalTaxasVendas().add(totalTaxas)); } else if(isCancelamentoCaja(indstatusboleto, motivocancelacionId, indreimpresion)) { - relatorioVendaComissao.setTotalVendasCanceladas(relatorioVendaComissao.getTotalVendasCanceladas().add(rset.getBigDecimal("TOTAL") != null ? rset.getBigDecimal("TOTAL") : new BigDecimal(0))); - relatorioVendaComissao.setTotalTaxasVendasCanceladas(relatorioVendaComissao.getTotalTaxasVendasCanceladas().add(rset.getBigDecimal("TOTAL_TAXAS") != null ? rset.getBigDecimal("TOTAL_TAXAS") : new BigDecimal(0))); + relatorioVendaComissao.setTotalVendasCanceladas(relatorioVendaComissao.getTotalVendasCanceladas().add(total)); + relatorioVendaComissao.setTotalTaxasVendasCanceladas(relatorioVendaComissao.getTotalTaxasVendasCanceladas().add(totalTaxas)); } else if(isDevolucaoCaja(indstatusboleto, motivocancelacionId, indreimpresion) || isDevolucaoOcdCaja(indstatusboleto, motivocancelacionId, indreimpresion) || isDevolucaoTrocaCaja(indstatusboleto, motivocancelacionId, indreimpresion)) { - relatorioVendaComissao.setTotalVendasDevolucao(relatorioVendaComissao.getTotalVendasDevolucao().add(rset.getBigDecimal("TOTAL") != null ? rset.getBigDecimal("TOTAL") : new BigDecimal(0))); - relatorioVendaComissao.setTotalTaxasVendasDevolucao(relatorioVendaComissao.getTotalTaxasVendasDevolucao().add(rset.getBigDecimal("TOTAL_TAXAS") != null ? rset.getBigDecimal("TOTAL_TAXAS") : new BigDecimal(0))); + relatorioVendaComissao.setTotalVendasDevolucao(relatorioVendaComissao.getTotalVendasDevolucao().add(total)); + relatorioVendaComissao.setTotalTaxasVendasDevolucao(relatorioVendaComissao.getTotalTaxasVendasDevolucao().add(totalTaxas)); } if(indice == -1) { @@ -151,6 +163,7 @@ public class RelatorioVendasComissao extends Relatorio { relatorioVendaComissao.setNumAsiento(rset.getString("NUMASIENTO")); relatorioVendaComissao.setPrecioTotalPagado(rset.getBigDecimal("TOTAL")); relatorioVendaComissao.setFecHorVenta(rset.getDate("FECHORVENTA")); + relatorioVendaComissao.setNombPuntoVenta(rset.getString("NOMBPUNTOVENTA")); lsDadosRelatorioCancelamento.add(relatorioVendaComissao); } @@ -206,6 +219,9 @@ public class RelatorioVendasComissao extends Relatorio { if(empresaId != null){ stmt.setInt("EMPRESA_ID", empresaId); } + if (puntoVenta != null) { + stmt.setInt("puntoVentaId", puntoVenta.getPuntoventaId()); + } return stmt; } @@ -219,23 +235,21 @@ public class RelatorioVendasComissao extends Relatorio { .append("FROM CAJA C ") .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") .append("JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID ") - .append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID "); - - if (apenasCancelados) { - sQuery.append(" WHERE (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C') "); - - } else { - sQuery.append("WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0)" - + " OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) " - + "OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) "); + .append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PTOVTAVENTA_ID ") + .append("WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0) ") + .append("OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) ") + .append("OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) "); + + if (puntoVenta != null) { + sQuery.append("AND C.PUNTOVENTA_ID = :puntoVentaId "); } - + sQuery.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "); - if(parametros.get("EMPRESA_ID")!= null){ - sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID "); - } - sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION ") - .append("ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO"); + if(parametros.get("EMPRESA_ID")!= null){ + sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID "); + } + sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION ") + .append("ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO"); return sQuery.toString(); } @@ -244,17 +258,24 @@ public class RelatorioVendasComissao extends Relatorio { StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT C.NUMFOLIOSISTEMA, C.CORRIDA_ID, C.FECHORVIAJE, C.NUMASIENTO, C.PRECIOPAGADO, C.FECHORVENTA, ") + sQuery.append("SELECT C.NUMFOLIOSISTEMA, C.CORRIDA_ID, C.FECHORVIAJE, C.NUMASIENTO, C.PRECIOPAGADO, C.FECHORVENTA, PV.NOMBPUNTOVENTA, ") .append("(COALESCE (C.PRECIOPAGADO,0) + COALESCE (C.IMPORTETAXAEMBARQUE,0) + COALESCE (C.IMPORTESEGURO,0) + COALESCE (C.IMPORTEPEDAGIO,0) + COALESCE (C.IMPORTEOUTROS,0)) AS TOTAL ") .append("FROM CAJA C ") .append("JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID ") - .append("WHERE C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C' "); + .append("JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ") + .append("WHERE C.INDSTATUSBOLETO = 'C' ") + .append("AND ((C.MOTIVOCANCELACION_ID IN(32, 10) AND C.INDREIMPRESION = 0) ") + .append("OR (C.MOTIVOCANCELACION_ID = 99 AND C.INDREIMPRESION = 1)) "); sQuery.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "); if(parametros.get("EMPRESA_ID")!= null) { sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID "); } + if (puntoVenta != null) { + sQuery.append("AND C.PUNTOVENTA_ID = :puntoVentaId "); + } + return sQuery.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_es.properties index ba65ae0a3..d1c2d9044 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_es.properties @@ -18,4 +18,6 @@ label.corridaId=N label.fecHorViaje=Data Servicio label.numAsiento=Número de Asiento label.precioTotalPagado=Valor de Entradas -label.fecHorVenta=Fecha de Regreso \ No newline at end of file +label.fecHorVenta=Fecha de Regreso +label.puntoVenta=Agência +label.nombPuntoVenta=Nome Agência \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_pt_BR.properties index acc9e4a3f..a9568cf16 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissaoCancelamento_pt_BR.properties @@ -18,4 +18,6 @@ label.corridaId=N label.fecHorViaje=Data do Serviço label.numAsiento=Poltrona label.precioTotalPagado=Valor do Bilhete -label.fecHorVenta=Data da Devolução \ No newline at end of file +label.fecHorVenta=Data da Devolução +label.puntoVenta=Agência +label.nombPuntoVenta=Nome Agência \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_es.properties index 5a8ce2039..9bd241b06 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_es.properties @@ -20,4 +20,5 @@ label.totalVendasCanceladas=Anula label.totalTaxasVendasCanceladas=Taxas Anulação label.totalVendasDevolucao=Devolução label.totalTaxasVendasDevolucao=Taxas Devolução -label.total=Total \ No newline at end of file +label.total=Total +label.puntoVenta=Agência: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_pt_BR.properties index 5a8ce2039..9bd241b06 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasComissao_pt_BR.properties @@ -20,4 +20,5 @@ label.totalVendasCanceladas=Anula label.totalTaxasVendasCanceladas=Taxas Anulação label.totalVendasDevolucao=Devolução label.totalTaxasVendasDevolucao=Taxas Devolução -label.total=Total \ No newline at end of file +label.total=Total +label.puntoVenta=Agência: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jasper index 67106bc11ae8fda35ffdbf1d55009697da5f8944..f65fa1b1e8f62afc3f9d9cb75b7cb915147eefc6 100644 GIT binary patch delta 7869 zcmd^D4OCRuwLW_vgpt8t2INlx9fK0&SBP2>aYTX)1Hy=+6LEwI0r?YV5N!=~xonb} z7}Jv`&9cTeX*9k*o1~+d)cj}?(^_l7d-<{E*`y@V7;7~eQ?17M_PzHo-04i#%358k zYrQ@f=di!M_dWZ&=ic+(jqf~(N1noG7sf-Bw={kMit7_h-lxV_gJ?=Jc}FEK2k}9& z$$NLwN)SsXnY@>hT_D~vo4l(h)r0uS6qEO3^FA)FrjGIMo>GqDu{4u6;?@U1gr%Fr zoYGO=7t=~XtjREW#58aICq-QGTpUIguqr0<%rHQPt6mQXdYe>|2#@5mRres`hZ&!X@5j$_MnE17u zg;W$47b%{t?VZXmU-I1w`a;B%6jAbu5?kEOU|HnDaPdY-J|%@Lw8n*fb5henCF$vf zV_LvxqKxo7>q;w_oq%;6fTs4lyJ^^u|9%*R_c zXPBBRMsy_%<;93h+jdwc-n7*iS18QY$syJ(kF3|Q`XJas#$K}%A*FzpvqB40eN$j@ zkN{n;JXW@3a3zP>UH&~t6Sq`cg*9SpN}QOvsMzRHil|ekN<_m!i0A`;MDzhaA~Fy_ zq*FYXJPl0V%t|Z3gW_gdoOraV*eDbx>hzGxM8iRt=mUOC^Z`F6G7!MzAu+JHP*hoC zL_u|~IBy>%>BKB9HvU|pqfR?iIvNf_M<4K`qYwDek%0g@JH(-!Y2x7}CNZ(vDXBbO zU2J?tp`uQER4N({LPa0&qoNP^QIUZFDtlBarW%uYddYH0Wx~>8<4Xz^bvmF@(Qptd z`hXu5eZY^33{+%%Qb}B1Y&@Y*QK#c76%7ZWq7V2{(Fgpf$Up#<;|di>710hC5qZ-VCmwN3 zfm7lYM=s&5De+?T9rKK56=LdiMkS`ToO(6TFZTB-%Y#i5mvp<1FCa7AWork1WRFVksD{0nn~TG;CBkcCe; zE#?@dusTHtDXc}+!qQX3RS=i+&Fc&C=)hRznVJ)f_mZnlzGlLYCfq=sK;+8veOu0<^m#=(7 z*=U+jeg8(^Z~Uyla`ywhaZ`_H4I~$ZiDPvc<`RXNIu!>YrbSg^(o~3PW)NaB5J0S0 z*^z{?%14o{BzDlLSgVG)+305HDpzxQySN%Z%~Vezg?#|?=Qd1OUDDWbTh+U>p8Dev z%Nr{5YK6Hv*@H0GqAGJ~D$F%A2y+<-U~X5RWkzMVQF2B%8!5a~%-(Yi9N;7I`CTzI z4{w}mH2wbT-@Huh)1g}AH%=HcGb=YQCnqy+W@c?(UQX6++1}>H+2B3g^aRAlv^zVT zEiSjKqt?IC^}3p~LnAATD#|PEwN;kNk_x-E$ZlZIiGv++MP6WIWXw`-vlUtFCFM2) z+XrmqklS9glrGp0Y;YNiwXmwH)>>XTzo^o{UJ!|$<3bJqixb~l9XG?kUIJz+sj4k0 zwv|^F)ly?zVk^|veFa$Pf)cA;x$F?I;di>~N?IH18rux)HF1Au+#QF3jh2PW3YXSe z$`{+H^lyi}_M);1YoWcU%D|2Q3v;!!cepy826hyffmU14*y?OHuw%sEe;W+!Ef5t2 zF(SblFOr_Wl1JZo8`uTfbIoISb~`(@e%!z=0*lrqiamBCH?S{6zbA=~{Y6h4wcQb2 ziST!k)>WL!zNS^0oL$b0W@l?dMoFvN)!^y~1N!qMWJ<}@>Ijwt7!CkjZ0|DX4TI2d z_8w5&q+ZnGbl;URud!jitFE!d*&GJLX~*j5l7BD6Vv6C60iR;S6CE zC8(Er+>Ol{^PO&27>o&rv7&hG_;eGI8M?aN)zR2i-)4YldTv7;tK1!ptqoxiBYw0t z*ANHs;SdW6;;pp_BPN7H6eJS)Bm*Rit7~VCm;`3UH#waBf9`7YN%8^r=iOG%=+Ze$o?1D6UYv-_vmLI^Q7K7_9O9e@6w)6r2q6m zc6uLMNB%Q@p6`<9teyG&PSLnXgK}Xw zjVKz)G%{%9({&aaqONud!Qy{KZKO+Lhk|a*}HW1HpS*z z&VxGtMxB4H&c9mcuT9;{*7kwnAcRweMTA;>$U>;CuV*lrOK^=Zm_n%0hhhn>_90_x zBt-PVXj+jSfU!0EA+l^2e0cz(YA7;}BG1G4{g4z16Z_y6y0oSbQVv2a0qKf_sg$MS z9+^|;%jtt@wA?Pb&Z+qbJw^*>s3ly54n)x}IMVfhv%wo-apGf<*ll_6v z;8W?@#a<@ZsqSuU*)H}hA>UrJCkXkT3VWDP+u(CxKOp3LoUEIW$G1uop?lN~pa;(! zgzobp8==jEsE5rZ_`o1!*@QOvkeSd%ABv_MD$#C8c?U`rGwoSA0l>D<)WIBNZ>Q6< zgT2n4q;v8M*3X`%v$C6=WP9km{ED4nzos+eWtZ80IycV)>tQd_;du!n=))bwUWFL; z1|6c`f|)+O8SD>`&HCvu{TIw-@6v&K4{YpxI#mAy4)!4(tUp5&`-BeHDd=XO(E&RP z8`*g}WEWry`+^SIWjM*M(qa2MoMkuQ5`Epi1VjcLIfS7N4A`>>BCrNVpaaHWJ&eT$ zh{iS;haC`)>mdO*KoV|(WV{z9<5su@1*GCOxD_9V4BQEsxErS9UdYA$FcV*eS$G)c zU_TV#+hD;DU_K7O?RXAK@B)A#0;{Jf$u>KoLR=J;KNi--~5=zOE zNJ^GOQnDoazav={-$Jrv&c8&mv<)1TEENq&7D1h4$y6y>5=qIDNJ^GOQnCmst4PVB zo6|{_L{hReO+6TUWZ4h!GDzWW*a*JKV>K3XQV4XXJ_Ck zYNB_Nmiz~4$S+B<;2G*`pM?n6OWoc+h=CU%8GZw1co{O_708CyARk_*2JUxI3P->O z$Djt@1PA;#G{D=?1joSxe}ry03BB+q*a!o#89st7a2ig)r{w($&FA1Od=8i3B1zVl zBw2qW$+||8bzPCHn^=Pk9T|j>l~{ z0UyVSxDzMgZcM?wI0g4(8or9t@Gxd!KW5|Gn1>(WZ8(76!E-npFW_9fhJ|q)W}{ToWw|JN?d{w*X+=KM<}OM4E3lBJ>{$s(weESdUGc3E_DI?0kqN|uIv zk|l#uvLup{CDFH$EZoQtH?i08K6VU$$og>$JAn_flPK6Je3+fVpRkMg7`u$y*$wJc zSPwn{!|_RKb#_4%J`FMWpVZRq0W&^FZOpGB8~Y%iT9~1+l3JZl@k2O^AHya5gaqph>CTX_TuJ{q_2G59!-!kr{K zyLlY$3EK3;02z8*Z6e2!Dny-pUI6ppGWgK zt9UG*$IaZrQ+P4Y=C|`)Zsl`%8F?0Q8?U6fnmhOsUdxyBCbC-iO77uK-pyUSm$#5) ZEvDv{blA4GkvE!lK{{^Qnc?_s1GN7U;;HU@)2%=&HMIHky!1ad!tu_XpYvqzKF4dI31&R-8Hoy#PX?n*BQehF5WTdUHjrpC?1Imbp<7C1Mzjd z-t}B!HHb$O^{$CY6(9nW^y0KRO1!f?&2=Jq5{R|Qdhxnxve=!P=Bk)YfzMO)BFi+v zwL7&KL`SM#^e@$m|Us9 zZ*N!r|AyF?GCvNQrfKcCbV-J8*`pEZ5{0evz^Dmly-4)PAXr zFenZdl*Hb2GQW~+W1f=Ora`!i?^S|di0OrSFeq9IErwgZswjp*3OBZrG3F=w3zEeC zBL7i??dou9)Ssg9qM#@uGT@&MA-an)38%NH*g&KLa*9pmW{Y<$G!!k|Hju%;$$Dm4lXsI%+REVqH3T@>| z7<<)911cM?C02^<`>3uDPA&@Q&G ziWJ6WMuStqP`eHv;96D%m!<-)nLfZ}!VA1Z9Eh0(VXmxF6TriS9VQ-62oz7384WuW ze6`cwLN;vjT2{rErh>1TKJaD23xAt9nl=jz;>T8p2mJJMqv3G{UhQ`In7)=(;iaj- zYo-r)nec+&rNE1wR=r56uz3*JS79{#Tp^%#`+N}4vMK>-Dg-ps2LYMzBCt;-FsVW> zdY7;8AdpyTG`y$~P`krE2xwWAfHV~Xn(2dpOn4DEtP*%)xn9hzTJ1sLK$X$(rb0mN z-ta*{%c=yVsSwai9|UB=i@+Nyf!Hd&I8wdbgTSm6M#CwEfZCn(K|sr@1f;1D&`ci$ zWWtNUNtM8!YQ30OQ%VFrv_y)hYU1Fmc)KQDB@`*5R^}K!Q^=^@IUi)StV%|j3K`Ax zK}IIL$edHoqnKI~Dxy~{f&j64RSJAX$8xXXx&p6ugFfK3tO_qpf}gLMKHz1doqlTC z9Bp>3!mUVyDv8Ur)hcwPs9$Z&3?g{0c7fjTS|UhG6nTiAOo-6NumEiY0k*ISnn{x% z4$K2p;A&fk1U_fW$sDHut6jJcU@hwdSWBqD(o}$DxfgJ_3jF?>_XzkvT~(&?v(42m z$p@&G^#Q6SR8VOupt9TxG)V=0p?y?_^r zISpz0hv;sg{K;%5Og4r(RNl16(OZ8%D}SIbd;I73O^I1DvRDk-=42Kqywon=2QMw_ zgO`?2c}bIarO0wGUilQEKTZ}>U~gGxcQ)18W-W2F)Qj0ur<=!iDKu9TVN`!V*PxSm z-N>{IIN9XrMbWX@>U}M`PP?$R+S{Ct&e-S$(Xp}OXk3IVrinx3z@o)8Bx57j>!=^2 znBB@KFd(v;XD+b5dF$}Y6ib5Dz!FR8-sg05G&w5lZS`~$bhI{gcG?`Zv**m8lb(^5 zk(QP=Z*FaBdRj`xeAiE!7lIc-*YUfa2iJeMrUb-)^ERnt2Y`(!%_}J`wbqv9lopm) zO?g%wbAhmBj_c8}L%>31I;YrT$;+`87F%?z4_L_Uur;reo_PUS*ig)rT~=0WD$dT$ zE7h?hz{bi%ZnibMwye0kG$&8TUIG>=^!ep+bB*6@!43&<}tS(V{m1s2p`uPbb8s%vuS*lWPT<*50^rRHqw?E!yt zd#>i}%G#XbatrZ3b~|d#GnbgMt$AfS_FG_q;r7<{4tu9f$KD2}BaHl}Hd~9B)OBTE zNSmW|O-UE+E^UjGDh7a!a5|i}7Hyk!>LW6Ufd18>QWB z-PzB8jT~A%jn`j*1*-!{o)@V?J|rWTDYDM$3Hmv0mlm>#X8q^LPqf7lrGM@j%}Rq0P2+w&WIDTVrxzo73KC?+640 z<`-8uvtlGm1HWM4;4coZH!KPST`)TdL9}J+L#;OFoykj@8guP+O|7<;Ko~) zKUSSpbTEvA7@B{y4yKCm4GTi1!E_}yBbYr!GZc&K^jrt=!nwiFlL)hvRMN1;THUvt=#bVON@e`I1w-#FYmL$&?6mmg?Od0Q|gM1M8 zL`RWPK%b>Cu{5l`gzbv9a93$fSo-#83VLhruElR7A+ce%B* zk+z-olBQr4$(tsRTCTk_mCAf7MfIk5U5yes4=Y{&z9}Xk>`yPSCy@2Cll0#q))k*H z_N?f?ud?S;89(38&L3hMDE{YRkxdl2Ff4KpMJ^4C^ibr=u*iKB`C?e)eu{iGEV6|n zgW1DETPgJQu*d@xxi&2F5JhfyM8v7@<%Hj4w-~a&lhFGy0AT54+!87Gk25Dw>?LZ) zsGXoTK#e|C*;V>>_oo(0Es7e|K?XG=HTvv>I%;dF-A!#PHF_4#h)3>k=;2ja-xJtKLJ-kzak2Dxk9 z$prG6++GxUce%aM@nI0s3u9?SzayZp>Vt6e9=Li0##K>f0%d*)Q~Dq_3=F*xM~|-P zg_->@ksKKcg9NHl{T^9kch~enG7a}EJy)m2$a{=Dqw3A>h4e>RP#DbH!vew}gOZyi z@*UpD8+u`3Kk!~y}DSL}NWoLTStzj>d+o`VbMDrfDpFH<^vnR-N?+p79 zd5)pIVE;y*drMh2d0p;Nn#tR$E&y#lt0C_Jw`U>mA;s%a-VC;w+#kA=spM^Odj|6E zcY6^up)zekBgiaQ%*6e40)RbCT{EjD`!PB_yGb3Mq;v8VdyD;)&dOePiakf?<>%}y z`vsjD7rVmx*wr5POLl|3NQdVo(6OU*fL@{BlGo`F{RX1xr#^wb1xf5U9j4#GLUw`< z)JZ5}AJC!tU#Mgs(ZTu{8rWGnT%XWA?=w1Je}*1*i4NIic#wTb2kk33#lD6!>?(Z9 zZX#p1kOQIxI4*-g?5P4B*1$-thf&xFq3D3I*Z~o^5ys&?FcG)FB>VwH<2Hyv0n>0N zOvhaikIz5??uBGL2r1YHbMO^N$JZbOkHZ3d7qaj)EW!cE!3&U!m!SZ!K_T7*GfB9G zkAPAh0cCswEVpt4RPq^6!&6};PX`-c3~P7}G;j+v@?~%ruYnd`3+=oa*78>9;$5(g zcf&@$8NNs2RPiq+RaL{JN_s<5C0!|1(vwmpJt>!R7p=tRrPSGl1V95(vwmpy>BB`@DN>T zf5`e_JAG{IAg%dN(wP5Zr(h?2HvE`$<#Bcqe!{N6(>{{s#1dsqwaf)n0@yWte{ zz=yCE{s<4k0Gxn7QRGuN1Lvs!3o^JsQgwx->T{B+zbaBSNK$o;r0P0J)!)&93_H*d zH=;k@gF(0jgYgF#g4=L33Jk-YsK;G69-qMpxEG`FAWp_UjKx=QD!zs@@HocdyO@Zl zaTX5XY`lP}cp2y7HJpbx@eZ!Tg?t1q<`J09Ctw~)73T99Sj1CtDNn~@z8Fh*4qCYd z%lR^_;x$;!YjG8C##-Krb-WAfc{kq4H)A_V)rx;HsrvtXt6KFfq)OI&CsL*D#gJ5e z2e&GkoQG6NPfFFQ;Zh}&QmUjUrAm6=MyhZFL)^srv4Nj!ol^9el7#tnQ9pTXzzRGz`pc_v@Xvv>|)!Y$M<<3?V?3wSLz@n&x3trY3v krM#P0@XdS`NmVUfVo86UEZpZ`<~dm^{nPCv;o1@L4{7M=@Bjb+ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml index de52a226d..1574eeb10 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissao.jrxml @@ -7,7 +7,7 @@ - + @@ -74,11 +74,14 @@ - - - - - + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissaoCancelamento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasComissaoCancelamento.jasper index e9a4d071daa6d63e564c779513b9ff7c433e75c3..a8a75c9befce8708af1542849587e63d0eef9bdc 100644 GIT binary patch literal 32270 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 K)T3QJQvVnCu#8Fo literal 31195 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 - - - + + + - + @@ -17,6 +17,7 @@ + @@ -26,47 +27,52 @@ <band height="81" splitType="Stretch"> <textField> - <reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> + <reportElement uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="620" height="20"/> <textElement markup="none"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="638" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> + <reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="638" y="0" width="164" height="20"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="20" width="620" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> + <reportElement uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b" x="0" y="20" width="620" height="20"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression> </textField> <textField> - <reportElement x="53" y="41" width="139" height="20" uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a"/> + <reportElement uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a" x="53" y="41" width="139" height="20"/> + <textElement/> <textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression> </textField> <staticText> - <reportElement x="0" y="41" width="53" height="20" uuid="a91f6081-4740-4e36-8965-41b6cde4cc20"/> + <reportElement uuid="a91f6081-4740-4e36-8965-41b6cde4cc20" x="0" y="41" width="53" height="20"/> + <textElement/> <text><![CDATA[Empresa:]]></text> </staticText> <textField> - <reportElement x="0" y="61" width="139" height="20" uuid="f1811f21-420c-4faf-87d2-2d46e1b74118"/> - <textElement> - <font isBold="true" pdfFontName="Helvetica-Bold"/> - </textElement> - <textFieldExpression><![CDATA[$P{apenasCancelados} ? "Apenas cancelamentos" : ""]]></textFieldExpression> + <reportElement uuid="96d6ce56-5bf3-460a-b3ba-a81890a2caed" x="0" y="61" width="53" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$R{label.puntoVenta}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="b75cac86-9c93-40ec-b667-afd66f26103d" x="53" y="61" width="139" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$P{nombPuntoVenta}]]></textFieldExpression> </textField> </band> - + @@ -77,62 +83,82 @@ - + + - + - + + - + + - + + - + - + + + + + + + - + - + + - + + - + + - + + - + + + + + + + @@ -144,15 +170,15 @@ - + - + - + @@ -163,7 +189,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasComissaoCancelamentoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasComissaoCancelamentoBean.java index da05b353c..e390d936b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasComissaoCancelamentoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasComissaoCancelamentoBean.java @@ -16,6 +16,8 @@ public class RelatorioVendasComissaoCancelamentoBean { private BigDecimal precioTotalPagado; private Date fecHorVenta; + + private String nombPuntoVenta; public String getNumFolioSistema() { return numFolioSistema; @@ -65,4 +67,12 @@ public class RelatorioVendasComissaoCancelamentoBean { this.fecHorVenta = fecHorVenta; } + public String getNombPuntoVenta() { + return nombPuntoVenta; + } + + public void setNombPuntoVenta(String nombPuntoVenta) { + this.nombPuntoVenta = nombPuntoVenta; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java index 791ecd9e8..956f49d4e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasComissaoController.java @@ -20,11 +20,13 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasComissao; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Controller("relatorioVendasComissaoController") @@ -45,6 +47,7 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer private Datebox dataInicial; private Datebox dataFinal; private Checkbox chkApenasCancelados; + private MyComboboxPuntoVenta cmbPuntoVenta; @Override public void doAfterCompose(Component comp) throws Exception { @@ -78,6 +81,13 @@ public class RelatorioVendasComissaoController extends MyGenericForwardComposer parametros.put("apenasCancelados", chkApenasCancelados.isChecked()); + Comboitem cmbItemPuntoVenta = cmbPuntoVenta.getSelectedItem(); + if (cmbItemPuntoVenta != null) { + PuntoVenta puntoVenta = (PuntoVenta) cmbItemPuntoVenta.getValue(); + parametros.put("puntoVenta", puntoVenta); + parametros.put("nombPuntoVenta", puntoVenta.getNombpuntoventa()); + } + Relatorio relatorio = new RelatorioVendasComissao(parametros, dataSourceRead.getConnection()); Map args = new HashMap();