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

bug#11035 

dev: julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@83382 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2018-07-13 21:32:45 +00:00
parent 6e12e657bc
commit d374540aad
8 changed files with 124 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -44,7 +44,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
Date dataDevolucaoInicial = parametros.get("dataDevolucaoInicial") == null ? null : (Date) parametros.get("dataDevolucaoInicial");
Date dataDevolucaoFinal = parametros.get("dataDevolucaoFinal") == null ? null : (Date) parametros.get("dataDevolucaoFinal");
Boolean isApenasBilhetesImpressos = parametros.get("isApenasBilhetesImpressos") == null ? Boolean.FALSE : Boolean.valueOf(parametros.get("isApenasBilhetesImpressos").toString());
Boolean isBpe = (Boolean) parametros.get("isBpe");
String puntoVentas = null;
for (PuntoVenta pv : lsPuntoVenta) {
if (lsPuntoVenta.indexOf(pv) == 0) {
@ -63,7 +64,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
}
}
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal, isApenasBilhetesImpressos);
String sql = getSql(empresaId, puntoVentas, estados, dataVendaInicial, dataVendaFinal, dataDevolucaoInicial, dataDevolucaoFinal, isApenasBilhetesImpressos, isBpe);
log.debug(sql);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@ -130,6 +131,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
db.setIsenta(rset.getInt("ISENTA") == 1);
db.setTotalBilhete(rset.getBigDecimal("TOTAL"));
db.setChbpe((String) rset.getObject("CHBPE"));
db.setChbpeSubstituicao((String) rset.getObject("CHBPE_SUBSTITUICAO"));
db.setValorIcms(BigDecimal.ZERO);
db.setValorIsenta(BigDecimal.ZERO);
@ -215,7 +219,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDev));
}
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos) {
private String getSql(Integer empresaId, String puntoVentas, String estados, Date dataVendaInicial, Date dataVendaFinal, Date dataDevolucaoInicial, Date dataDevolucaoFinal, Boolean isApenasBilhetesImpressos, Boolean isBpe) {
StringBuilder sql = new StringBuilder();
sql.append("SELECT DISTINCT ");
@ -248,6 +252,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append(" NVL(EI.INDTARIFAMUNICIPAL,0) AS INDTARIFAMUNICIPAL, NVL(EI.INDSEGUROMUNICIPAL,0) AS INDSEGUROMUNICIPAL, NVL(EI.INDTXEMBARQUEMUNICIPAL,0) AS INDTXEMBARQUEMUNICIPAL, NVL(EI.INDPEDAGIOMUNICIPAL,0) AS INDPEDAGIOMUNICIPAL, ");
sql.append(" NVL(EI.INDTARIFAESTADUAL,0) AS INDTARIFAESTADUAL, NVL(EI.INDSEGUROESTADUAL,0) AS INDSEGUROESTADUAL, NVL(EI.INDTXEMBARQUEESTADUAL,0) AS INDTXEMBARQUEESTADUAL, NVL(EI.INDPEDAGIOESTDUAL,0) AS INDPEDAGIOESTDUAL, ");
sql.append(" NVL(B.PRECIOPAGADO,0) + NVL(B.IMPORTEOUTROS,0) + NVL(B.IMPORTEPEDAGIO,0) + NVL(B.IMPORTESEGURO,0) + NVL(B.IMPORTETAXAEMBARQUE,0) AS TOTAL ");
sql.append(isBpe ? ", BPE.CHBPE AS CHBPE " : " ");
sql.append(isBpe ? ", BPE.CHBPE_SUBSTITUICAO as CHBPE_SUBSTITUICAO " : " ");
sql.append("FROM BOLETO B ");
sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 ");
sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");
@ -276,6 +282,7 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID AND B.TIPOVENTA_ID = 3 ");
sql.append("LEFT JOIN ESTADO ESAIDF ON ESAIDF.ESTADO_ID = AIDF.ESTADO_ID ");
sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
sql.append(isBpe ? "LEFT JOIN BPE BPE ON BPE.BOLETO_ID = B.BOLETO_ID " : "");
sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
sql.append("AND B.INDSTATUSBOLETO = 'C' ");
sql.append("AND B.INDCANCELACION = 1 ");

4
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_es.properties
View File

@ -31,4 +31,6 @@ label.outras=Outras
label.fechorDevolucao=Dt Devolução
label.impEstornarInterestadual=Receita Interestadual
label.impEstornarIntermunicipal=Receita Intermunicipal
label.impEstornarTotal=ReceitaTotal
label.impEstornarTotal=ReceitaTotal
label.chaveBpe=Chave BPE
label.chaveSubstituicaoBpe=Chave Substituição

4
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetes_pt_BR.properties
View File

@ -31,4 +31,6 @@ label.outras=Outras
label.fechorDevolucao=Dt Devolução
label.impEstornarInterestadual=Receita Interestadual
label.impEstornarIntermunicipal=Receita Intermunicipal
label.impEstornarTotal=ReceitaTotal
label.impEstornarTotal=ReceitaTotal
label.chaveBpe=Chave BPE
label.chaveSubstituicaoBpe=Chave Substituição

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

Binary file not shown.

112
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
View File

@ -1,8 +1,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="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="1.9965000000000006"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.x" value="48"/>
<property name="ireport.y" value="95"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table">
<box>
@ -57,6 +57,8 @@
<field name="estado" class="java.lang.String"/>
<field name="baseCalculoIcms" class="java.math.BigDecimal"/>
<field name="aliquota" class="java.math.BigDecimal"/>
<field name="chbpe" class="java.lang.String"/>
<field name="chbpeSubstituicao" class="java.lang.String"/>
<variable name="vSubTotalIcms" class="java.math.BigDecimal" resetType="Group" resetGroup="data_group" calculation="Sum">
<variableExpression><![CDATA[$F{valorIcms}]]></variableExpression>
</variable>
@ -104,7 +106,7 @@
<groupHeader>
<band height="15">
<textField>
<reportElement x="1" y="0" width="329" height="14" uuid="3055dd3d-ea00-4d23-9a0d-7b86d4b4979f"/>
<reportElement x="1" y="0" width="270" height="14" uuid="3055dd3d-ea00-4d23-9a0d-7b86d4b4979f"/>
<textElement>
<font size="6" isBold="true"/>
</textElement>
@ -118,7 +120,7 @@
<groupHeader>
<band height="15" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="330" height="15" uuid="bf4c40a4-42c9-4450-b86b-14d1afc8c7d6"/>
<reportElement x="0" y="0" width="271" height="15" uuid="bf4c40a4-42c9-4450-b86b-14d1afc8c7d6"/>
<textElement>
<font size="6" isBold="false"/>
</textElement>
@ -146,21 +148,21 @@
<textFieldExpression><![CDATA[$R{label.impEstornarInterestadual}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="271" y="15" width="111" height="14" uuid="ac8a5a5d-6d23-445c-925f-81a506de6e5e"/>
<reportElement x="271" y="15" width="162" height="14" uuid="ac8a5a5d-6d23-445c-925f-81a506de6e5e"/>
<textElement textAlignment="Right">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalEstornoInterestadual}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="271" y="1" width="111" height="14" uuid="824c2026-e1ef-459e-88d3-a746acff0dad"/>
<reportElement x="271" y="1" width="162" height="14" uuid="824c2026-e1ef-459e-88d3-a746acff0dad"/>
<textElement textAlignment="Right">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{vTotalEstornoIntermunicipal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="271" y="29" width="111" height="14" uuid="10545815-fcf1-40b9-b645-7d1e3097cf0c"/>
<reportElement x="271" y="29" width="162" height="14" uuid="10545815-fcf1-40b9-b645-7d1e3097cf0c"/>
<textElement textAlignment="Right">
<font size="6"/>
</textElement>
@ -184,7 +186,7 @@
<groupHeader>
<band height="17">
<textField>
<reportElement x="1" y="0" width="100" height="15" uuid="c92216da-0d77-4711-94a4-b8b2d00465a3"/>
<reportElement x="1" y="0" width="270" height="15" uuid="c92216da-0d77-4711-94a4-b8b2d00465a3"/>
<textElement>
<font size="6" isBold="false"/>
</textElement>
@ -196,7 +198,7 @@
</band>
</groupHeader>
<groupFooter>
<band height="15">
<band height="16">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="541" y="1" width="74" height="14" uuid="67bdceb4-d6ed-42c5-871f-d809ffec832b"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
@ -205,7 +207,7 @@
<textFieldExpression><![CDATA[$V{vSubTotalBaseCalculoIcms}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="447" y="1" width="94" height="14" uuid="943bc881-8248-4da5-999a-62b2f67a573a"/>
<reportElement x="527" y="1" width="51" height="14" uuid="943bc881-8248-4da5-999a-62b2f67a573a"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -222,7 +224,7 @@
<textFieldExpression><![CDATA[$V{vSubTotalIcms}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="1" y="1" width="187" height="13" uuid="bbb5fed7-d553-42f3-9d90-4e548e0b7b38"/>
<reportElement x="1" y="1" width="214" height="13" uuid="bbb5fed7-d553-42f3-9d90-4e548e0b7b38"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -262,7 +264,7 @@
<reportElement x="1" y="62" width="800" height="1" uuid="d9b398e6-2fe9-4a3d-bceb-f9db7a06e5a9"/>
</line>
<textField>
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1" y="63" width="43" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="11b7c338-166a-4149-b45c-b47698bd88ea"/>
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="1" y="63" width="65" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="11b7c338-166a-4149-b45c-b47698bd88ea"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -270,14 +272,14 @@
<textFieldExpression><![CDATA[$R{label.filtros}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="46" y="63" width="756" height="14" uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f"/>
<reportElement stretchType="RelativeToTallestObject" x="66" y="63" width="736" height="14" uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f"/>
<textElement verticalAlignment="Top">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Transparent" x="2" y="17" width="66" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="7f1538d0-be50-4597-bfce-dfc18da5c67a"/>
<reportElement mode="Transparent" x="2" y="17" width="92" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="7f1538d0-be50-4597-bfce-dfc18da5c67a"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -285,7 +287,7 @@
<textFieldExpression><![CDATA[$R{label.periodo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement mode="Transparent" x="94" y="32" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="99f1035a-c3a6-42f8-beac-8a0bfe8aff08"/>
<reportElement mode="Transparent" x="94" y="32" width="61" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="99f1035a-c3a6-42f8-beac-8a0bfe8aff08"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -293,7 +295,7 @@
<textFieldExpression><![CDATA[$P{dataVendaInicial}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement mode="Transparent" x="164" y="32" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="e13f41e4-5a62-4bf8-81cf-7a64e2cd8a5e"/>
<reportElement mode="Transparent" x="215" y="32" width="56" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="e13f41e4-5a62-4bf8-81cf-7a64e2cd8a5e"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -311,7 +313,7 @@
<textFieldExpression><![CDATA[$R{label.periodoDevolucao}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="145" y="47" width="19" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="d9fcac2b-0936-47f7-8653-23342d1373a1">
<reportElement mode="Transparent" x="155" y="47" width="60" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="d9fcac2b-0936-47f7-8653-23342d1373a1">
<printWhenExpression><![CDATA[$P{dataDevolucaoFinal} != null]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
@ -329,7 +331,7 @@
<textFieldExpression><![CDATA[$R{label.periodoVenda}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement mode="Transparent" x="94" y="47" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="9351a4b9-fbc4-4438-bf64-a88c7bb58838"/>
<reportElement mode="Transparent" x="94" y="47" width="61" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="9351a4b9-fbc4-4438-bf64-a88c7bb58838"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -337,7 +339,7 @@
<textFieldExpression><![CDATA[$P{dataDevolucaoInicial}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="145" y="32" width="19" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="96e671b8-e26f-4603-b629-456db24a1203">
<reportElement mode="Transparent" x="155" y="32" width="60" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="96e671b8-e26f-4603-b629-456db24a1203">
<printWhenExpression><![CDATA[$P{dataVendaFinal} != null]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
@ -347,7 +349,7 @@
<textFieldExpression><![CDATA[$R{label.ate}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement mode="Transparent" x="164" y="47" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="5ae8525f-9db9-4192-b64c-b28c27e72351"/>
<reportElement mode="Transparent" x="215" y="47" width="56" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="5ae8525f-9db9-4192-b64c-b28c27e72351"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -363,7 +365,7 @@
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="602" y="17" width="179" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
<reportElement mode="Transparent" x="578" y="17" width="203" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4b6e9016-c490-4abc-a659-fc73eb24a93a"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -371,7 +373,7 @@
<textFieldExpression><![CDATA[$R{label.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{label.de}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="602" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
<reportElement mode="Transparent" x="578" y="33" width="223" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="12e51d0a-4fd5-4dff-95f5-762d8e3bf1f0"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -379,7 +381,7 @@
<textFieldExpression><![CDATA[$R{label.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="602" y="1" width="82" height="15" uuid="4ac1cdfd-5dfa-4ce7-b9dd-2f193149c8c2"/>
<reportElement x="578" y="1" width="106" height="15" uuid="4ac1cdfd-5dfa-4ce7-b9dd-2f193149c8c2"/>
<textElement textAlignment="Right">
<font size="6" isBold="true"/>
</textElement>
@ -409,21 +411,21 @@
</graphicElement>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="242" y="1" width="75" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
<textElement verticalAlignment="Middle" markup="none">
<reportElement stretchType="RelativeToTallestObject" x="215" y="1" width="56" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.aidf}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="382" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
<reportElement stretchType="RelativeToTallestObject" x="487" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.serieSubs}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="541" y="1" width="74" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="578" y="1" width="37" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0b598d85-e93d-4916-b9a1-c80e694aabb6"/>
<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -447,14 +449,14 @@
<textFieldExpression><![CDATA[$R{label.icms}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="447" y="1" width="94" height="14" isPrintWhenDetailOverflows="true" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/>
<reportElement stretchType="RelativeToTallestObject" x="527" y="1" width="51" height="14" isPrintWhenDetailOverflows="true" uuid="ed400846-62e0-4199-8c0d-c4b7741d934c"/>
<textElement textAlignment="Right" verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.vrContabil}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="317" y="1" width="65" height="14" isPrintWhenDetailOverflows="true" uuid="a46545d1-264f-4dd1-8d6e-fa62df9cf49b"/>
<reportElement stretchType="RelativeToTallestObject" x="433" y="1" width="54" height="14" isPrintWhenDetailOverflows="true" uuid="a46545d1-264f-4dd1-8d6e-fa62df9cf49b"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
@ -482,7 +484,7 @@
<textFieldExpression><![CDATA[$R{label.numpuntoventaOrigem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="87" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/>
<reportElement stretchType="RelativeToTallestObject" x="155" y="1" width="60" height="14" isPrintWhenDetailOverflows="true" uuid="fc142d15-a328-4187-89dc-9d8d4f3dd270"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
@ -504,26 +506,40 @@
</textElement>
<textFieldExpression><![CDATA[$R{label.outras}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="271" y="1" width="72" height="14" isPrintWhenDetailOverflows="true" uuid="2467ecd3-3996-42c6-a2a6-2fc4b5cc1952"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.chaveBpe}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="343" y="1" width="90" height="14" isPrintWhenDetailOverflows="true" uuid="ba1b92a2-ea24-4e4d-b265-dab785c370b0"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.chaveSubstituicaoBpe}]]></textFieldExpression>
</textField>
</band>
</columnHeader>
<detail>
<band height="14">
<textField isBlankWhenNull="true">
<reportElement x="242" y="0" width="75" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
<textElement verticalAlignment="Middle">
<reportElement x="215" y="0" width="56" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="382" y="0" width="65" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
<reportElement x="487" y="0" width="40" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{serieSubSerie}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="447" y="0" width="94" height="14" uuid="b14dbaab-e9a1-4aae-a12c-6305da9d2f80"/>
<reportElement x="527" y="0" width="51" height="14" uuid="b14dbaab-e9a1-4aae-a12c-6305da9d2f80"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -537,7 +553,7 @@
<textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="541" y="0" width="74" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/>
<reportElement x="578" y="0" width="37" height="14" uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -551,7 +567,7 @@
<textFieldExpression><![CDATA[$F{valorIcms}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="317" y="0" width="65" height="14" uuid="46bc3410-c01a-4e91-a8e9-17f02536e23d"/>
<reportElement x="433" y="0" width="54" height="14" uuid="46bc3410-c01a-4e91-a8e9-17f02536e23d"/>
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="false"/>
</textElement>
@ -579,7 +595,7 @@
<textFieldExpression><![CDATA[$F{numpuntoventaOrigem}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement x="155" y="0" width="87" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/>
<reportElement x="155" y="0" width="60" height="14" uuid="c7b4a542-1cfc-4646-a423-53c5ea12d4f3"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -599,6 +615,20 @@
</textElement>
<textFieldExpression><![CDATA[$F{valorOutras}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="271" y="0" width="72" height="14" uuid="39cb41d3-74fe-40fc-9e7b-df47b1e70e3c"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{chbpe}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="343" y="0" width="90" height="14" uuid="55b3e473-a704-4928-a52a-f71221094b21"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{chbpeSubstituicao}]]></textFieldExpression>
</textField>
</band>
</detail>
<lastPageFooter>
@ -614,14 +644,14 @@
<textFieldExpression><![CDATA[$R{label.total}]]></textFieldExpression>
</textField>
<textField>
<reportElement stretchType="RelativeToTallestObject" x="238" y="1" width="59" height="14" uuid="0dcac787-43f7-4e9f-84c8-06567671ddb7"/>
<reportElement stretchType="RelativeToTallestObject" x="271" y="1" width="162" height="14" uuid="0dcac787-43f7-4e9f-84c8-06567671ddb7"/>
<textElement verticalAlignment="Middle">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$V{qtdeBilhetes}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement stretchType="RelativeToTallestObject" x="68" y="1" width="168" height="14" uuid="fba1bd88-a15f-4d9f-93fb-9abbfaa5429e"/>
<reportElement stretchType="RelativeToTallestObject" x="68" y="1" width="203" height="14" uuid="fba1bd88-a15f-4d9f-93fb-9abbfaa5429e"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -631,7 +661,7 @@
<reportElement positionType="Float" x="1" y="16" width="800" height="1" uuid="ff50b0f9-831b-428e-9177-b264920c542b"/>
</line>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="447" y="1" width="94" height="14" uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553"/>
<reportElement stretchType="RelativeToTallestObject" x="433" y="1" width="108" height="14" uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6"/>
</textElement>
@ -670,7 +700,7 @@
<noData>
<band height="22">
<textField>
<reportElement x="97" y="0" width="573" height="20" uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d"/>
<reportElement x="68" y="0" width="602" height="20" uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d"/>
<textElement markup="none">
<font size="6" isBold="true"/>
</textElement>

30
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DevolucaoBilhetes.java
View File

@ -37,6 +37,8 @@ public class DevolucaoBilhetes {
private BigDecimal valorIsenta;
private BigDecimal valorContabil;
private boolean estadual;
private String chbpeSubstituicao;
private String chbpe;
BigDecimal porcMunicipal;
BigDecimal porcEstadual;
@ -44,7 +46,7 @@ public class DevolucaoBilhetes {
BigDecimal estornoEstadual;
private BigDecimal totalBilhete;
private Integer totalQtdeBilhetes;
private Boolean indTarifaMunicipal;
private Boolean indSeguroMunicipal;
private Boolean indTxEmbarqueMunicipal;
@ -286,7 +288,7 @@ public class DevolucaoBilhetes {
public void setValorIsenta(BigDecimal valorIsenta) {
this.valorIsenta = valorIsenta;
}
public BigDecimal getValorContabil() {
return valorContabil;
}
@ -294,7 +296,7 @@ public class DevolucaoBilhetes {
public void setValorContabil(BigDecimal valorContabil) {
this.valorContabil = valorContabil;
}
public BigDecimal getValorOutras() {
return valorContabil.subtract(precioPagado);
}
@ -434,10 +436,26 @@ public class DevolucaoBilhetes {
public void setBaseCalculoIcms(BigDecimal baseCalculoIcms) {
this.baseCalculoIcms = baseCalculoIcms;
}
public String getChbpeSubstituicao() {
return chbpeSubstituicao;
}
public void setChbpeSubstituicao(String chbpeSubstituicao) {
this.chbpeSubstituicao = chbpeSubstituicao;
}
public String getChbpe() {
return chbpe;
}
public void setChbpe(String chbpe) {
this.chbpe = chbpe;
}
public BigDecimal getAliquota() {
if(isEstadual()) {
if(getTributacaoimportacao() == null) {
if (isEstadual()) {
if (getTributacaoimportacao() == null) {
return getIcmsInterestadual();
} else {
return getTributacaoimportacao();

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDevolucaoBilhetesController.java
View File

@ -18,6 +18,7 @@ import org.springframework.stereotype.Controller;
import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Bandbox;
import org.zkoss.zul.Checkbox;
@ -85,6 +86,7 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
private Radio rConsolidado;
private Checkbox chkApenasBilhetesImpressos;
private boolean isBpe;
private void executarPesquisa() {
HibernateSearchObject<PuntoVenta> puntoVentaBusqueda = new HibernateSearchObject<PuntoVenta>(PuntoVenta.class,
@ -132,6 +134,7 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
}
parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getClaveUsuario());
parametros.put("isBpe", isBpe);
filtro.append("Agência(s): ");
if (puntoVentaSelList.getListData().size() > 0) {
@ -202,6 +205,9 @@ public class RelatorioDevolucaoBilhetesController extends MyGenericForwardCompos
puntoVentaSelList.setItemRenderer(new RenderPuntoVentaSimple());
estadoList.setData(lsEstado);
isBpe = Executions.getCurrent().getArg().get("isRelatorioFinanceiroBpe") == null ? Boolean.FALSE : (Boolean) Executions.getCurrent().getArg().get("isRelatorioFinanceiroBpe");
}

8
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorio/bpe/ItemMenuBpeDevolucao.java
View File

@ -1,5 +1,7 @@
package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorio.bpe;
import java.util.Map;
import org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
@ -18,8 +20,12 @@ public class ItemMenuBpeDevolucao extends DefaultItemMenuSistema {
@Override
public void ejecutar() {
Map map = getArgs();
map.put("isRelatorioFinanceiroBpe", Boolean.TRUE);
PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioDevolucaoBilhetes.zul",
Labels.getLabel("indexController.mnSubMenuBpeFiscal.devolucion.label"), getArgs(), desktop);
Labels.getLabel("indexController.mnSubMenuBpeFiscal.devolucion.label"), map, desktop);
}
}