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

fixes bug #8086 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@61515 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-10-11 18:30:38 +00:00
parent 5d458c9ed8
commit 70a0df05bb
4 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java
View File

@ -66,11 +66,14 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
Connection conexao = this.relatorio.getConexao(); Connection conexao = this.relatorio.getConexao();
processarVendasPacote(conexao); processarVendasPacote(conexao);
if(situacaoBilheteId == null || !CANCELADOS.equals(situacaoBilheteId)) { /* Caso o filtro de data de venda de pacote seja informado, não trazer bilhetes avulsos */
processarVendasAvulsas(conexao); if(fecPacoteInicio == null && fecPacoteFinal == null) {
} if(situacaoBilheteId == null || !CANCELADOS.equals(situacaoBilheteId)) {
if(situacaoBilheteId == null || CANCELADOS.equals(situacaoBilheteId)) { processarVendasAvulsas(conexao);
processarVendasAvulsasCancelados(conexao); }
if(situacaoBilheteId == null || CANCELADOS.equals(situacaoBilheteId)) {
processarVendasAvulsasCancelados(conexao);
}
} }
processarVendasPacoteTotais(); processarVendasPacoteTotais();
@ -217,8 +220,12 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, R.NUMRUTA, R.DESCRUTA, PC.NOMCONVENIO, TTP.DESCTIPOTARIFA, VP.SITUACAO, ") sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, R.NUMRUTA, R.DESCRUTA, PC.NOMCONVENIO, TTP.DESCTIPOTARIFA, VP.SITUACAO, ")
.append("SUM(CASE WHEN B.MOTIVOCANCELACION_ID = 16 THEN 1 ELSE 0 END) AS QTDEIMPRESSO, ") .append("SUM(CASE WHEN B.MOTIVOCANCELACION_ID = 16 THEN 1 ELSE 0 END) AS QTDEIMPRESSO, ")
.append("COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDE, SUM(B.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(B.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ") .append("COUNT(TVP.TARIFAVENDAPACOTE_ID) AS QTDE, SUM(T.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(T.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ")
.append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(B.PRECIOBASE - B.PRECIOPAGADO) AS DESCONTO, ") .append("SUM(NVL(T.IMPORTEOUTROS,0)) AS SIMPORTEOUTROS, SUM(NVL(T.IMPORTESEGURO,0)) AS SIMPORTESEGURO, SUM(NVL(B.PRECIOBASE,0)) AS SPRECIOBASE, ")
.append(" SUM( ")
.append(" B.PRECIOBASE+NVL(T.IMPORTETAXAEMBARQUE,0)+NVL(T.IMPORTEPEDAGIO,0)+NVL(T.IMPORTESEGURO,0)+NVL(T.IMPORTEOUTROS,0)- ")
.append(" B.PRECIOPAGADO-NVL(B.IMPORTETAXAEMBARQUE,0)-NVL(B.IMPORTEPEDAGIO,0)-NVL(B.IMPORTESEGURO,0)-NVL(B.IMPORTEOUTROS,0) ")
.append(" ) AS DESCONTO, ")
.append("'PACOTE' AS TIPOVENDA ") .append("'PACOTE' AS TIPOVENDA ")
.append("FROM VENDA_PACOTE VP ") .append("FROM VENDA_PACOTE VP ")
.append("INNER JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID AND P.ACTIVO = 1 ") .append("INNER JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID AND P.ACTIVO = 1 ")
@ -230,6 +237,14 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
.append("LEFT JOIN PACOTE_TARIFA PT ON PT.PACOTETARIFA_ID = TVP.PACOTETARIFA_ID ") .append("LEFT JOIN PACOTE_TARIFA PT ON PT.PACOTETARIFA_ID = TVP.PACOTETARIFA_ID ")
.append("LEFT JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ") .append("LEFT JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ")
.append("LEFT JOIN PACOTE_CONVENIO PC ON PC.PACOTECONVENIO_ID = TVP.PACOTECONVENIO_ID AND PC.ACTIVO = 1 ") .append("LEFT JOIN PACOTE_CONVENIO PC ON PC.PACOTECONVENIO_ID = TVP.PACOTECONVENIO_ID AND PC.ACTIVO = 1 ")
.append("LEFT JOIN VIGENCIA_TARIFA VT ON B.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ")
.append("LEFT JOIN TARIFA T ON T.RUTA_ID = B.RUTA_ID ")
.append(" AND T.DESTINO_ID = B.DESTINO_ID ")
.append(" AND T.ORIGEN_ID = B.ORIGEN_ID ")
.append(" AND T.CLASESERVICIO_ID = B.CLASESERVICIO_ID ")
.append(" AND T.ACTIVO = 1 ")
.append(" AND VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID ")
.append(" AND T.ORGAOCONCEDENTE_ID = R.ORGAOCONCEDENTE_ID ")
.append("WHERE 1=1 "); .append("WHERE 1=1 ");
if(fecVendaInicio != null) { if(fecVendaInicio != null) {
@ -406,7 +421,7 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, ") sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, ")
.append("CAT.DESCCATEGORIA AS DESCTIPOTARIFA, R.NUMRUTA, R.DESCRUTA, NULL AS SITUACAO, 1 AS QTDEIMPRESSO, NULL AS NOMCONVENIO, 'AVULSO' AS TIPOVENDA, ") .append("CAT.DESCCATEGORIA AS DESCTIPOTARIFA, R.NUMRUTA, R.DESCRUTA, NULL AS SITUACAO, 1 AS QTDEIMPRESSO, NULL AS NOMCONVENIO, 'AVULSO' AS TIPOVENDA, ")
.append("COUNT(B.BOLETO_ID) AS QTDE, SUM(B.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(B.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ") .append("COUNT(B.BOLETO_ID) AS QTDE, SUM(B.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(B.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ")
.append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(B.PRECIOBASE - B.PRECIOPAGADO) AS DESCONTO ") .append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(NVL(B.DESCUENTOAMPARADO,0)) AS DESCONTO ")
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ") .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ")
.append("LEFT JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ") .append("LEFT JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ")

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

