diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoResumoDiario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoResumoDiario.java index b4f3b937e..859f6b125 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoResumoDiario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoResumoDiario.java @@ -8,16 +8,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; - import org.apache.commons.lang.math.NumberUtils; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoAntigoBean; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoBean; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + public class RelatorioAgenciaFechamentoResumoDiario extends Relatorio { private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java index ff6069155..781717379 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -152,56 +152,58 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" CASE "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NULL "); - sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); - sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); - sql.append(" OR c.INDREMOTOINVERSO =0) "); + sql.append(" AND (c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); + sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" THEN 'VENDA NORMAL' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NOT NULL "); - sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); - sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); - sql.append(" OR c.INDREMOTOINVERSO =0) "); + sql.append(" AND (c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); + sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" THEN 'VENDA TRANSITO' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NULL "); sql.append(" AND c.PORCCATEGORIA > 0 "); - sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); - sql.append(" OR c.INDREMOTOINVERSO =0) "); + sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" THEN cat.DESCCATEGORIA "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NOT NULL "); sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); - sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); - sql.append(" OR c.INDREMOTOINVERSO =0) "); + sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0)"); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (9,39)) "); sql.append(" THEN 'VENDA ANTECIPADA' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NULL "); sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); - sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); - sql.append(" OR c.INDREMOTOINVERSO =0) "); + sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (99)) "); sql.append(" THEN 'VENDA EMBARCADA' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); - sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5,18)) "); - sql.append(" THEN 'IMPRESSAO POSTERIOR' "); + sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5)) "); + sql.append(" THEN 'VENDA CENTRAL TELEFONICA' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (18)) "); + sql.append(" THEN 'VENDA PRE-PAGA' "); + sql.append(" "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" AND c.TIPOVENTA_ID = 12 "); sql.append(" THEN 'VENDA INTERNET' "); sql.append(" "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL "); -// utilizar para separar cancelado / estornado -// sql.append(" AND c.MOTIVOCANCELACION_ID <> 31 "); - sql.append(" THEN 'CANCELADO' "); + sql.append(" AND c.MOTIVOCANCELACION_ID = 31 "); + sql.append(" THEN 'ANULADO' "); + sql.append(" "); + sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL "); + sql.append(" AND c.MOTIVOCANCELACION_ID <> 31 "); + sql.append(" THEN 'DEVOLVIDO' "); sql.append(" END) "); sql.append(" ) AS tipo "); sql.append("FROM caja c "); @@ -216,7 +218,9 @@ public class RelatorioOperacionalFinanceiro extends Relatorio { sql.append(" LEFT JOIN parada ORI ON ORI.parada_id = c.origen_id "); sql.append(" LEFT JOIN parada DES ON DES.parada_id = c.destino_id "); sql.append(" where c.ACTIVO = 1 "); - sql.append(" AND c.FECHORVENTA BETWEEN :fecInicioVenda AND :fecFinalVenda "); + sql.append(" AND c.tipoventa_id <> 6 "); + sql.append(" AND c.indreimpresion = 0 "); + sql.append(" AND c.feccorte BETWEEN :fecInicioVenda AND :fecFinalVenda "); if (tramo != null && !tramo.equals("Todas") ) { sql.append(" AND t.TRAMO_ID in (").append(tramo).append(") "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper index 5596c71ef..35ebb3fdb 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml index 70bcbb6b4..f9d2f9c3a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml @@ -26,7 +26,7 @@ - - - - - - - - - - - - - - .add( $F{seguro} )]]> - - - - - - - - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java index d3948efc2..bd6a49681 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java @@ -569,7 +569,7 @@ public class EditarCorridaController extends MyGenericForwardComposer { if(!salvar){ return; } - System.out.print("teste"); + salvar = false; if (esquemaCorrida.getRuta().getIndRutaCancelada()) {