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

fixes bug#19632 

qua:
dev:Valdir
Correção para tratar quitação OCD do relatório.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103198 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2020-09-04 20:50:09 +00:00
parent d4f6ce9ff7
commit 2690e8083b
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java
View File

@ -154,8 +154,8 @@ public class RelatorioCaixaOrgaoConcedente extends Relatorio {
sql.append(" THEN 'VENDA'"); sql.append(" THEN 'VENDA'");
sql.append(" WHEN c.indreimpresion = 0"); sql.append(" WHEN c.indreimpresion = 0");
sql.append(" AND (c.MOTIVOCANCELACION_ID IS NOT NULL"); sql.append(" AND (c.MOTIVOCANCELACION_ID IS NOT NULL");
//Não devoluções //Não devoluções (Cancelamentos)
sql.append(" AND c.MOTIVOCANCELACION_ID NOT IN (32,36,37, 99))"); sql.append(" AND c.MOTIVOCANCELACION_ID NOT IN (32,34, 35, 36,37, 99))");
sql.append(" THEN 'CANCELADO'"); sql.append(" THEN 'CANCELADO'");
sql.append(" WHEN ((c.indreimpresion = 0"); sql.append(" WHEN ((c.indreimpresion = 0");
sql.append(" AND c.MOTIVOCANCELACION_ID IS NOT NULL"); sql.append(" AND c.MOTIVOCANCELACION_ID IS NOT NULL");
@ -163,6 +163,12 @@ public class RelatorioCaixaOrgaoConcedente extends Relatorio {
sql.append(" AND c.MOTIVOCANCELACION_ID IN (32,36,37))"); sql.append(" AND c.MOTIVOCANCELACION_ID IN (32,36,37))");
sql.append(" OR c.MOTIVOCANCELACION_ID = 99)"); sql.append(" OR c.MOTIVOCANCELACION_ID = 99)");
sql.append(" THEN 'DEVOLUCAO'"); sql.append(" THEN 'DEVOLUCAO'");
//Quitação OCD
sql.append(" WHEN c.indreimpresion = 0 ");
sql.append(" AND (c.MOTIVOCANCELACION_ID IS NOT NULL ");
sql.append(" AND c.MOTIVOCANCELACION_ID IN (35)) ");
sql.append(" THEN 'QUITACAO OCD' ");
sql.append(" END) ) AS tipo"); sql.append(" END) ) AS tipo");
sql.append(" FROM caja c"); sql.append(" FROM caja c");
sql.append(" INNER JOIN MARCA ma"); sql.append(" INNER JOIN MARCA ma");

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

Binary file not shown.

34
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCaixaOrgaoConcedente.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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="RelatorioCaixaOrgaoConcedente" pageWidth="950" pageHeight="585" 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="RelatorioCaixaOrgaoConcedente" pageWidth="950" pageHeight="585" 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="429"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <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"/>
@ -9,7 +9,7 @@
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/> <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
<style name="cancelados_devolvidos" forecolor="#000000"> <style name="cancelados_devolvidos" forecolor="#000000">
<conditionalStyle> <conditionalStyle>
<conditionExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO")]]></conditionExpression> <conditionExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")]]></conditionExpression>
<style forecolor="#FF0000"/> <style forecolor="#FF0000"/>
</conditionalStyle> </conditionalStyle>
</style> </style>
@ -40,7 +40,7 @@
.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") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
@ -56,42 +56,42 @@
<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")) || ($F{tipo}.equals("DEVOLUCAO")) <variableExpression><![CDATA[($F{tipo}.equals("CANCELADO")) || ($F{tipo}.equals("DEVOLUCAO")) || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{qtde}* -1 $F{qtde}* -1
: :
$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") || $F{tipo}.equals("DEVOLUCAO")) <variableExpression><![CDATA[($F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO")) || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{tarifa}.multiply( new java.math.BigDecimal("-1") ) $F{tarifa}.multiply( new java.math.BigDecimal("-1") )
: :
$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")) || ($F{tipo}.equals("DEVOLUCAO")) <variableExpression><![CDATA[($F{tipo}.equals("CANCELADO")) || ($F{tipo}.equals("DEVOLUCAO")) || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{taxaembarque}.multiply( new java.math.BigDecimal("-1") ) $F{taxaembarque}.multiply( new java.math.BigDecimal("-1") )
: :
$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") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{pedagio}.multiply( new java.math.BigDecimal("-1") ) $F{pedagio}.multiply( new java.math.BigDecimal("-1") )
: :
$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") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{outros}.multiply( new java.math.BigDecimal("-1") ) $F{outros}.multiply( new java.math.BigDecimal("-1") )
: :
$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") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{seguro}.multiply( new java.math.BigDecimal("-1") ) $F{seguro}.multiply( new java.math.BigDecimal("-1") )
: :
@ -102,49 +102,49 @@ $F{seguro}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="totalOrgaoQte" class="java.lang.Integer" resetType="Group" resetGroup="descorgao" calculation="Sum"> <variable name="totalOrgaoQte" class="java.lang.Integer" resetType="Group" resetGroup="descorgao" calculation="Sum">
<variableExpression><![CDATA[($F{tipo}.equals("CANCELADO")) || ($F{tipo}.equals("DEVOLUCAO")) <variableExpression><![CDATA[($F{tipo}.equals("CANCELADO")) || ($F{tipo}.equals("DEVOLUCAO")) || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{qtde}* -1 $F{qtde}* -1
: :
$F{qtde}]]></variableExpression> $F{qtde}]]></variableExpression>
</variable> </variable>
<variable name="totalOrgaoTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum"> <variable name="totalOrgaoTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum">
<variableExpression><![CDATA[($F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO")) <variableExpression><![CDATA[($F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO")) || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{tarifa}.multiply( new java.math.BigDecimal("-1") ) $F{tarifa}.multiply( new java.math.BigDecimal("-1") )
: :
$F{tarifa}]]></variableExpression> $F{tarifa}]]></variableExpression>
</variable> </variable>
<variable name="totalOrgaoSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum"> <variable name="totalOrgaoSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{seguro}.multiply( new java.math.BigDecimal("-1") ) $F{seguro}.multiply( new java.math.BigDecimal("-1") )
: :
$F{seguro}]]></variableExpression> $F{seguro}]]></variableExpression>
</variable> </variable>
<variable name="totalOrgaoOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum"> <variable name="totalOrgaoOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{outros}.multiply( new java.math.BigDecimal("-1") ) $F{outros}.multiply( new java.math.BigDecimal("-1") )
: :
$F{outros}]]></variableExpression> $F{outros}]]></variableExpression>
</variable> </variable>
<variable name="totalOrgaoTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum"> <variable name="totalOrgaoTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum">
<variableExpression><![CDATA[($F{tipo}.equals("CANCELADO")) || ($F{tipo}.equals("DEVOLUCAO")) <variableExpression><![CDATA[($F{tipo}.equals("CANCELADO")) || ($F{tipo}.equals("DEVOLUCAO")) || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{taxaembarque}.multiply( new java.math.BigDecimal("-1") ) $F{taxaembarque}.multiply( new java.math.BigDecimal("-1") )
: :
$F{taxaembarque}]]></variableExpression> $F{taxaembarque}]]></variableExpression>
</variable> </variable>
<variable name="totalOrgaoPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum"> <variable name="totalOrgaoPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{pedagio}.multiply( new java.math.BigDecimal("-1") ) $F{pedagio}.multiply( new java.math.BigDecimal("-1") )
: :
$F{pedagio}]]></variableExpression> $F{pedagio}]]></variableExpression>
</variable> </variable>
<variable name="totalOrgao" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum"> <variable name="totalOrgao" class="java.math.BigDecimal" resetType="Group" resetGroup="descorgao" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
($F{tarifa} ($F{tarifa}
.add( $F{taxaembarque} ) .add( $F{taxaembarque} )
@ -160,7 +160,7 @@ $F{pedagio}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="categoriaTipo" class="java.lang.String"> <variable name="categoriaTipo" class="java.lang.String">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") <variableExpression><![CDATA[$F{tipo}.equals("CANCELADO") || $F{tipo}.equals("DEVOLUCAO") || $F{tipo}.equals("QUITACAO OCD")
? ?
$F{tipo} $F{tipo}
: :

2
web/gui/relatorios/filtroRelatorioCaixaOrgaoConcedente.zul
View File

@ -61,7 +61,7 @@
</row> </row>
<row> <row>
<label <label
value="${c:l('relatorioVendasCartoesController.lb.usuario.value')}" /> value="${c:l('relatorioCaixaOrgaoConcedenteController.lb.nomeBilheteiro.value')}" />
<combobox id="cmbUsuario" <combobox id="cmbUsuario"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario"
mold="rounded" buttonVisible="true" width="100%" /> mold="rounded" buttonVisible="true" width="100%" />