fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#14522 

dev: lucas taia
qua: xxx


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96171 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucassilverio 2019-07-29 11:58:42 +00:00
parent feb79e1f52
commit a8db5b2c4b
5 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoResumoDiario.java
View File

@ -8,16 +8,15 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang.math.NumberUtils;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoAntigoBean; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoAntigoBean;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoBean;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
public class RelatorioAgenciaFechamentoResumoDiario extends Relatorio { public class RelatorioAgenciaFechamentoResumoDiario extends Relatorio {
private List<RelatorioAgenciaFechamentoAntigoBean> lsDadosRelatorio; private List<RelatorioAgenciaFechamentoAntigoBean> lsDadosRelatorio;

40
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
View File

@ -152,56 +152,58 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" CASE "); sql.append(" CASE ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.FECVENTADIGITA IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NULL ");
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND (c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN 'VENDA NORMAL' "); sql.append(" THEN 'VENDA NORMAL' ");
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.FECVENTADIGITA IS NOT NULL "); sql.append(" AND c.FECVENTADIGITA IS NOT NULL ");
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND (c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN 'VENDA TRANSITO' "); sql.append(" THEN 'VENDA TRANSITO' ");
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.FECVENTADIGITA IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NULL ");
sql.append(" AND c.PORCCATEGORIA > 0 "); sql.append(" AND c.PORCCATEGORIA > 0 ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN cat.DESCCATEGORIA "); sql.append(" THEN cat.DESCCATEGORIA ");
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.FECVENTADIGITA IS NOT NULL "); sql.append(" AND c.FECVENTADIGITA IS NOT NULL ");
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0)");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (9,39)) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (9,39)) ");
sql.append(" THEN 'VENDA ANTECIPADA' "); sql.append(" THEN 'VENDA ANTECIPADA' ");
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.FECVENTADIGITA IS NULL "); sql.append(" AND c.FECVENTADIGITA IS NULL ");
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) "); sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL "); sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (99)) "); sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (99)) ");
sql.append(" THEN 'VENDA EMBARCADA' "); sql.append(" THEN 'VENDA EMBARCADA' ");
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5,18)) "); sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5)) ");
sql.append(" THEN 'IMPRESSAO POSTERIOR' "); 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(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.TIPOVENTA_ID = 12 "); sql.append(" AND c.TIPOVENTA_ID = 12 ");
sql.append(" THEN 'VENDA INTERNET' "); sql.append(" THEN 'VENDA INTERNET' ");
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL ");
// utilizar para separar cancelado / estornado sql.append(" AND c.MOTIVOCANCELACION_ID = 31 ");
// sql.append(" AND c.MOTIVOCANCELACION_ID <> 31 "); sql.append(" THEN 'ANULADO' ");
sql.append(" THEN 'CANCELADO' "); 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(" END) ");
sql.append(" ) AS tipo "); sql.append(" ) AS tipo ");
sql.append("FROM caja c "); 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 ORI ON ORI.parada_id = c.origen_id ");
sql.append(" LEFT JOIN parada DES ON DES.parada_id = c.destino_id "); sql.append(" LEFT JOIN parada DES ON DES.parada_id = c.destino_id ");
sql.append(" where c.ACTIVO = 1 "); 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") ) { if (tramo != null && !tramo.equals("Todas") ) {
sql.append(" AND t.TRAMO_ID in (").append(tramo).append(") "); sql.append(" AND t.TRAMO_ID in (").append(tramo).append(") ");

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper
View File

Binary file not shown.

44
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
View File

@ -26,7 +26,7 @@
<field name="tipo" class="java.lang.String"/> <field name="tipo" class="java.lang.String"/>
<field name="ruta" class="java.lang.Integer"/> <field name="ruta" class="java.lang.Integer"/>
<variable name="totalTrecho" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum"> <variable name="totalTrecho" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
@ -46,7 +46,7 @@ new java.math.BigDecimal("0")
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="totalTrechoQte" class="java.lang.Integer" resetType="Group" resetGroup="groupTrecho" calculation="Sum"> <variable name="totalTrechoQte" class="java.lang.Integer" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{qtde} * -1 $F{qtde} * -1
: :
@ -57,7 +57,7 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
$F{qtde}]]></variableExpression> $F{qtde}]]></variableExpression>
</variable> </variable>
<variable name="totalTrechoTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum"> <variable name="totalTrechoTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{tarifa}.multiply( new java.math.BigDecimal("-1")) $F{tarifa}.multiply( new java.math.BigDecimal("-1"))
: :
@ -68,7 +68,7 @@ new java.math.BigDecimal("0")
$F{tarifa}]]></variableExpression> $F{tarifa}]]></variableExpression>
</variable> </variable>
<variable name="totalTrechoTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum"> <variable name="totalTrechoTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{taxaembarque}.multiply( new java.math.BigDecimal("-1")) $F{taxaembarque}.multiply( new java.math.BigDecimal("-1"))
: :
@ -79,7 +79,7 @@ new java.math.BigDecimal("0")
$F{taxaembarque}]]></variableExpression> $F{taxaembarque}]]></variableExpression>
</variable> </variable>
<variable name="totalTrechoPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum"> <variable name="totalTrechoPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{pedagio}.multiply( new java.math.BigDecimal("-1") ) $F{pedagio}.multiply( new java.math.BigDecimal("-1") )
: :
@ -90,7 +90,7 @@ new java.math.BigDecimal("0")
$F{pedagio}]]></variableExpression> $F{pedagio}]]></variableExpression>
</variable> </variable>
<variable name="totalTrechoOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum"> <variable name="totalTrechoOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{outros}.multiply( new java.math.BigDecimal("-1") ) $F{outros}.multiply( new java.math.BigDecimal("-1") )
: :
@ -101,7 +101,7 @@ new java.math.BigDecimal("0")
$F{outros}]]></variableExpression> $F{outros}]]></variableExpression>
</variable> </variable>
<variable name="totalTrechoSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum"> <variable name="totalTrechoSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{seguro}.multiply( new java.math.BigDecimal("-1") ) $F{seguro}.multiply( new java.math.BigDecimal("-1") )
: :
@ -116,7 +116,7 @@ $F{seguro}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="totalLinha" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="totalLinha" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
@ -136,7 +136,7 @@ new java.math.BigDecimal("0")
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="totalLinhaQte" class="java.lang.Integer" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="totalLinhaQte" class="java.lang.Integer" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{qtde}*-1 $F{qtde}*-1
: :
@ -147,7 +147,7 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
$F{qtde}]]></variableExpression> $F{qtde}]]></variableExpression>
</variable> </variable>
<variable name="totalLinhaTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="totalLinhaTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{tarifa}.multiply( new java.math.BigDecimal("-1") ) $F{tarifa}.multiply( new java.math.BigDecimal("-1") )
: :
@ -158,7 +158,7 @@ new java.math.BigDecimal("0")
$F{tarifa}]]></variableExpression> $F{tarifa}]]></variableExpression>
</variable> </variable>
<variable name="totalLinhaTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="totalLinhaTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{taxaembarque}.multiply( new java.math.BigDecimal("-1") ) $F{taxaembarque}.multiply( new java.math.BigDecimal("-1") )
: :
@ -169,7 +169,7 @@ new java.math.BigDecimal("0")
$F{taxaembarque}]]></variableExpression> $F{taxaembarque}]]></variableExpression>
</variable> </variable>
<variable name="totalLinhaPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="totalLinhaPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{pedagio}.multiply( new java.math.BigDecimal("-1") ) $F{pedagio}.multiply( new java.math.BigDecimal("-1") )
: :
@ -180,7 +180,7 @@ new java.math.BigDecimal("0")
$F{pedagio}]]></variableExpression> $F{pedagio}]]></variableExpression>
</variable> </variable>
<variable name="totalLinhaOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="totalLinhaOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{outros}.multiply( new java.math.BigDecimal("-1") ) $F{outros}.multiply( new java.math.BigDecimal("-1") )
: :
@ -191,7 +191,7 @@ new java.math.BigDecimal("0")
$F{outros}]]></variableExpression> $F{outros}]]></variableExpression>
</variable> </variable>
<variable name="totalLinhaSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="totalLinhaSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{seguro}.multiply( new java.math.BigDecimal("-1") ) $F{seguro}.multiply( new java.math.BigDecimal("-1") )
: :
@ -213,7 +213,7 @@ $F{seguro}]]></variableExpression>
.add( $F{seguro} )]]></variableExpression> .add( $F{seguro} )]]></variableExpression>
</variable> </variable>
<variable name="total" class="java.math.BigDecimal" calculation="Sum"> <variable name="total" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
@ -233,7 +233,7 @@ new java.math.BigDecimal("0")
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="totalQte" class="java.lang.Integer" calculation="Sum"> <variable name="totalQte" class="java.lang.Integer" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{qtde}*-1 $F{qtde}*-1
: :
@ -244,7 +244,7 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
$F{qtde}]]></variableExpression> $F{qtde}]]></variableExpression>
</variable> </variable>
<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum"> <variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{tarifa}.multiply( new java.math.BigDecimal("-1") ) $F{tarifa}.multiply( new java.math.BigDecimal("-1") )
: :
@ -255,7 +255,7 @@ new java.math.BigDecimal("0")
$F{tarifa}]]></variableExpression> $F{tarifa}]]></variableExpression>
</variable> </variable>
<variable name="totalTaxaEmbarque" class="java.math.BigDecimal" calculation="Sum"> <variable name="totalTaxaEmbarque" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{taxaembarque}.multiply( new java.math.BigDecimal("-1") ) $F{taxaembarque}.multiply( new java.math.BigDecimal("-1") )
: :
@ -266,7 +266,7 @@ new java.math.BigDecimal("0")
$F{taxaembarque}]]></variableExpression> $F{taxaembarque}]]></variableExpression>
</variable> </variable>
<variable name="totalPedagio" class="java.math.BigDecimal" calculation="Sum"> <variable name="totalPedagio" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{pedagio}.multiply( new java.math.BigDecimal("-1") ) $F{pedagio}.multiply( new java.math.BigDecimal("-1") )
: :
@ -277,7 +277,7 @@ new java.math.BigDecimal("0")
$F{pedagio}]]></variableExpression> $F{pedagio}]]></variableExpression>
</variable> </variable>
<variable name="totalOutros" class="java.math.BigDecimal" calculation="Sum"> <variable name="totalOutros" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{outros}.multiply( new java.math.BigDecimal("-1") ) $F{outros}.multiply( new java.math.BigDecimal("-1") )
: :
@ -288,7 +288,7 @@ new java.math.BigDecimal("0")
$F{outros}]]></variableExpression> $F{outros}]]></variableExpression>
</variable> </variable>
<variable name="totalSeguro" class="java.math.BigDecimal" calculation="Sum"> <variable name="totalSeguro" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") <variableExpression><![CDATA[$F{tipo}.equals("ANULADO") || $F{tipo}.equals("DEVOLVIDO")
? ?
$F{seguro}.multiply( new java.math.BigDecimal("-1") ) $F{seguro}.multiply( new java.math.BigDecimal("-1") )
: :
@ -302,7 +302,7 @@ $F{seguro}]]></variableExpression>
<variableExpression><![CDATA[$V{total}]]></variableExpression> <variableExpression><![CDATA[$V{total}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<group name="groupLinha" isStartNewPage="true"> <group name="groupLinha">
<groupExpression><![CDATA[$F{descRuta}]]></groupExpression> <groupExpression><![CDATA[$F{descRuta}]]></groupExpression>
<groupHeader> <groupHeader>
<band height="20"> <band height="20">

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
View File

@ -569,7 +569,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
if(!salvar){ if(!salvar){
return; return;
} }
System.out.print("teste");
salvar = false; salvar = false;
if (esquemaCorrida.getRuta().getIndRutaCancelada()) { if (esquemaCorrida.getRuta().getIndRutaCancelada()) {