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

Merge branch 'master' of http://18.235.188.113:3000/adm/VentaBoletosAdm into AL-4463 

# Conflicts:
#	pom.xml
master
Aristides dos Reis Júnior 2024-10-03 16:15:34 -03:00
parent 19f569d3f3 98e7c7b617
commit 7ab0e82c3b
4 changed files with 93 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDReembolsoPix.java
View File

@ -161,7 +161,7 @@ public class RelatorioOCDReembolsoPix extends Relatorio {
sql.append("LEFT JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID "); sql.append("LEFT JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ");
sql.append("LEFT JOIN PUNTO_VENTA PVV ON PVV.PUNTOVENTA_ID = B.PUNTOVENTA_ID "); sql.append("LEFT JOIN PUNTO_VENTA PVV ON PVV.PUNTOVENTA_ID = B.PUNTOVENTA_ID ");
sql.append("LEFT JOIN USUARIO UI ON UI.USUARIO_ID = O.USUARIO_ID "); sql.append("LEFT JOIN USUARIO UI ON UI.USUARIO_ID = O.USUARIO_ID ");
sql.append("WHERE O.ACTIVO = 1 "); sql.append("WHERE O.ACTIVO = 1 and O.INDPAGO=1 ");
sql.append(puntoVentas == null ? "" : "AND PVO.PUNTOVENTA_ID IN (" + puntoVentas + ") "); sql.append(puntoVentas == null ? "" : "AND PVO.PUNTOVENTA_ID IN (" + puntoVentas + ") ");

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

@ -197,7 +197,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 18) "); sql.append(" AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 18) ");
sql.append(" THEN 'VENDA PRE-PAGA' "); sql.append(" THEN 'VENDA PRE-PAGA' ");
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 1"); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 1 AND c.MOTIVOREIMPRESION_ID IS NULL");
sql.append(" AND (c.INDSTATUSBOLETO = 'E' AND c.TIPOVENTA_ID in (5,12,18)) "); sql.append(" AND (c.INDSTATUSBOLETO = 'E' AND c.TIPOVENTA_ID in (5,12,18)) ");
sql.append(" THEN 'IMPRESSAO POSTERIOR' "); sql.append(" THEN 'IMPRESSAO POSTERIOR' ");
sql.append(" "); sql.append(" ");
@ -207,6 +207,10 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" "); sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 "); sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 ");
sql.append(" THEN 'CANCELADO' "); sql.append(" THEN 'CANCELADO' ");
sql.append(" WHEN c.INDREIMPRESION = 1 and c.MOTIVOREIMPRESION_ID = 99 ");
sql.append(" THEN 'REIMPRESSO' ");
sql.append(" END) "); sql.append(" END) ");
sql.append(" ) AS tipo "); sql.append(" ) AS tipo ");
sql.append("FROM caja c "); sql.append("FROM caja c ");

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

Binary file not shown.

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

@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioOperacionalFinanceiro" pageWidth="950" pageHeight="595" orientation="Landscape" columnWidth="930" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioOperacionalFinanceiro" pageWidth="950" pageHeight="595" orientation="Landscape" columnWidth="930" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb">
<property name="ireport.zoom" value="1.239669421487605"/> <property name="ireport.zoom" value="1.239669421487605"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="11"/> <property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/> <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@ -39,6 +39,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
.add( $F{pedagio} ) .add( $F{pedagio} )
@ -55,6 +59,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
0 0
: :
$F{tipo}.equals("REIMPRESSO")
?
0
:
$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">
@ -66,6 +74,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -77,6 +89,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -88,6 +104,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -99,6 +119,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -110,6 +134,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{seguro}]]></variableExpression> $F{seguro}]]></variableExpression>
</variable> </variable>
<variable name="totalTrechoGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho"> <variable name="totalTrechoGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho">
@ -128,6 +156,11 @@ $F{seguro}]]></variableExpression>
$F{tipo}.equals("IMPRESSAO POSTERIOR") $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
:
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
: :
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
@ -145,6 +178,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
0 0
: :
$F{tipo}.equals("REIMPRESSO")
?
0
:
$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">
@ -156,6 +193,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -167,6 +208,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -178,6 +223,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -189,6 +238,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -200,10 +253,14 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{seguro}]]></variableExpression> $F{seguro}]]></variableExpression>
</variable> </variable>
<variable name="totalLinhaGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha"> <variable name="totalLinhaGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha">
<variableExpression><![CDATA[$V{totalLinha}]]></variableExpression> <variableExpression><![CDATA[$V{totalTrecho}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="soma" class="java.math.BigDecimal" resetType="None"> <variable name="soma" class="java.math.BigDecimal" resetType="None">
@ -226,6 +283,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
.add( $F{pedagio} ) .add( $F{pedagio} )
@ -242,6 +303,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
0 0
: :
$F{tipo}.equals("REIMPRESSO")
?
0
:
$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">
@ -253,6 +318,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -264,6 +333,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -275,6 +348,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -286,6 +363,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
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">
@ -297,6 +378,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
? ?
new java.math.BigDecimal("0") new java.math.BigDecimal("0")
: :
$F{tipo}.equals("REIMPRESSO")
?
new java.math.BigDecimal("0")
:
$F{seguro}]]></variableExpression> $F{seguro}]]></variableExpression>
</variable> </variable>
<variable name="totalGeral" class="java.math.BigDecimal"> <variable name="totalGeral" class="java.math.BigDecimal">