From 46f05b0dbfca2050a99750aa218c173fb0b945f6 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Fri, 4 May 2018 19:22:56 +0000 Subject: [PATCH] 0010833: Cancelamento pede dados do Cliente - debito fixes bug#0010833 dev:fabio qua:wallysson git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@81613 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...latorioFormaPagamentoAgenciaRutaTramo.java | 107 +++++++ ...agamentoAgenciaRutaTramo_pt_BR..properties | 1 + ...torioFormaPagamentoAgenciaRutaTramo.jasper | Bin 0 -> 35731 bytes ...atorioFormaPagamentoAgenciaRutaTramo.jrxml | 284 ++++++++++++++++++ ...rioFormaPagamentoAgenciaRutaTramoBean.java | 129 ++++++++ .../FormaPagamentoAgenciaController.java | 100 +++++- web/WEB-INF/i3-label_pt_BR.label | 1 + .../formaPagamentoAgencia.zul | 46 +++ 8 files changed, 663 insertions(+), 5 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaRutaTramo.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaRutaTramo_pt_BR..properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaRutaTramo.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaRutaTramo.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioFormaPagamentoAgenciaRutaTramoBean.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaRutaTramo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaRutaTramo.java new file mode 100644 index 000000000..1645fde30 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaRutaTramo.java @@ -0,0 +1,107 @@ +/** + * + */ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioFormaPagamentoAgenciaRutaTramoBean; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + + +public class RelatorioFormaPagamentoAgenciaRutaTramo extends RelatorioDemandas { + + private List lsDadosRelatorio; + + public RelatorioFormaPagamentoAgenciaRutaTramo(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + this.setCustomDataSource(new ArrayDataSource(this) { + @Override + public void initDados() throws Exception { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + + String dataIncial = (String) parametros.get("DATA_INICIAL"); + + String dataFinal = (String) parametros.get("DATA_FINAL"); + + Integer empresa = (Integer) parametros.get("EMPRESA"); + + String rutaId = (String) parametros.get("RUTAS_IDS"); + + Integer agencia = (Integer) parametros.get("AGENCIA"); + + StringBuilder sql = new StringBuilder(); + + sql.append(" select rc.RUTACOMBINACION_ID as rc_RUTACOMBINACION_ID, rc.ruta_id as rc_ruta_id, r.descruta as r_descruta, rc.tramo_id as rc_tramo_id , "); + sql.append(" t.desctramo as t_desctramo, t.origen_id as t_origen_id, t.destino_id as t_destino_id , ");// b.caja_id as b_caja_id , "); + sql.append(" fp.DESCPAGO as fp_DESCPAGO, sum(cfp.importe) as cfp_importe, sum(b.IMPORTEPEDAGIO) as b_IMPORTEPEDAGIO, "); + sql.append(" sum(b.IMPORTESEGURO) as b_IMPORTESEGURO, sum(b.IMPORTETAXAEMBARQUE) as b_IMPORTETAXAEMBARQUE ,TO_DATE(TO_CHAR(b.fechorventa,'DD-MON-YYYY'),'DD-MON-YYYY' ) as b_fechorventa, pv.NOMBPUNTOVENTA as pv_NOMBPUNTOVENTA, count(b.caja_id) AS QTD "); + sql.append(" from ruta_combinacion RC "); + sql.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); + sql.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); + sql.append(" left join caja b on (b.ORIGEN_ID = t.ORIGEN_ID and b.DESTINO_ID = t.DESTINO_ID and b.RUTA_ID = rc.ruta_id "); + sql.append(" and b.fechorventa BETWEEN to_date('" + dataIncial + " 00:00:00','dd/MM/yyyy hh24:mi:ss') AND to_date('" + dataFinal + " 23:59:59','dd/MM/yyyy hh24:mi:ss') AND b.RUTA_ID in ("+rutaId+") ");//AND b.CORRIDA_ID = 86300 "); + //sql.append(" and b.feccorrida BETWEEN to_date('" + format.format(dataIncial) + " 00:00:00','dd/MM/yyyy hh24:mi:ss') AND to_date('" + format.format(dataFinal) + " 00:00:00','dd/MM/yyyy hh24:mi:ss') AND b.RUTA_ID = "+rutaId+" ");//AND b.CORRIDA_ID = 86300 "); + sql.append(" ) "); + sql.append(" left join caja_formapago cfp on cfp.CAJA_ID = b.CAJA_ID "); + sql.append(" left join forma_pago fp on fp.FORMAPAGO_ID = cfp.FORMAPAGO_ID "); + sql.append(" left join punto_venta pv on pv.PUNTOVENTA_ID = b.puntoventa_id "); + sql.append(" WHERE RC.RUTA_ID in ("+rutaId+") and rc.activo = 1 and t.activo =1 AND B.EMPRESACORRIDA_ID = "+empresa+" "); + if( agencia != null){ + sql.append("AND pv.PUNTOVENTA_ID = "+agencia+" "); + } + sql.append(" GROUP BY TO_DATE(TO_CHAR(B.fechorventa,'DD-MON-YYYY'),'DD-MON-YYYY' ),T.DESCTRAMO,FP.DESCPAGO, RC.RUTACOMBINACION_ID, r.descruta, RC.RUTA_ID, RC.TRAMO_ID, T.ORIGEN_ID, T.DESTINO_ID, PV.NOMBPUNTOVENTA "); + sql.append(" order by RC_ruta_ID , RC_tramo_ID , b_fechorventa "); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); + + ResultSet rset = stmt.executeQuery(); + + lsDadosRelatorio = new ArrayList(); + + RelatorioFormaPagamentoAgenciaRutaTramoBean r ; + SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yy"); + + while (rset.next()) { + r= new RelatorioFormaPagamentoAgenciaRutaTramoBean(); + + r.setDescRuta("desc ruta"); + r.setPeriodo("periodo"); + r.setDescFormaPag(rset.getString("fp_DESCPAGO")); + r.setDescTramo(rset.getString("t_desctramo")); + r.setDescRuta(rset.getString("r_descruta")); + r.setData(dt.format(rset.getDate("b_fechorventa"))); + r.setAgencia(rset.getString("pv_NOMBPUNTOVENTA")); + r.setTarifa(rset.getDouble("cfp_importe")); + r.setPedagio(rset.getDouble("b_IMPORTEPEDAGIO")); + r.setSeguro(rset.getDouble("b_IMPORTESEGURO")); + r.setTaxas(rset.getDouble("b_IMPORTETAXAEMBARQUE")); + r.setTotal(rset.getDouble("b_IMPORTETAXAEMBARQUE") +rset.getDouble("b_IMPORTESEGURO") + rset.getDouble("cfp_importe") + rset.getDouble("b_IMPORTEPEDAGIO")); + r.setQuantidade(rset.getInt("QTD")); + + lsDadosRelatorio.add(r); + } + setLsDadosRelatorio(lsDadosRelatorio); + } + }); + } + public List getLsDadosRelatorio() { + return lsDadosRelatorio; + } + + public void setLsDadosRelatorio(List lsDadosRelatorio) { + this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); + this.lsDadosRelatorio = lsDadosRelatorio; + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaRutaTramo_pt_BR..properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaRutaTramo_pt_BR..properties new file mode 100644 index 000000000..4c7dfdb6a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaRutaTramo_pt_BR..properties @@ -0,0 +1 @@ +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaRutaTramo.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaRutaTramo.jasper new file mode 100644 index 0000000000000000000000000000000000000000..a05c5e2b2520d96c402a1c2fdf2906d39ec5ebdf GIT binary patch literal 35731 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaRutaTramo.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaRutaTramo.jrxml new file mode 100644 index 000000000..2a4722f05 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaRutaTramo.jrxml @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="79" splitType="Stretch"> + <staticText> + <reportElement uuid="f1ec38fc-f846-43f2-b9a4-338eb5d19aa2" x="39" y="10" width="802" height="20"/> + <textElement textAlignment="Center"> + <font size="14" isBold="true"/> + </textElement> + <text><![CDATA[Relatório de Forma de Pagamento por Linha]]></text> + </staticText> + <textField> + <reportElement uuid="d3de6210-3d3e-4ef1-a080-bcbf232792a7" x="10" y="48" width="247" height="20"/> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA["Período: " + $P{DATA_INICIAL} + " a " + $P{DATA_FINAL}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioFormaPagamentoAgenciaRutaTramoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioFormaPagamentoAgenciaRutaTramoBean.java new file mode 100644 index 000000000..f45ea0b6b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioFormaPagamentoAgenciaRutaTramoBean.java @@ -0,0 +1,129 @@ +package com.rjconsultores.ventaboletos.relatorios.utilitarios; + +import java.util.ArrayList; +import java.util.List; + +public class RelatorioFormaPagamentoAgenciaRutaTramoBean { + + private String periodo; + private String descRuta; + private String data; + private String agencia; + private String descFormaPag; + private double tarifa; + private double pedagio; + private double seguro; + private double taxas; + private double total; + private Integer quantidade; + private String descTramo; + private String totalTarifa; + private String totalSeguro; + private String totalPedagio; + private String totalGeral; + private String totalQtd; + + public String getPeriodo() { + return periodo; + } + public void setPeriodo(String periodo) { + this.periodo = periodo; + } + public String getDescRuta() { + return descRuta; + } + public void setDescRuta(String descRuta) { + this.descRuta = descRuta; + } + public String getData() { + return data; + } + public void setData(String data) { + this.data = data; + } + public String getAgencia() { + return agencia; + } + public void setAgencia(String agencia) { + this.agencia = agencia; + } + public String getDescFormaPag() { + return descFormaPag; + } + public void setDescFormaPag(String descFormaPag) { + this.descFormaPag = descFormaPag; + } + public double getTarifa() { + return tarifa; + } + public void setTarifa(double tarifa) { + this.tarifa = tarifa; + } + public double getPedagio() { + return pedagio; + } + public void setPedagio(double pedagio) { + this.pedagio = pedagio; + } + public double getSeguro() { + return seguro; + } + public void setSeguro(double seguro) { + this.seguro = seguro; + } + public double getTaxas() { + return taxas; + } + public void setTaxas(double taxas) { + this.taxas = taxas; + } + public double getTotal() { + return total; + } + public void setTotal(double total) { + this.total = total; + } + public Integer getQuantidade() { + return quantidade; + } + public void setQuantidade(Integer quantidade) { + this.quantidade = quantidade; + } + + public String getTotalTarifa() { + return totalTarifa; + } + public void setTotalTarifa(String totalTarifa) { + this.totalTarifa = totalTarifa; + } + public String getTotalSeguro() { + return totalSeguro; + } + public void setTotalSeguro(String totalSeguro) { + this.totalSeguro = totalSeguro; + } + public String getTotalPedagio() { + return totalPedagio; + } + public void setTotalPedagio(String totalPedagio) { + this.totalPedagio = totalPedagio; + } + public String getTotalGeral() { + return totalGeral; + } + public void setTotalGeral(String totalGeral) { + this.totalGeral = totalGeral; + } + public String getTotalQtd() { + return totalQtd; + } + public void setTotalQtd(String totalQtd) { + this.totalQtd = totalQtd; + } + public String getDescTramo() { + return descTramo; + } + public void setDescTramo(String descTramo) { + this.descTramo = descTramo; + } +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java index 2b5c94439..3b9476e47 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/financeiro/FormaPagamentoAgenciaController.java @@ -4,6 +4,8 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.financeiro; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -17,16 +19,21 @@ import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Datebox; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFormaPagamentoAgencia; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioFormaPagamentoAgenciaRutaTramo; import com.rjconsultores.ventaboletos.service.FormaPagamentoAgenciaService; +import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; /** * @@ -38,6 +45,8 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer { @Autowired private FormaPagamentoAgenciaService financeiroService; + @Autowired + private RutaService rutaService; @Autowired private DataSource dataSourceRead; @@ -49,12 +58,22 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer { private List lsEmpresas; private MyComboboxPuntoVenta cmbAgencia; + private Checkbox considerarRuta; + + private MyComboboxEstandar cmbRuta; + private List lsRuta; + + private List listSelectedRutas; + private MyListbox selectedRutasList; + + @Override public void doAfterCompose(Component comp) throws Exception { lsEmpresas = UsuarioLogado.getUsuarioLogado().getEmpresa(); - + lsRuta = rutaService.obtenerTodos(); + listSelectedRutas = new ArrayList(); super.doAfterCompose(comp); } @@ -121,9 +140,17 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer { Date dataInicio = fecInicio.getValue(); Date dataFinal = fecFinal.getValue(); + SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy"); + Map argsInforme = new HashMap(); - argsInforme.put("DATA_INICIAL", dataInicio); - argsInforme.put("DATA_FINAL", dataFinal); + + if(!considerarRuta.isChecked()){ + argsInforme.put("DATA_INICIAL", dataInicio); + argsInforme.put("DATA_FINAL", dataFinal); + }else{ + argsInforme.put("DATA_INICIAL", dt.format(dataInicio)); + argsInforme.put("DATA_FINAL", dt.format(dataFinal)); + } if (cmbEmpresa.isValid() && cmbEmpresa.getSelectedItem() != null) { Integer empresaId = ((Empresa)cmbEmpresa.getSelectedItem().getValue()).getEmpresaId(); @@ -135,13 +162,76 @@ public class FormaPagamentoAgenciaController extends MyGenericForwardComposer { argsInforme.put("AGENCIA", agencia); } - RelatorioFormaPagamentoAgencia relatorio = new RelatorioFormaPagamentoAgencia(argsInforme, dataSourceRead.getConnection()); + if (considerarRuta.isChecked() && listSelectedRutas != null && !listSelectedRutas.isEmpty()) { + String idsRutas = ""; + for(Ruta r : listSelectedRutas){ + idsRutas = idsRutas + r.getRutaId()+","; + } + + argsInforme.put("RUTAS_IDS", idsRutas.substring(0, idsRutas.length()-1)); + } + + RelatorioFormaPagamentoAgencia relatorio =null; + RelatorioFormaPagamentoAgenciaRutaTramo relatorioRutaTramo =null; + if(!considerarRuta.isChecked()){ + relatorio = new RelatorioFormaPagamentoAgencia(argsInforme, dataSourceRead.getConnection()); + }else{ + relatorioRutaTramo = new RelatorioFormaPagamentoAgenciaRutaTramo(argsInforme, dataSourceRead.getConnection()); + } + Map args = new HashMap(); - args.put("relatorio", relatorio); + if(!considerarRuta.isChecked()){ + args.put("relatorio", relatorio); + }else{ + args.put("relatorio", relatorioRutaTramo); + } + openWindow("/component/reportView.zul", Labels.getLabel("formaPagamentoAgenciaController.window.title"), args, MODAL); } + + public void onClick$btnAddRuta(Event ev) throws InterruptedException { + if (cmbRuta.getSelectedItem() != null) { + listSelectedRutas.add((Ruta) cmbRuta.getSelectedItem().getValue()); + selectedRutasList.setData(listSelectedRutas); + cmbRuta.setSelectedItem(null); + } + } + + public void onClick$btnRemoveRuta(Event ev) throws InterruptedException { + Ruta ruta = (Ruta) selectedRutasList.getSelected(); + listSelectedRutas.remove(ruta); + selectedRutasList.setData(listSelectedRutas); + } + + public List getLsRuta() { + return lsRuta; + } + + public void setLsRuta(List lsRuta) { + this.lsRuta = lsRuta; + } + + + public List getListSelectedRutas() { + return listSelectedRutas; + } + + + public void setListSelectedRutas(List listSelectedRutas) { + this.listSelectedRutas = listSelectedRutas; + } + + + public MyListbox getSelectedRutasList() { + return selectedRutasList; + } + + + public void setSelectedRutasList(MyListbox selectedRutasList) { + this.selectedRutasList = selectedRutasList; + } } diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 62edce78d..3a1d757cf 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -399,6 +399,7 @@ formaPagamentoAgenciaController.lbAgencia.value = Agência formaPagamentoAgenciaController.lbDataIni.value = Data Início formaPagamentoAgenciaController.lbDataFin.value = Data Fim formaPagamentoAgenciaController.lbEmpresa.value = Empresa +formaPagamentoAgenciaController.lbConsideraRuta.value = Considerar Ruta # Relatório Financeiro por Grupo de Linhas financeiroGrupoLinhasController.mniRelatorioFinanceiro.label = Financeiro por Grupo de Linhas diff --git a/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul b/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul index 44db1d1e5..09a760e20 100644 --- a/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul +++ b/web/gui/informes/formaPagamentoAgencia/formaPagamentoAgencia.zul @@ -44,8 +44,54 @@ width="70%" model="@{winFormaPagamentoAgencia$composer.lsEmpresas}"/> + + + + + +