Binary file not shown.

12
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.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="RelatorioVendasPacotesBoletosItem" pageWidth="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc"> <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="RelatorioVendasPacotesBoletosItem" pageWidth="802" pageHeight="555" orientation="Landscape" columnWidth="802" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f17327a0-45d8-4ec1-8350-688df66785dc">
<property name="ireport.zoom" value="3.0"/> <property name="ireport.zoom" value="3.0"/>
<property name="ireport.x" value="1662"/> <property name="ireport.x" value="1326"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<field name="nomconvenio" class="java.lang.String"/> <field name="nomconvenio" class="java.lang.String"/>
<field name="desctipotarifa" class="java.lang.String"/> <field name="desctipotarifa" class="java.lang.String"/>
@ -11,7 +11,7 @@
<field name="simporteoutros" class="java.math.BigDecimal"/> <field name="simporteoutros" class="java.math.BigDecimal"/>
<field name="simporteseguro" class="java.math.BigDecimal"/> <field name="simporteseguro" class="java.math.BigDecimal"/>
<field name="desconto" class="java.math.BigDecimal"/> <field name="desconto" class="java.math.BigDecimal"/>
<field name="spreciopagado" class="java.math.BigDecimal"/> <field name="spreciototalComDesconto" class="java.math.BigDecimal"/>
<field name="spreciobase" class="java.math.BigDecimal"/> <field name="spreciobase" class="java.math.BigDecimal"/>
<field name="spreciototal" class="java.math.BigDecimal"/> <field name="spreciototal" class="java.math.BigDecimal"/>
<field name="cancelado" class="java.lang.Boolean"/> <field name="cancelado" class="java.lang.Boolean"/>
@ -36,8 +36,8 @@
<variable name="vDesconto" class="java.math.BigDecimal" calculation="Sum"> <variable name="vDesconto" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{desconto}]]></variableExpression> <variableExpression><![CDATA[$F{desconto}]]></variableExpression>
</variable> </variable>
<variable name="vSpreciopagado" class="java.math.BigDecimal" calculation="Sum"> <variable name="vSpreciototalComDesconto" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{spreciopagado}]]></variableExpression> <variableExpression><![CDATA[$F{spreciototalComDesconto}]]></variableExpression>
</variable> </variable>
<variable name="vSpreciobase" class="java.math.BigDecimal" calculation="Sum"> <variable name="vSpreciobase" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{spreciobase}]]></variableExpression> <variableExpression><![CDATA[$F{spreciobase}]]></variableExpression>
@ -263,7 +263,7 @@
<textElement textAlignment="Right" verticalAlignment="Top"> <textElement textAlignment="Right" verticalAlignment="Top">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{spreciopagado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{spreciototalComDesconto}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="533" y="2" width="51" height="20" isPrintWhenDetailOverflows="true" uuid="d81fe2cf-b81c-4f65-939c-6c7d54559360"/> <reportElement stretchType="RelativeToTallestObject" x="533" y="2" width="51" height="20" isPrintWhenDetailOverflows="true" uuid="d81fe2cf-b81c-4f65-939c-6c7d54559360"/>
@ -419,7 +419,7 @@
<textElement textAlignment="Right" verticalAlignment="Top"> <textElement textAlignment="Right" verticalAlignment="Top">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{vSpreciopagado}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vSpreciototalComDesconto}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement positionType="Float" x="0" y="23" width="802" height="1" forecolor="#CCCCCC" uuid="c6e12c1d-d6b0-406e-ab03-5e73d69c3dda"/> <reportElement positionType="Float" x="0" y="23" width="802" height="1" forecolor="#CCCCCC" uuid="c6e12c1d-d6b0-406e-ab03-5e73d69c3dda"/>

14
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesBoletosBean.java
View File

@ -121,14 +121,6 @@ public class RelatorioVendasPacotesBoletosBean {
this.desconto = desconto; this.desconto = desconto;
} }
public BigDecimal getSpreciopagado() {
BigDecimal spreciopagado = BigDecimal.ZERO;
spreciopagado = getSpreciototal();
spreciopagado = desconto != null ? spreciopagado.subtract(desconto) : spreciopagado;
return spreciopagado;
}
public BigDecimal getSpreciototal() { public BigDecimal getSpreciototal() {
BigDecimal spreciototal = BigDecimal.ZERO; BigDecimal spreciototal = BigDecimal.ZERO;
@ -141,6 +133,12 @@ public class RelatorioVendasPacotesBoletosBean {
return spreciototal; return spreciototal;
} }
public BigDecimal getSpreciototalComDesconto() {
BigDecimal spreciototalComDesconto = getSpreciototal();
spreciototalComDesconto = desconto != null ? spreciototalComDesconto.subtract(desconto) : spreciototalComDesconto;
return spreciototalComDesconto;
}
public BigDecimal getSpreciobase() { public BigDecimal getSpreciobase() {
return spreciobase; return spreciobase;
} }