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

fixes bug #9608 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73018 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-08-24 01:41:17 +00:00
parent 1b68644802
commit 1ca6364bc0
7 changed files with 86 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java
View File

@ -79,32 +79,10 @@ public class RelatorioFolioRmd extends Relatorio {
} }
private String getSqlRMDReporte() { private String getSqlRMDReporte() {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("select foliormd as foliormd, ");
sql.append(" 'IMPRESSO' as status, ");
sql.append(" coalesce(r4.datamov, to_char(b.fechorventa, 'yyyymmdd')) as fechorfolio, ");
sql.append(" e.nombempresa as empresa, ");
sql.append(" eo.cveestado as uf, ");
sql.append(" eo.nombestado as estado, ");
sql.append(" ai.docfiscal as doc, ");
sql.append(" case when b.tipoventa_id <> 3 then 'ECF' else 'BPR' end as tipo ");
sql.append("from boleto b ");
sql.append(" left join fiscal_r4 r4 on r4.boleto_id = b.boleto_id ");
sql.append(" inner join aidf ai on b.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 ");
sql.append(" inner join marca m on b.marca_id = m.marca_id and ai.empresa_id = m.empresa_id ");
sql.append(" inner join empresa e on e.empresa_id = m.empresa_id ");
sql.append(" inner join parada po on po.parada_id = b.origen_id ");
sql.append(" inner join ciudad co on co.ciudad_id = po.ciudad_id and co.estado_id = ai.estado_id ");
sql.append(" join estado eo on eo.estado_id = co.estado_id ");
sql.append("where ai.empresa_id = :empresaId and ai.aidf_id = :rmdId and ai.estado_id = :estadoId ");
sql.append("group by foliormd, ");
sql.append("coalesce( r4.datamov, to_char(b.fechorventa, 'yyyymmdd')), e.nombempresa, eo.cveestado,eo.nombestado, ");
sql.append("ai.docfiscal, case when b.tipoventa_id <> 3 then 'ECF' else 'BPR' end ");
sql.append(" ");
sql.append("union ");
sql.append(" ");
sql.append("select f.folio as foliormd, "); sql.append("select f.folio as foliormd, ");
sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'INATIVO' end as status, "); sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'IMPRESSO' end as status, ");
sql.append(" to_char(f.fechorfolio, 'yyyymmdd') as fechorfolio, "); sql.append(" to_char(f.fechorfolio, 'yyyymmdd') as fechorfolio, ");
sql.append(" e.nombempresa as empresa, "); sql.append(" e.nombempresa as empresa, ");
sql.append(" eo.cveestado as uf, "); sql.append(" eo.cveestado as uf, ");
@ -116,7 +94,7 @@ public class RelatorioFolioRmd extends Relatorio {
sql.append("inner join empresa e on e.empresa_id = f.empresa_id "); sql.append("inner join empresa e on e.empresa_id = f.empresa_id ");
sql.append("join estado eo on eo.estado_id = f.estado_id "); sql.append("join estado eo on eo.estado_id = f.estado_id ");
sql.append("where f.empresa_id = :empresaId and f.rmd_id = :rmdId and f.estado_id = :estadoId "); sql.append("where f.empresa_id = :empresaId and f.rmd_id = :rmdId and f.estado_id = :estadoId ");
sql.append(" "); sql.append(" and f.indinactivo <> 1 and f.activo = 1 ");
sql.append("order by foliormd "); sql.append("order by foliormd ");
return sql.toString(); return sql.toString();

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

Binary file not shown.

46
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml
View File

@ -1,6 +1,6 @@
<?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="RelatorioImpressaoRMD" printOrder="Horizontal" pageWidth="948" pageHeight="730" columnWidth="922" leftMargin="20" rightMargin="6" topMargin="0" bottomMargin="19" uuid="d3d490c9-33e7-4eeb-97cc-1fa9be0f10d4"> <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="RelatorioImpressaoRMD" printOrder="Horizontal" pageWidth="948" pageHeight="730" columnWidth="922" leftMargin="20" rightMargin="6" topMargin="0" bottomMargin="19" uuid="d3d490c9-33e7-4eeb-97cc-1fa9be0f10d4">
<property name="ireport.zoom" value="1.1000000000000052"/> <property name="ireport.zoom" value="0.8264462809917393"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<field name="empresa" class="java.lang.String"/> <field name="empresa" class="java.lang.String"/>
@ -43,49 +43,49 @@
<textField> <textField>
<reportElement x="319" y="0" width="401" height="15" uuid="76bd1c26-ed5d-4155-916b-f90dbdb2b9dc"/> <reportElement x="319" y="0" width="401" height="15" uuid="76bd1c26-ed5d-4155-916b-f90dbdb2b9dc"/>
<textElement> <textElement>
<font fontName="Monospaced" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="319" y="15" width="401" height="15" uuid="1bc67f62-16e9-4681-891c-4d2680466d91"/> <reportElement x="319" y="15" width="401" height="15" uuid="1bc67f62-16e9-4681-891c-4d2680466d91"/>
<textElement> <textElement>
<font fontName="Monospaced" size="10" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="10" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{enderecoEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{enderecoEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="319" y="45" width="401" height="15" uuid="fe223feb-b29e-4f97-b359-272aa857ce87"/> <reportElement x="319" y="45" width="401" height="15" uuid="fe223feb-b29e-4f97-b359-272aa857ce87"/>
<textElement> <textElement>
<font fontName="Monospaced" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{ieEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{ieEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="319" y="30" width="401" height="15" uuid="cc73dace-ff3e-40cf-8292-9519af0108d4"/> <reportElement x="319" y="30" width="401" height="15" uuid="cc73dace-ff3e-40cf-8292-9519af0108d4"/>
<textElement> <textElement>
<font fontName="Monospaced" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{cnpjEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{cnpjEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy"> <textField pattern="dd/MM/yyyy">
<reportElement x="319" y="60" width="401" height="15" uuid="b716c82c-1944-4691-b907-1d194b41ecfd"/> <reportElement x="319" y="60" width="401" height="15" uuid="b716c82c-1944-4691-b907-1d194b41ecfd"/>
<textElement> <textElement>
<font fontName="Monospaced" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="739" y="22" width="185" height="39" uuid="1c447225-9f55-4f72-a269-d29c272ef2a4"/> <reportElement x="739" y="22" width="185" height="39" uuid="1c447225-9f55-4f72-a269-d29c272ef2a4"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font fontName="Monospaced" size="14" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="14" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{folio} != null ? Integer.parseInt($F{folio}) + ($V{PAGE_NUMBER} - 1) : $F{rmd}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{folio} != null ? Integer.parseInt($F{folio}) + ($V{PAGE_NUMBER} - 1) : $F{rmd}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="739" y="67" width="181" height="20" uuid="6de6219d-29c1-43bb-91be-718a93ee5e7b"/> <reportElement x="739" y="67" width="181" height="20" uuid="6de6219d-29c1-43bb-91be-718a93ee5e7b"/>
<textElement> <textElement>
<font fontName="Monospaced" size="13" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="13" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{naturezaOperacao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{naturezaOperacao}]]></textFieldExpression>
</textField> </textField>
@ -100,70 +100,70 @@
<textField> <textField>
<reportElement x="0" y="0" width="29" height="18" uuid="d9a99502-1f1e-4f22-930f-66bd8be3c7f0"/> <reportElement x="0" y="0" width="29" height="18" uuid="d9a99502-1f1e-4f22-930f-66bd8be3c7f0"/>
<textElement> <textElement>
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement x="29" y="0" width="162" height="18" uuid="b8964ae5-2660-4461-926e-8b7734cbe07f"/> <reportElement x="29" y="0" width="162" height="18" uuid="b8964ae5-2660-4461-926e-8b7734cbe07f"/>
<textElement> <textElement>
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="191" y="0" width="51" height="18" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/> <reportElement x="191" y="0" width="51" height="18" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/>
<textElement> <textElement>
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="242" y="0" width="89" height="18" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/> <reportElement x="242" y="0" width="89" height="18" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="331" y="0" width="94" height="18" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/> <reportElement x="331" y="0" width="94" height="18" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="425" y="0" width="42" height="18" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/> <reportElement x="425" y="0" width="42" height="18" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="467" y="0" width="90" height="18" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/> <reportElement x="467" y="0" width="90" height="18" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="633" y="0" width="87" height="18" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/> <reportElement x="633" y="0" width="87" height="18" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement x="720" y="0" width="204" height="18" uuid="7c171d60-9889-4845-89d5-f656e34b1c37"/> <reportElement x="720" y="0" width="204" height="18" uuid="7c171d60-9889-4845-89d5-f656e34b1c37"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="557" y="0" width="76" height="18" uuid="60865331-9449-4435-8b4a-664b747a90b3"/> <reportElement x="557" y="0" width="76" height="18" uuid="60865331-9449-4435-8b4a-664b747a90b3"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{isentos}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{isentos}]]></textFieldExpression>
</textField> </textField>
@ -174,35 +174,35 @@
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="242" y="0" width="89" height="45" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/> <reportElement x="242" y="0" width="89" height="45" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="331" y="0" width="94" height="45" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/> <reportElement x="331" y="0" width="94" height="45" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="467" y="0" width="90" height="45" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/> <reportElement x="467" y="0" width="90" height="45" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="557" y="0" width="76" height="45" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/> <reportElement x="557" y="0" width="76" height="45" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="633" y="0" width="87" height="45" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/> <reportElement x="633" y="0" width="87" height="45" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="Monospaced" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="Monospaced" size="12" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_outros}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_outros}]]></textFieldExpression>
</textField> </textField>

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

Binary file not shown.

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

@ -43,49 +43,49 @@
<textField> <textField>
<reportElement x="316" y="0" width="407" height="15" uuid="76bd1c26-ed5d-4155-916b-f90dbdb2b9dc"/> <reportElement x="316" y="0" width="407" height="15" uuid="76bd1c26-ed5d-4155-916b-f90dbdb2b9dc"/>
<textElement> <textElement>
<font fontName="SansSerif" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="SansSerif" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="316" y="15" width="407" height="15" uuid="1bc67f62-16e9-4681-891c-4d2680466d91"/> <reportElement x="316" y="15" width="407" height="15" uuid="1bc67f62-16e9-4681-891c-4d2680466d91"/>
<textElement> <textElement>
<font fontName="SansSerif" size="10" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="SansSerif" size="10" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{enderecoEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{enderecoEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="316" y="30" width="407" height="15" uuid="fe223feb-b29e-4f97-b359-272aa857ce87"/> <reportElement x="316" y="30" width="407" height="15" uuid="fe223feb-b29e-4f97-b359-272aa857ce87"/>
<textElement> <textElement>
<font fontName="SansSerif" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="SansSerif" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{cnpjEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{cnpjEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="316" y="45" width="407" height="15" uuid="cc73dace-ff3e-40cf-8292-9519af0108d4"/> <reportElement x="316" y="45" width="407" height="15" uuid="cc73dace-ff3e-40cf-8292-9519af0108d4"/>
<textElement> <textElement>
<font fontName="SansSerif" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="SansSerif" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{ieEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{ieEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy"> <textField pattern="dd/MM/yyyy">
<reportElement x="316" y="60" width="407" height="15" uuid="b716c82c-1944-4691-b907-1d194b41ecfd"/> <reportElement x="316" y="60" width="407" height="15" uuid="b716c82c-1944-4691-b907-1d194b41ecfd"/>
<textElement> <textElement>
<font fontName="SansSerif" size="11" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="SansSerif" size="11" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="742" y="22" width="181" height="30" uuid="1c447225-9f55-4f72-a269-d29c272ef2a4"/> <reportElement x="742" y="22" width="181" height="30" uuid="1c447225-9f55-4f72-a269-d29c272ef2a4"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font fontName="SansSerif" size="14" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="SansSerif" size="14" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{folio} != null ? Integer.parseInt($F{folio}) + ($V{PAGE_NUMBER} - 1) : $F{rmd}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{folio} != null ? Integer.parseInt($F{folio}) + ($V{PAGE_NUMBER} - 1) : $F{rmd}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="742" y="67" width="181" height="28" uuid="6de6219d-29c1-43bb-91be-718a93ee5e7b"/> <reportElement x="742" y="67" width="181" height="28" uuid="6de6219d-29c1-43bb-91be-718a93ee5e7b"/>
<textElement> <textElement>
<font fontName="SansSerif" size="13" pdfFontName="Courier-Oblique" isPdfEmbedded="true"/> <font fontName="SansSerif" size="13" pdfFontName="Times-Roman" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{naturezaOperacao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{naturezaOperacao}]]></textFieldExpression>
</textField> </textField>
@ -100,7 +100,7 @@
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="36" height="18" uuid="d9a99502-1f1e-4f22-930f-66bd8be3c7f0"/> <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="36" height="18" uuid="d9a99502-1f1e-4f22-930f-66bd8be3c7f0"/>
<textElement> <textElement>
<font fontName="SansSerif" size="12" isItalic="false" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" isItalic="false" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
<paragraph leftIndent="-10"/> <paragraph leftIndent="-10"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
@ -110,7 +110,7 @@
<printWhenExpression><![CDATA[$F{serie} != null]]></printWhenExpression> <printWhenExpression><![CDATA[$F{serie} != null]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Left"> <textElement textAlignment="Left">
<font fontName="SansSerif" size="12" isItalic="false" isStrikeThrough="false" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" isItalic="false" isStrikeThrough="false" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
<paragraph rightIndent="-25"/> <paragraph rightIndent="-25"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
@ -118,7 +118,7 @@
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="96" y="0" width="73" height="18" isPrintWhenDetailOverflows="true" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/> <reportElement stretchType="RelativeToTallestObject" x="96" y="0" width="73" height="18" isPrintWhenDetailOverflows="true" uuid="b5444b15-beaa-42fb-814d-424acf42b6ab"/>
<textElement textAlignment="Right" rotation="None"> <textElement textAlignment="Right" rotation="None">
<font fontName="SansSerif" size="12" isItalic="false" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" isItalic="false" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
<paragraph lineSpacing="Proportional" leftIndent="-25"/> <paragraph lineSpacing="Proportional" leftIndent="-25"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression>
@ -126,49 +126,49 @@
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="169" y="0" width="92" height="18" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/> <reportElement x="169" y="0" width="92" height="18" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="261" y="0" width="104" height="18" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/> <reportElement x="261" y="0" width="104" height="18" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="365" y="0" width="40" height="18" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/> <reportElement x="365" y="0" width="40" height="18" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="405" y="0" width="93" height="18" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/> <reportElement x="405" y="0" width="93" height="18" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="608" y="0" width="115" height="18" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/> <reportElement x="608" y="0" width="115" height="18" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement x="723" y="0" width="200" height="18" uuid="7c171d60-9889-4845-89d5-f656e34b1c37"/> <reportElement x="723" y="0" width="200" height="18" uuid="7c171d60-9889-4845-89d5-f656e34b1c37"/>
<textElement textAlignment="Center"> <textElement textAlignment="Center">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="498" y="0" width="110" height="18" uuid="60865331-9449-4435-8b4a-664b747a90b3"/> <reportElement x="498" y="0" width="110" height="18" uuid="60865331-9449-4435-8b4a-664b747a90b3"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{isentos}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{isentos}]]></textFieldExpression>
</textField> </textField>
@ -179,35 +179,35 @@
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="169" y="0" width="92" height="45" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/> <reportElement x="169" y="0" width="92" height="45" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="261" y="0" width="104" height="45" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/> <reportElement x="261" y="0" width="104" height="45" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="405" y="0" width="93" height="45" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/> <reportElement x="405" y="0" width="93" height="45" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="498" y="0" width="110" height="45" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/> <reportElement x="498" y="0" width="110" height="45" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="608" y="0" width="115" height="45" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/> <reportElement x="608" y="0" width="115" height="45" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="12" pdfFontName="Courier-Oblique" isPdfEmbedded="false"/> <font fontName="SansSerif" size="12" pdfFontName="Times-Roman" isPdfEmbedded="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_outros}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_outros}]]></textFieldExpression>
</textField> </textField>

41
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java
View File

@ -1,6 +1,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.impressaofiscal; package com.rjconsultores.ventaboletos.web.gui.controladores.impressaofiscal;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -70,6 +71,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
private Datebox datInicial; private Datebox datInicial;
private Datebox datFinal; private Datebox datFinal;
private MyTextbox folioInicial; private MyTextbox folioInicial;
private MyTextbox folioFim;
private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEmpresa;
private MyComboboxEstandar cmbEstado; private MyComboboxEstandar cmbEstado;
@ -153,35 +155,48 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
return; return;
} }
String folio = folioInicial.getValue(); String inicioRmd = folioInicial.getValue();
if (StringUtils.isBlank(folio)) { if (StringUtils.isBlank(inicioRmd)) {
Messagebox.show( Messagebox.show(
Labels.getLabel("busquedaImpressaoRMDController.select.RMD"), Labels.getLabel("busquedaImpressaoRMDController.select.RMD"),
Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"),
Messagebox.OK, Messagebox.INFORMATION); Messagebox.OK, Messagebox.INFORMATION);
return; return;
} else if (!(isCancelarRmd || isInativarRmd) && !aidfService.vaidaRMDUtilizado(aidf.getAidfId(), empresa.getEmpresaId(), estado.getEstadoId(), inicioRmd)) {
Messagebox.show(
"Folio já utilizado.",
Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"),
Messagebox.OK, Messagebox.INFORMATION);
return;
} }
List<ImpressaoRMD> list = null; List<ImpressaoRMD> list = null;
if (!isCancelarRmd && !isInativarRmd && radBPR.isChecked()) { if (!isCancelarRmd && !isInativarRmd && radBPR.isChecked()) {
list = fiscalService.getRegistroImpressaoRMDTipoBPR(datInicial.getValue(), datFinal.getValue(), list = fiscalService.getRegistroImpressaoRMDTipoBPR(datInicial.getValue(), datFinal.getValue(),
empresa, estado, rmd, folio); empresa, estado, rmd, inicioRmd);
} else if (!isCancelarRmd && !isInativarRmd && radECF.isChecked()) { } else if (!isCancelarRmd && !isInativarRmd && radECF.isChecked()) {
list = fiscalService.getRegistroImpressaoRMDTipoECF(datInicial.getValue(), datFinal.getValue(), list = fiscalService.getRegistroImpressaoRMDTipoECF(datInicial.getValue(), datFinal.getValue(),
empresa, estado, rmd, folio); empresa, estado, rmd, inicioRmd);
} }
if (isExecutarRmd) if (isExecutarRmd)
fiscalService.gravarRMDBoleto(list, aidf, folio); fiscalService.gravarRMDBoleto(list, aidf, inicioRmd, empresa, estado, radECF.isChecked(), radBPR.isChecked());
String fimRmd = folioFim == null ? null : folioFim.getValue();
if (isCancelarRmd || isInativarRmd) { if (isCancelarRmd || isInativarRmd) {
fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, folio,
if (StringUtils.isBlank(fimRmd))
fimRmd = inicioRmd;
fiscalService.cancelarRMDBoleto(datInicial.getValue(), datFinal.getValue(), empresa, estado, aidf, inicioRmd, fimRmd,
isCancelarRmd, isInativarRmd, radECF.isChecked(), radBPR.isChecked()); isCancelarRmd, isInativarRmd, radECF.isChecked(), radBPR.isChecked());
Messagebox.show( Messagebox.show(
Labels.getLabel("busquedaImpressaoRMDController.cancel.msg"), Labels.getLabel("busquedaImpressaoRMDController.cancel.msg"),
Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"),
Messagebox.OK, Messagebox.INFORMATION); Messagebox.OK, Messagebox.INFORMATION);
limparFiltro();
return; return;
} }
@ -203,6 +218,9 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
Labels.getLabel("indexController.mnImpressaoRMD.label"), args, MODAL); Labels.getLabel("indexController.mnImpressaoRMD.label"), args, MODAL);
} }
if (isExecutarRmd)
limparFiltro();
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error("", e); log.error("", e);
} catch (WrongValueException e) { } catch (WrongValueException e) {
@ -256,6 +274,17 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
executarImpressao(false, false, false, true); executarImpressao(false, false, false, true);
} }
private void limparFiltro() {
folioInicial.setValue(null);
folioFim.setValue(null);
cmbEmpresa.setSelectedItem(null);
cmbEstado.setSelectedItem(null);
cmbAidf.setSelectedItem(null);
lsAidf = new ArrayList<Aidf>();
}
public List<Empresa> getLsEmpresa() { public List<Empresa> getLsEmpresa() {
return lsEmpresa; return lsEmpresa;
} }

4
web/gui/impressaofiscal/busquedaImpressaoRMD.zul
View File

@ -73,11 +73,13 @@
label="Layout Novo" /> label="Layout Novo" />
</row> </row>
<row spans="1, 3"> <row spans="1, 1, 2">
<label <label
value="${c:l('busquedaImpressaoRMDController.labelfolio.RMD')}" /> value="${c:l('busquedaImpressaoRMDController.labelfolio.RMD')}" />
<textbox id="folioInicial" <textbox id="folioInicial"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" /> use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
<textbox id="folioFim"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
</row> </row>
</rows> </rows>