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

Merge pull request 'fixes bug#AL-2027' (#51) from AL-2027 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/51
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Wilian Domingues <wilian@rjconsultores.com.br>
master 1.0.41
fabio 2023-01-17 20:43:39 +00:00
parent 10539c2414 2bb84f080b
commit 80079c1a22
9 changed files with 125 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.0.39</version> <version>1.0.40</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.0.24</modelWeb.version> <modelWeb.version>1.0.25</modelWeb.version>
<flyway.version>1.0.14</flyway.version> <flyway.version>1.0.15</flyway.version>
</properties> </properties>
<distributionManagement> <distributionManagement>

19
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java
View File

@ -82,7 +82,6 @@ public class RelatorioEstornoCartao extends Relatorio {
dataResult.put("descmotivo", rset.getString("descmotivo")); dataResult.put("descmotivo", rset.getString("descmotivo"));
dataResult.put("adquirente", rset.getString("adquirente")); dataResult.put("adquirente", rset.getString("adquirente"));
dataResult.put("estabelecimento", rset.getString("estabelecimento")); dataResult.put("estabelecimento", rset.getString("estabelecimento"));
dataResult.put("nsuhost", rset.getString("nsuhost"));
this.dados.add(dataResult); this.dados.add(dataResult);
@ -137,21 +136,7 @@ public class RelatorioEstornoCartao extends Relatorio {
sql.append(" AND c.corrida_id = dec.corrida_id "); sql.append(" AND c.corrida_id = dec.corrida_id ");
sql.append(" AND c.numfoliosistema = dec.numfoliosistema "); sql.append(" AND c.numfoliosistema = dec.numfoliosistema ");
sql.append(" AND c.indreimpresion = 1 "); sql.append(" AND c.indreimpresion = 1 ");
sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo, "); sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo ");
//SubSelect para evitar duplicacao dos registros por causa do join com a caja
sql.append(" COALESCE(( select ct.nsuhost ");
sql.append(" from caja c inner join caja_formapago cfp on cfp.caja_id = c.caja_id ");
sql.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id ");
sql.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id ");
sql.append(" inner join forma_pago fp on fp.formapago_id = cfp.formapago_id ");
sql.append(" where ");
sql.append(" c.numoperacion = dec.numoperacion ");
sql.append(" AND c.origen_id = dec.origen_id ");
sql.append(" AND c.destino_id = dec.destino_id ");
sql.append(" AND c.corrida_id = dec.corrida_id ");
sql.append(" AND coalesce( ct.nsuhost, '0') <> '0' ");
sql.append(" AND rownum = 1), '') as nsuhost ");
sql.append(" FROM "); sql.append(" FROM ");
@ -202,7 +187,7 @@ public class RelatorioEstornoCartao extends Relatorio {
} }
sql.append(" AND DEC.FECREGISTRO BETWEEN :data_inicial AND :data_final "); sql.append(" AND DEC.FECREGISTRO BETWEEN :data_inicial AND :data_final ");
sql.append(" ORDER BY e.nombempresa, DEC.FECREGISTRO "); sql.append(" ORDER BY DEC.FECREGISTRO ");
return sql.toString(); return sql.toString();
} }

1
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties
View File

@ -36,4 +36,3 @@ formaPago.label=Forma de Pagamento
pontoDeventa.label=Ponto de Venda pontoDeventa.label=Ponto de Venda
estabelecimento.label=Estab. estabelecimento.label=Estab.
adquirente.label=Adquirente adquirente.label=Adquirente
nsuhost.label=NSU/Host

1
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties
View File

@ -37,4 +37,3 @@ pontoDeventa.label=Ponto de Venda
motivoCancelamento.label=Motivo Cancelamento motivoCancelamento.label=Motivo Cancelamento
estabelecimento.label=Estab. estabelecimento.label=Estab.
adquirente.label=Adquirente adquirente.label=Adquirente
nsuhost.label=NSU/Host

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

Binary file not shown.

219
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml
View File

@ -44,9 +44,6 @@
<field name="estabelecimento" class="java.lang.String"> <field name="estabelecimento" class="java.lang.String">
<fieldDescription><![CDATA[Estabelecimento]]></fieldDescription> <fieldDescription><![CDATA[Estabelecimento]]></fieldDescription>
</field> </field>
<field name="nsuhost" class="java.lang.String">
<fieldDescription><![CDATA[NsuHost]]></fieldDescription>
</field>
<group name="empresa" isStartNewPage="true" isReprintHeaderOnEachPage="true" minHeightToStartNewPage="150"> <group name="empresa" isStartNewPage="true" isReprintHeaderOnEachPage="true" minHeightToStartNewPage="150">
<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression> <groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
<groupHeader> <groupHeader>
@ -67,180 +64,173 @@
<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="6d606a89-ef32-44fa-a1ae-6b9c0179e3ac" stretchType="RelativeToTallestObject" x="66" y="27" width="25" height="20"/> <reportElement uuid="6d606a89-ef32-44fa-a1ae-6b9c0179e3ac" stretchType="RelativeToTallestObject" x="32" y="27" width="25" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{agencia.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{agencia.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="78789f48-2720-4a0f-8200-48c7168dcc20" stretchType="RelativeToTallestObject" x="91" y="27" width="30" height="20"/> <reportElement uuid="78789f48-2720-4a0f-8200-48c7168dcc20" stretchType="RelativeToTallestObject" x="57" y="27" width="30" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{bilheteiro.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{bilheteiro.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="75e8fd92-595b-4031-9583-95cbe3b0b8aa" stretchType="RelativeToTallestObject" x="121" y="27" width="35" height="20"/> <reportElement uuid="75e8fd92-595b-4031-9583-95cbe3b0b8aa" stretchType="RelativeToTallestObject" x="87" y="27" width="35" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{data.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{data.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="801625b5-a4f7-4052-80cb-ced378ba6756" stretchType="RelativeToTallestObject" x="195" y="27" width="30" height="20"/> <reportElement uuid="801625b5-a4f7-4052-80cb-ced378ba6756" stretchType="RelativeToTallestObject" x="161" y="27" width="30" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{cpf.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cpf.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="fdefd76d-7c9d-4674-ae4b-24e3bc6b1e8f" stretchType="RelativeToTallestObject" x="156" y="27" width="39" height="20"/> <reportElement uuid="fdefd76d-7c9d-4674-ae4b-24e3bc6b1e8f" stretchType="RelativeToTallestObject" x="122" y="27" width="39" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{cliente.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cliente.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="26e5eeeb-ff3d-41ea-9978-2c04418120b2" stretchType="RelativeToTallestObject" x="225" y="27" width="40" height="20"/> <reportElement uuid="26e5eeeb-ff3d-41ea-9978-2c04418120b2" stretchType="RelativeToTallestObject" x="191" y="27" width="40" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{email.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{email.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="bb82a4ef-15b6-4284-9160-9714da3579bb" stretchType="RelativeToTallestObject" x="265" y="27" width="28" height="20"/> <reportElement uuid="bb82a4ef-15b6-4284-9160-9714da3579bb" stretchType="RelativeToTallestObject" x="231" y="27" width="28" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{telefone.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{telefone.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="b5679ed7-3404-4a11-ad22-d1460be15ba1" stretchType="RelativeToTallestObject" x="355" y="27" width="35" height="20"/> <reportElement uuid="b5679ed7-3404-4a11-ad22-d1460be15ba1" stretchType="RelativeToTallestObject" x="321" y="27" width="35" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{cartao.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cartao.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="ee1b4575-d301-457c-bfc3-0c78550ac894" stretchType="RelativeToTallestObject" x="390" y="27" width="56" height="20"/> <reportElement uuid="ee1b4575-d301-457c-bfc3-0c78550ac894" stretchType="RelativeToTallestObject" x="356" y="27" width="56" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{numeroCartao.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{numeroCartao.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="58d1a7ea-be04-49b9-b7bb-913fafaf7a76" stretchType="RelativeToTallestObject" x="446" y="27" width="35" height="20"/> <reportElement uuid="58d1a7ea-be04-49b9-b7bb-913fafaf7a76" stretchType="RelativeToTallestObject" x="412" y="27" width="35" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{nsu.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{nsu.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="7eaf1a6c-5182-4b0e-aa4f-20af519c69f8" stretchType="RelativeToTallestObject" x="481" y="27" width="40" height="20"/> <reportElement uuid="7eaf1a6c-5182-4b0e-aa4f-20af519c69f8" stretchType="RelativeToTallestObject" x="447" y="27" width="40" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{autorizacao.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{autorizacao.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="ac3fbe18-d2c6-4fc1-aa4c-b3c8c91b1174" stretchType="RelativeToTallestObject" x="563" y="27" width="42" height="20"/> <reportElement uuid="ac3fbe18-d2c6-4fc1-aa4c-b3c8c91b1174" stretchType="RelativeToTallestObject" x="487" y="27" width="42" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{dataTransacao.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{dataTransacao.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="da0677b0-a380-4686-ad53-61ddf129e143" stretchType="RelativeToTallestObject" x="605" y="27" width="30" height="20"/> <reportElement uuid="da0677b0-a380-4686-ad53-61ddf129e143" stretchType="RelativeToTallestObject" x="529" y="27" width="30" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{valorEstorno.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{valorEstorno.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="f1442d1b-8590-4deb-8bc5-96b2316462b7" stretchType="RelativeToTallestObject" x="636" y="27" width="23" height="20"/> <reportElement uuid="f1442d1b-8590-4deb-8bc5-96b2316462b7" stretchType="RelativeToTallestObject" x="560" y="27" width="23" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{origem.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{origem.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="c61f1d44-90da-401f-a832-b8c06682bde8" stretchType="RelativeToTallestObject" x="659" y="27" width="23" height="20"/> <reportElement uuid="c61f1d44-90da-401f-a832-b8c06682bde8" stretchType="RelativeToTallestObject" x="583" y="27" width="23" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{destino.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{destino.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="67b880a8-7be7-42d7-889a-78c9b2113a4c" stretchType="RelativeToTallestObject" x="682" y="27" width="23" height="20"/> <reportElement uuid="67b880a8-7be7-42d7-889a-78c9b2113a4c" stretchType="RelativeToTallestObject" x="606" y="27" width="23" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{servico.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{servico.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="07f1f00b-329c-4b23-bc9e-bf9064ccd147" stretchType="RelativeToTallestObject" x="705" y="27" width="42" height="20"/> <reportElement uuid="07f1f00b-329c-4b23-bc9e-bf9064ccd147" stretchType="RelativeToTallestObject" x="629" y="27" width="42" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{dataServico.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{dataServico.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="84ffd875-2c40-418f-916d-305d98a04dfc" stretchType="RelativeToTallestObject" x="747" y="27" width="28" height="20"/> <reportElement uuid="84ffd875-2c40-418f-916d-305d98a04dfc" stretchType="RelativeToTallestObject" x="671" y="27" width="35" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{bilhete.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{bilhete.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="53e910c5-7876-4cad-96c8-8bebeabcc0b6" stretchType="RelativeToTallestObject" x="775" y="27" width="26" height="20"/> <reportElement uuid="53e910c5-7876-4cad-96c8-8bebeabcc0b6" stretchType="RelativeToTallestObject" x="706" y="27" width="30" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{valorTransacao.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{valorTransacao.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="4dbb8177-8d50-4b80-9a61-1991b940fd06" stretchType="RelativeToTallestObject" x="293" y="27" width="31" height="20"/> <reportElement uuid="4dbb8177-8d50-4b80-9a61-1991b940fd06" stretchType="RelativeToTallestObject" x="259" y="27" width="31" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{formaPago.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{formaPago.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="99bce7f3-8e93-41c0-ba75-ee5e1ad183e1" stretchType="RelativeToTallestObject" x="324" y="27" width="31" height="20"/> <reportElement uuid="99bce7f3-8e93-41c0-ba75-ee5e1ad183e1" stretchType="RelativeToTallestObject" x="290" y="27" width="31" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{pontoDeventa.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{pontoDeventa.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="e6061d48-5d85-48a8-960d-23bc16157462" stretchType="RelativeToTallestObject" x="0" y="27" width="32" height="20"/> <reportElement uuid="e6061d48-5d85-48a8-960d-23bc16157462" stretchType="RelativeToTallestObject" x="0" y="27" width="32" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="SansSerif" size="6" isPdfEmbedded="true"/> <font fontName="SansSerif" size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{motivoCancelamento.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{motivoCancelamento.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="468fff71-1268-4136-9d45-c81f154addae" stretchType="RelativeToTallestObject" x="541" y="27" width="22" height="20"/> <reportElement uuid="468fff71-1268-4136-9d45-c81f154addae" stretchType="RelativeToTallestObject" x="737" y="27" width="30" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{adquirente.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{adquirente.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="5efb0333-63a8-44be-9eb0-786a3852c1be" stretchType="RelativeToTallestObject" x="32" y="27" width="36" height="20"/> <reportElement uuid="5efb0333-63a8-44be-9eb0-786a3852c1be" stretchType="RelativeToTallestObject" x="767" y="27" width="32" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{estabelecimento.label}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{estabelecimento.label}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="14265fbe-d0be-4a76-b76b-844f21ca3612" stretchType="RelativeToTallestObject" x="521" y="27" width="20" height="20"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{nsuhost.label}]]></textFieldExpression>
</textField>
</band> </band>
</groupHeader> </groupHeader>
<groupFooter> <groupFooter>
@ -352,184 +342,177 @@
<detail> <detail>
<band height="28" splitType="Stretch"> <band height="28" splitType="Stretch">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="b6303a6f-7dcb-4e04-b760-9da3cc781862" stretchType="RelativeToTallestObject" x="66" y="1" width="25" height="27"/> <reportElement uuid="b6303a6f-7dcb-4e04-b760-9da3cc781862" stretchType="RelativeToTallestObject" x="32" y="0" width="25" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="82deceaa-3bf0-40e5-8d0f-24cbc6799b18" stretchType="RelativeToTallestObject" x="91" y="1" width="30" height="27"/> <reportElement uuid="82deceaa-3bf0-40e5-8d0f-24cbc6799b18" stretchType="RelativeToTallestObject" x="57" y="0" width="30" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{bilheteiro}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{bilheteiro}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="011f18ad-4c98-419f-a100-9a4ddb25e255" stretchType="RelativeToTallestObject" x="195" y="1" width="30" height="27"/> <reportElement uuid="011f18ad-4c98-419f-a100-9a4ddb25e255" stretchType="RelativeToTallestObject" x="161" y="0" width="30" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{cpf}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{cpf}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="66bbaaa2-f05a-474e-b37a-32ef7e148226" stretchType="RelativeToTallestObject" x="225" y="1" width="40" height="27"/> <reportElement uuid="66bbaaa2-f05a-474e-b37a-32ef7e148226" stretchType="RelativeToTallestObject" x="191" y="0" width="40" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{email}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{email}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="aeba3ac4-bb56-4bd3-9c2f-497a3f11cd9c" stretchType="RelativeToTallestObject" x="265" y="1" width="28" height="27"/> <reportElement uuid="aeba3ac4-bb56-4bd3-9c2f-497a3f11cd9c" stretchType="RelativeToTallestObject" x="231" y="0" width="28" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{telefone}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{telefone}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="1bbe289d-cf99-4ce3-99b6-bea9ea555dd2" stretchType="RelativeToTallestObject" x="355" y="1" width="35" height="27"/> <reportElement uuid="1bbe289d-cf99-4ce3-99b6-bea9ea555dd2" stretchType="RelativeToTallestObject" x="321" y="0" width="35" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{cartao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{cartao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="419dc8fd-3ace-4305-bb9f-f8e5e73028db" stretchType="RelativeToTallestObject" x="390" y="1" width="56" height="27"/> <reportElement uuid="419dc8fd-3ace-4305-bb9f-f8e5e73028db" stretchType="RelativeToTallestObject" x="356" y="0" width="56" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numeroCartao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numeroCartao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="6e9ab248-fff5-48f5-9c4a-abdf192dac72" stretchType="RelativeToTallestObject" x="446" y="1" width="35" height="27"/> <reportElement uuid="6e9ab248-fff5-48f5-9c4a-abdf192dac72" stretchType="RelativeToTallestObject" x="412" y="0" width="35" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nsu}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nsu}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="a34f17c2-9306-4af1-835c-2e80b9acbb1e" stretchType="RelativeToTallestObject" x="481" y="1" width="40" height="27"/> <reportElement uuid="a34f17c2-9306-4af1-835c-2e80b9acbb1e" stretchType="RelativeToTallestObject" x="447" y="0" width="40" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{autorizacao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{autorizacao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="838657a0-d5bf-4a28-aea4-b8b6f19fed96" stretchType="RelativeToTallestObject" x="563" y="1" width="42" height="27"/> <reportElement uuid="838657a0-d5bf-4a28-aea4-b8b6f19fed96" stretchType="RelativeToTallestObject" x="487" y="0" width="42" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{dataTransacao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{dataTransacao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement uuid="bacf4384-5350-446b-b0d5-7e013114e25d" stretchType="RelativeToTallestObject" x="605" y="1" width="30" height="27"/> <reportElement uuid="bacf4384-5350-446b-b0d5-7e013114e25d" stretchType="RelativeToTallestObject" x="529" y="0" width="30" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorEstorno}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorEstorno}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="20a5d436-c6ba-45cc-9fd5-03aaff8a98ba" stretchType="RelativeToTallestObject" x="636" y="1" width="23" height="27"/> <reportElement uuid="20a5d436-c6ba-45cc-9fd5-03aaff8a98ba" stretchType="RelativeToTallestObject" x="560" y="0" width="23" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="4cd32cee-a081-4c86-970c-912891f1ba86" stretchType="RelativeToTallestObject" x="659" y="1" width="23" height="27"/> <reportElement uuid="4cd32cee-a081-4c86-970c-912891f1ba86" stretchType="RelativeToTallestObject" x="583" y="0" width="23" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="7bd19ec9-ea19-44e6-96c1-b8e1c191538d" stretchType="RelativeToTallestObject" x="682" y="1" width="23" height="27"/> <reportElement uuid="7bd19ec9-ea19-44e6-96c1-b8e1c191538d" stretchType="RelativeToTallestObject" x="606" y="0" width="23" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="3035abfe-7fee-47f1-90d0-df1b33113e2d" stretchType="RelativeToTallestObject" x="705" y="1" width="42" height="27"/> <reportElement uuid="3035abfe-7fee-47f1-90d0-df1b33113e2d" stretchType="RelativeToTallestObject" x="629" y="0" width="42" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{dataServico}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{dataServico}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="ca18697e-f3ef-4b34-a10d-9c92b281be56" stretchType="RelativeToTallestObject" x="747" y="1" width="28" height="27"/> <reportElement uuid="ca18697e-f3ef-4b34-a10d-9c92b281be56" stretchType="RelativeToTallestObject" x="671" y="0" width="35" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{bilhete}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{bilhete}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement uuid="bd34bccf-8a59-452a-8030-425e4974acae" stretchType="RelativeToTallestObject" x="775" y="1" width="26" height="27"/> <reportElement uuid="bd34bccf-8a59-452a-8030-425e4974acae" stretchType="RelativeToTallestObject" x="706" y="0" width="30" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorTransacao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorTransacao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="ba083af3-9665-4b37-89bb-2177fc2c235e" stretchType="RelativeToTallestObject" x="156" y="1" width="39" height="27"/> <reportElement uuid="ba083af3-9665-4b37-89bb-2177fc2c235e" stretchType="RelativeToTallestObject" x="122" y="0" width="39" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{cliente}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{cliente}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="3494fbec-c42c-4657-8bef-7eee71c35b68" stretchType="RelativeToTallestObject" x="121" y="1" width="35" height="27"/> <reportElement uuid="3494fbec-c42c-4657-8bef-7eee71c35b68" stretchType="RelativeToTallestObject" x="87" y="0" width="35" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{data}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="13be6e84-b384-4d18-81e7-3315e076a068" stretchType="RelativeToTallestObject" x="293" y="1" width="31" height="27"/> <reportElement uuid="13be6e84-b384-4d18-81e7-3315e076a068" stretchType="RelativeToTallestObject" x="259" y="0" width="31" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{formaPago}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{formaPago}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="13c48bbf-eb96-4334-916a-dfc7e08b51da" stretchType="RelativeToTallestObject" x="324" y="1" width="31" height="27"/> <reportElement uuid="13c48bbf-eb96-4334-916a-dfc7e08b51da" stretchType="RelativeToTallestObject" x="290" y="0" width="31" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{agenciaVenda}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{agenciaVenda}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="bc174bfa-6426-47bd-9eab-20cf741a233c" stretchType="RelativeToTallestObject" x="0" y="0" width="32" height="27"/> <reportElement uuid="bc174bfa-6426-47bd-9eab-20cf741a233c" stretchType="RelativeToTallestObject" x="7" y="0" width="25" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="SansSerif" size="6" isPdfEmbedded="true"/> <font fontName="SansSerif" size="6" isPdfEmbedded="true"/>
<paragraph leftIndent="2"/> <paragraph leftIndent="2"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{descmotivo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{descmotivo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement uuid="aec06746-db94-40a9-8923-4a6b1fe8022c" stretchType="RelativeToTallestObject" x="34" y="1" width="32" height="27"/> <reportElement uuid="3c56f360-8ffd-451c-9287-b401874fa805" stretchType="RelativeToTallestObject" x="735" y="0" width="34" height="26"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{estabelecimento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement uuid="cfb968a8-fc71-456f-84e6-bfc132b09fe8" stretchType="RelativeToTallestObject" x="521" y="1" width="20" height="27"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{nsuhost}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement uuid="3c56f360-8ffd-451c-9287-b401874fa805" stretchType="RelativeToTallestObject" x="541" y="1" width="22" height="26"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/> <font size="6" isPdfEmbedded="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{adquirente}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{adquirente}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement uuid="aec06746-db94-40a9-8923-4a6b1fe8022c" stretchType="RelativeToTallestObject" x="769" y="0" width="32" height="26"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="6" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{estabelecimento}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<summary> <summary>
@ -538,7 +521,7 @@
<noData> <noData>
<band height="26"> <band height="26">
<textField> <textField>
<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="-1" y="0" width="802" height="26"/> <reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="0" y="0" width="802" height="26"/>
<textElement textAlignment="Center" markup="none"> <textElement textAlignment="Center" markup="none">
<font size="11" isBold="true"/> <font size="11" isBold="true"/>
</textElement> </textElement>

45
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
View File

@ -183,6 +183,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCategoriaBloque
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCobrancaAdcPuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCobrancaAdcPuntoVenta;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCobrancaAdcicionalHistorico; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCobrancaAdcicionalHistorico;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEmpresaBloquear; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEmpresaBloquear;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderFormaPago;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderHistoricoFormaPago; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderHistoricoFormaPago;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderHistoricoFormaPagoSelecao; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderHistoricoFormaPagoSelecao;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderParadaPtoVtaCheckin; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderParadaPtoVtaCheckin;
@ -199,9 +200,6 @@ import com.rjconsultores.wsag.GeradorTitulosAG;
//import com.rjconsultores.wsag.WSAGLog; //import com.rjconsultores.wsag.WSAGLog;
import com.rjconsultores.wsag.WSAGLog; import com.rjconsultores.wsag.WSAGLog;
/** /**
* *
* @author Rafius * @author Rafius
@ -596,7 +594,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
this.btnApagar = btnApagar; this.btnApagar = btnApagar;
} }
public void aplicarMascaratxt() { public void aplicarMascara() {
Clients.evalJavaScript( Clients.evalJavaScript(
"jQuery('#" + txtNumFax.getUuid() + "').mask('(999)9999-9999?9');" + "jQuery('#" + txtNumFax.getUuid() + "').mask('(999)9999-9999?9');" +
"jQuery('#" + numtelefonodos.getUuid() + "').mask('(999)9999-9999?9');" + "jQuery('#" + numtelefonodos.getUuid() + "').mask('(999)9999-9999?9');" +
@ -671,38 +669,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
utilizaCobrancaAdicional = utilizaCobrancaAdicional(); utilizaCobrancaAdicional = utilizaCobrancaAdicional();
aplicarMascaratxt(); aplicarMascara();
numtelefonodos.addEventListener(Events.ON_CHANGING, new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
Clients.evalJavaScript(
"jQuery('#" + numtelefonodos.getUuid() + "').mask('(999)9999-9999?9');");
}
});
numtelefonouno.addEventListener(Events.ON_CHANGING, new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
Clients.evalJavaScript(
"jQuery('#" + numtelefonouno.getUuid() + "').mask('(999)9999-9999?9');");
}
});
txtNumFax.addEventListener(Events.ON_CHANGING, new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
Clients.evalJavaScript(
"jQuery('#" + txtNumFax.getUuid() + "').mask('(999)9999-9999?9');");
}
});
popularCombobox(cmbTipoConta, cmbPessoa, cmbForm, cmbLote, cmbPosicao, cmbReceita, cmbEmpresas, cmbUsuarioEmpresa, cmbEmpresaCobranca, cmbCobrancasPuntoVenta, cmbTipoSocio); popularCombobox(cmbTipoConta, cmbPessoa, cmbForm, cmbLote, cmbPosicao, cmbReceita, cmbEmpresas, cmbUsuarioEmpresa, cmbEmpresaCobranca, cmbCobrancasPuntoVenta, cmbTipoSocio);
@ -2117,7 +2084,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
puntoVenta.setNumfax(null); puntoVenta.setNumfax(null);
if (!txtNumFax.getValue().equals("")) { if (!txtNumFax.getValue().equals("")) {
getString = this.replaceTextbox(txtNumFax); getString = this.replaceTextbox(txtNumFax);
if (getString.length() >= 1) { if (getString.length() >= 11) {
puntoVenta.setNumfax(txtNumFax.getValue().replace("_", "")); puntoVenta.setNumfax(txtNumFax.getValue().replace("_", ""));
} }
} }
@ -2125,7 +2092,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
puntoVenta.setNumtelefonouno(null); puntoVenta.setNumtelefonouno(null);
if (!numtelefonouno.getValue().equals("")) { if (!numtelefonouno.getValue().equals("")) {
getString = this.replaceTextbox(numtelefonouno); getString = this.replaceTextbox(numtelefonouno);
if (getString.length() >= 1) { if (getString.length() >= 11) {
puntoVenta.setNumtelefonouno(numtelefonouno.getValue().replace("_", "")); puntoVenta.setNumtelefonouno(numtelefonouno.getValue().replace("_", ""));
} }
} }
@ -2133,7 +2100,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
puntoVenta.setNumtelefonodos(null); puntoVenta.setNumtelefonodos(null);
if (!numtelefonodos.getValue().equals("")) { if (!numtelefonodos.getValue().equals("")) {
getString = this.replaceTextbox(numtelefonodos); getString = this.replaceTextbox(numtelefonodos);
if (getString.length() >= 1) { if (getString.length() >= 11) {
puntoVenta.setNumtelefonodos(numtelefonodos.getValue().replace("_", "")); puntoVenta.setNumtelefonodos(numtelefonodos.getValue().replace("_", ""));
} }
} }

91
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaController.java
View File

@ -66,15 +66,9 @@ import com.rjconsultores.ventaboletos.entidad.Ruta;
import com.rjconsultores.ventaboletos.entidad.TipoOcupacion; import com.rjconsultores.ventaboletos.entidad.TipoOcupacion;
import com.rjconsultores.ventaboletos.enums.HorarioLiberacaoVendaPassagem; import com.rjconsultores.ventaboletos.enums.HorarioLiberacaoVendaPassagem;
import com.rjconsultores.ventaboletos.enums.TipoPassagemCores; import com.rjconsultores.ventaboletos.enums.TipoPassagemCores;
import com.rjconsultores.ventaboletos.service.CategoriaClaseService;
import com.rjconsultores.ventaboletos.service.CategoriaCorridaService; import com.rjconsultores.ventaboletos.service.CategoriaCorridaService;
import com.rjconsultores.ventaboletos.service.CategoriaCtrlService; import com.rjconsultores.ventaboletos.service.CategoriaCtrlService;
import com.rjconsultores.ventaboletos.service.CategoriaMarcaService;
import com.rjconsultores.ventaboletos.service.CategoriaMercadoService;
import com.rjconsultores.ventaboletos.service.CategoriaOrgaoService;
import com.rjconsultores.ventaboletos.service.CategoriaPeriodoService; import com.rjconsultores.ventaboletos.service.CategoriaPeriodoService;
import com.rjconsultores.ventaboletos.service.CategoriaRutaExcecaoService;
import com.rjconsultores.ventaboletos.service.CategoriaRutaService;
import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.CategoriaService;
import com.rjconsultores.ventaboletos.service.ClaseServicioService; import com.rjconsultores.ventaboletos.service.ClaseServicioService;
import com.rjconsultores.ventaboletos.service.ConstanteService; import com.rjconsultores.ventaboletos.service.ConstanteService;
@ -121,26 +115,13 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
@Autowired @Autowired
private CategoriaCtrlService categoriaCtrlService; private CategoriaCtrlService categoriaCtrlService;
@Autowired @Autowired
private CategoriaOrgaoService categoriaOrgaoService;
@Autowired
private CategoriaClaseService categoriaClaseService;
@Autowired
private CategoriaPeriodoService categoriaPeriodoService; private CategoriaPeriodoService categoriaPeriodoService;
@Autowired @Autowired
private CategoriaMarcaService categoriaMarcaService;
@Autowired
private OrgaoConcedenteService orgaoService; private OrgaoConcedenteService orgaoService;
@Autowired @Autowired
private RutaService rutaService; private RutaService rutaService;
@Autowired @Autowired
private ConstanteService constanteService; private ConstanteService constanteService;
@Autowired
private CategoriaRutaService categoriaRutaService;
@Autowired
private CategoriaRutaExcecaoService categoriaRutaExcecaoService;
@Autowired
private CategoriaMercadoService categoriaMercadoService;
private List<Marca> lsMarcas; private List<Marca> lsMarcas;
private List<ClaseServicio> lsClaseServicio; private List<ClaseServicio> lsClaseServicio;
private List<Empresa> lsEmpresas; private List<Empresa> lsEmpresas;
@ -167,20 +148,13 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
private MyListbox categoriaRutaList; private MyListbox categoriaRutaList;
private MyListbox categoriaRutaExcecaoList; private MyListbox categoriaRutaExcecaoList;
private List<CategoriaClase> lsCategoriaClase; private List<CategoriaClase> lsCategoriaClase;
private List<CategoriaClase> lsCategoriaClaseTemp;
private List<CategoriaDescuento> lsCategoriaDescuento; private List<CategoriaDescuento> lsCategoriaDescuento;
private List<CategoriaMarca> lsCategoriaMarca; private List<CategoriaMarca> lsCategoriaMarca;
private List<CategoriaMarca> lsCategoriaMarcaTemp;
private List<CategoriaMercado> lsCategoriaMercado; private List<CategoriaMercado> lsCategoriaMercado;
private List<CategoriaMercado> lsCategoriaMercadoTemp;
private List<CategoriaCorrida> lsCategoriaCorrida; private List<CategoriaCorrida> lsCategoriaCorrida;
private List<CategoriaCorrida> lsCategoriaCorridaTemp;
private List<CategoriaOrgao> lsCategoriaOrgao; private List<CategoriaOrgao> lsCategoriaOrgao;
private List<CategoriaOrgao> lsCategoriaOrgaoTemp;
private List<CategoriaRuta> lsCategoriaRuta; private List<CategoriaRuta> lsCategoriaRuta;
private List<CategoriaRuta> lsCategoriaRutaTemp;
private List<CategoriaRutaExcecao> lsCategoriaRutaExcecao; private List<CategoriaRutaExcecao> lsCategoriaRutaExcecao;
private List<CategoriaRutaExcecao> lsCategoriaRutaExcecaoTemp;
private boolean clone = false; private boolean clone = false;
private Combobox cmbCategorias; private Combobox cmbCategorias;
private Combobox cmbEmpresas; private Combobox cmbEmpresas;
@ -612,30 +586,23 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
// Clase // Clase
categoriaClaseList.setItemRenderer(new RenderConfiguracionCategoriaClase()); categoriaClaseList.setItemRenderer(new RenderConfiguracionCategoriaClase());
lsCategoriaClase = new ArrayList<CategoriaClase>(); lsCategoriaClase = new ArrayList<CategoriaClase>();
lsCategoriaClaseTemp = new ArrayList<CategoriaClase>();
// Marca // Marca
categoriaMarcaList.setItemRenderer(new RenderConfiguracionCategoriaMarca()); categoriaMarcaList.setItemRenderer(new RenderConfiguracionCategoriaMarca());
lsCategoriaMarca = new ArrayList<CategoriaMarca>(); lsCategoriaMarca = new ArrayList<CategoriaMarca>();
lsCategoriaMarcaTemp = new ArrayList<CategoriaMarca>();
// Mercado // Mercado
categoriaMercadoList.setItemRenderer(new RenderConfiguracionCategoriaMercado()); categoriaMercadoList.setItemRenderer(new RenderConfiguracionCategoriaMercado());
lsCategoriaMercado = new ArrayList<CategoriaMercado>(); lsCategoriaMercado = new ArrayList<CategoriaMercado>();
lsCategoriaMercadoTemp = new ArrayList<CategoriaMercado>();
// Corrida // Corrida
categoriaCorridaList.setItemRenderer(new RenderConfiguracionCategoriaCorrida()); categoriaCorridaList.setItemRenderer(new RenderConfiguracionCategoriaCorrida());
lsCategoriaCorrida = new ArrayList<CategoriaCorrida>(); lsCategoriaCorrida = new ArrayList<CategoriaCorrida>();
lsCategoriaCorridaTemp = new ArrayList<CategoriaCorrida>();
// Orgao // Orgao
categoriaOrgaoList.setItemRenderer(new RenderConfiguracionCategoriaOrgao()); categoriaOrgaoList.setItemRenderer(new RenderConfiguracionCategoriaOrgao());
lsCategoriaOrgao = new ArrayList<CategoriaOrgao>(); lsCategoriaOrgao = new ArrayList<CategoriaOrgao>();
lsCategoriaOrgaoTemp = new ArrayList<CategoriaOrgao>();
// Ruta // Ruta
lsCategoriaRuta = new ArrayList<CategoriaRuta>(); lsCategoriaRuta = new ArrayList<CategoriaRuta>();
lsCategoriaRutaTemp = new ArrayList<CategoriaRuta>();
// Ruta Excecao // Ruta Excecao
categoriaRutaExcecaoList.setItemRenderer(new RenderConfiguracionCategoriaRutaExcecao()); categoriaRutaExcecaoList.setItemRenderer(new RenderConfiguracionCategoriaRutaExcecao());
lsCategoriaRutaExcecao = new ArrayList<CategoriaRutaExcecao>(); lsCategoriaRutaExcecao = new ArrayList<CategoriaRutaExcecao>();
lsCategoriaRutaExcecaoTemp = new ArrayList<CategoriaRutaExcecao>();
// Recarrega Listas // Recarrega Listas
if (categoriaCtrl.getCategoriactrlId() != null) { if (categoriaCtrl.getCategoriactrlId() != null) {
@ -646,39 +613,26 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
lsCategoriaClase = categoriaCtrl.getCategoriaClaseList(); lsCategoriaClase = categoriaCtrl.getCategoriaClaseList();
categoriaClaseList.setData(lsCategoriaClase); categoriaClaseList.setData(lsCategoriaClase);
lsCategoriaClaseTemp.addAll(lsCategoriaClase);
lsCategoriaMarca = categoriaCtrl.getCategoriaMarcaList(); lsCategoriaMarca = categoriaCtrl.getCategoriaMarcaList();
categoriaMarcaList.setData(lsCategoriaMarca); categoriaMarcaList.setData(lsCategoriaMarca);
lsCategoriaMarcaTemp.addAll(lsCategoriaMarca);
lsCategoriaOrgao = categoriaCtrl.getCategoriaOrgaoList(); lsCategoriaOrgao = categoriaCtrl.getCategoriaOrgaoList();
categoriaOrgaoList.setData(lsCategoriaOrgao); categoriaOrgaoList.setData(lsCategoriaOrgao);
lsCategoriaOrgaoTemp.addAll(lsCategoriaOrgao);
lsCategoriaRuta = categoriaCtrl.getCategoriaRutaList(); lsCategoriaRuta = categoriaCtrl.getCategoriaRutaList();
lsCategoriaRutaTemp.addAll(lsCategoriaRuta);
//categoriaRutaList.setData(lsCategoriaRuta); //categoriaRutaList.setData(lsCategoriaRuta);
lsCategoriaMercado = categoriaCtrl.getCategoriaMercadoList(); lsCategoriaMercado = categoriaCtrl.getCategoriaMercadoList();
lsCategoriaMercadoTemp = categoriaCtrl.getCategoriaMercadoList();
categoriaMercadoList.setData(lsCategoriaMercado); categoriaMercadoList.setData(lsCategoriaMercado);
lsCategoriaCorrida = categoriaCtrl.getCategoriaCorridaList(); lsCategoriaCorrida = categoriaCtrl.getCategoriaCorridaList();
categoriaCorridaList.setData(lsCategoriaCorrida); categoriaCorridaList.setData(lsCategoriaCorrida);
lsCategoriaCorridaTemp.addAll(lsCategoriaCorrida);
lsCategoriaRutaExcecao = categoriaCtrl.getCategoriaRutaExcecaoList(); lsCategoriaRutaExcecao = categoriaCtrl.getCategoriaRutaExcecaoList();
lsCategoriaRutaExcecaoTemp = categoriaCtrl.getCategoriaRutaExcecaoList();
categoriaRutaExcecaoList.setData(lsCategoriaRutaExcecao); categoriaRutaExcecaoList.setData(lsCategoriaRutaExcecao);
try {
categoriaCtrl.clonar();
} catch (Exception e) {
log.error(e.getMessage(), e);
} }
}
//Inicializa Intbox //Inicializa Intbox
iniciaIntBoxesQtdeAutorizada(lsCategoriaRuta); iniciaIntBoxesQtdeAutorizada(lsCategoriaRuta);
inicialDecimalBoxesValor(lsCategoriaRuta); inicialDecimalBoxesValor(lsCategoriaRuta);
@ -838,13 +792,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
categoriaCtrl.setActivo(true); categoriaCtrl.setActivo(true);
categoriaCtrl.setFecmodif(Calendar.getInstance().getTime()); categoriaCtrl.setFecmodif(Calendar.getInstance().getTime());
categoriaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); categoriaCtrl.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
categoriaCtrl.setCategoriaorgaoList(lsCategoriaOrgaoTemp);
categoriaCtrl.setCategoriaMarcaList(lsCategoriaMarcaTemp);
categoriaCtrl.setCategoriaCorridaList(lsCategoriaCorridaTemp);
categoriaCtrl.setCategoriaClaseList(lsCategoriaClaseTemp);
categoriaCtrl.setCategoriarutaList(lsCategoriaRutaTemp);
categoriaCtrl.setCategoriarutaExcecaoList(lsCategoriaRutaExcecaoTemp);
categoriaCtrl.setCategoriaMercadoList(lsCategoriaMercadoTemp);
if (categoriaCtrl.getCategoriactrlId() == null) { if (categoriaCtrl.getCategoriactrlId() == null) {
categoriaCtrlService.suscribir(categoriaCtrl); categoriaCtrlService.suscribir(categoriaCtrl);
@ -879,12 +826,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
categoriaCtrlService.suscribir(nuevo); categoriaCtrlService.suscribir(nuevo);
categoriaCtrlList.addItemNovo(nuevo); categoriaCtrlList.addItemNovo(nuevo);
} else { } else {
categoriaOrgaoService.actualizacionAuditagem(lsCategoriaOrgao);
categoriaMarcaService.actualizacionAuditagem(lsCategoriaMarca);
categoriaClaseService.actualizacionAuditagem(lsCategoriaClase);
categoriaRutaService.actualizacionAuditagem(lsCategoriaRuta);
categoriaRutaExcecaoService.actualizacionAuditagem(lsCategoriaRutaExcecao);
categoriaMercadoService.actualizacionAuditagem(lsCategoriaMercado);
categoriaCtrlService.actualizacion(categoriaCtrl); categoriaCtrlService.actualizacion(categoriaCtrl);
categoriaCtrlList.updateItem(categoriaCtrl); categoriaCtrlList.updateItem(categoriaCtrl);
} }
@ -1360,7 +1301,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
} }
if (!existe) { if (!existe) {
CategoriaMarca cMarca = new CategoriaMarca(); CategoriaMarca cMarca = new CategoriaMarca();
cMarca.setCategoriaCtrl(categoriaCtrl); cMarca.setCategoriaCtrl(categoriaCtrl);
cMarca.setActivo(Boolean.TRUE); cMarca.setActivo(Boolean.TRUE);
@ -1368,11 +1308,8 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cMarca.setFecmodif(Calendar.getInstance().getTime()); cMarca.setFecmodif(Calendar.getInstance().getTime());
cMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaMarca.add(cMarca); lsCategoriaMarca.add(cMarca);
lsCategoriaMarcaTemp.add(cMarca);
categoriaMarcaList.addItemNovo(cMarca); categoriaMarcaList.addItemNovo(cMarca);
categoriaCtrl.setCategoriaMarcaList(lsCategoriaMarca); categoriaCtrl.setCategoriaMarcaList(lsCategoriaMarca);
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Registro.Existe"), Labels.getLabel("MSG.Registro.Existe"),
@ -1393,15 +1330,14 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
CategoriaMarca cMarca = (CategoriaMarca) categoriaMarcaList.getSelected(); CategoriaMarca cMarca = (CategoriaMarca) categoriaMarcaList.getSelected();
if (cMarca != null) { if (cMarca != null) {
// removo o antigo // removo o antigo
lsCategoriaMarca.remove(cMarca); lsCategoriaMarca.remove(cMarca);
cMarca.setFecmodif(Calendar.getInstance().getTime()); cMarca.setFecmodif(Calendar.getInstance().getTime());
cMarca.setActivo(Boolean.FALSE); cMarca.setActivo(Boolean.FALSE);
cMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaMarcaTemp.remove(cMarca); categoriaMarcaList.updateItem(cMarca);
categoriaMarcaList.removeItem(cMarca);
lsCategoriaMarca.add(cMarca); lsCategoriaMarca.add(cMarca);
categoriaCtrl.setCategoriaMarcaList(lsCategoriaMarca); categoriaCtrl.setCategoriaMarcaList(lsCategoriaMarca);
categoriaMarcaList.removeItem(cMarca);
} else { } else {
Messagebox.show( Messagebox.show(
@ -1449,7 +1385,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cRuta.setFecmodif(Calendar.getInstance().getTime()); cRuta.setFecmodif(Calendar.getInstance().getTime());
cRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaRuta.add(cRuta); lsCategoriaRuta.add(cRuta);
lsCategoriaRutaTemp.add(cRuta);
categoriaRutaList.addItemNovo(cRuta); categoriaRutaList.addItemNovo(cRuta);
categoriaCtrl.setCategoriarutaList(lsCategoriaRuta); categoriaCtrl.setCategoriarutaList(lsCategoriaRuta);
addIntBox(); addIntBox();
@ -1485,7 +1420,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cRuta.setFecmodif(Calendar.getInstance().getTime()); cRuta.setFecmodif(Calendar.getInstance().getTime());
cRuta.setActivo(Boolean.FALSE); cRuta.setActivo(Boolean.FALSE);
cRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaRutaTemp.remove(cRuta);
lsCategoriaRuta.add(cRuta); lsCategoriaRuta.add(cRuta);
categoriaCtrl.setCategoriarutaList(lsCategoriaRuta); categoriaCtrl.setCategoriarutaList(lsCategoriaRuta);
categoriaRutaList.removeItem(cRuta); categoriaRutaList.removeItem(cRuta);
@ -1543,7 +1477,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cRutaExcecao.setFecmodif(Calendar.getInstance().getTime()); cRutaExcecao.setFecmodif(Calendar.getInstance().getTime());
cRutaExcecao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cRutaExcecao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaRutaExcecao.add(cRutaExcecao); lsCategoriaRutaExcecao.add(cRutaExcecao);
lsCategoriaRutaExcecaoTemp.add(cRutaExcecao);
categoriaRutaExcecaoList.addItemNovo(cRutaExcecao); categoriaRutaExcecaoList.addItemNovo(cRutaExcecao);
categoriaCtrl.setCategoriarutaExcecaoList(lsCategoriaRutaExcecao); categoriaCtrl.setCategoriarutaExcecaoList(lsCategoriaRutaExcecao);
} else { } else {
@ -1576,7 +1509,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cRutaExcecao.setFecmodif(Calendar.getInstance().getTime()); cRutaExcecao.setFecmodif(Calendar.getInstance().getTime());
cRutaExcecao.setActivo(Boolean.FALSE); cRutaExcecao.setActivo(Boolean.FALSE);
cRutaExcecao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cRutaExcecao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaRutaExcecaoTemp.remove(cRutaExcecao);
lsCategoriaRutaExcecao.add(cRutaExcecao); lsCategoriaRutaExcecao.add(cRutaExcecao);
categoriaCtrl.setCategoriarutaExcecaoList(lsCategoriaRutaExcecao); categoriaCtrl.setCategoriarutaExcecaoList(lsCategoriaRutaExcecao);
categoriaRutaExcecaoList.removeItem(cRutaExcecao); categoriaRutaExcecaoList.removeItem(cRutaExcecao);
@ -1649,7 +1581,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cOrgao.setFecmodif(Calendar.getInstance().getTime()); cOrgao.setFecmodif(Calendar.getInstance().getTime());
cOrgao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cOrgao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaOrgao.add(cOrgao); lsCategoriaOrgao.add(cOrgao);
lsCategoriaOrgaoTemp.add(cOrgao);
categoriaOrgaoList.addItemNovo(cOrgao); categoriaOrgaoList.addItemNovo(cOrgao);
categoriaCtrl.setCategoriaorgaoList(lsCategoriaOrgao); categoriaCtrl.setCategoriaorgaoList(lsCategoriaOrgao);
} else { } else {
@ -1681,7 +1612,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cOrgao.setFecmodif(Calendar.getInstance().getTime()); cOrgao.setFecmodif(Calendar.getInstance().getTime());
cOrgao.setActivo(Boolean.FALSE); cOrgao.setActivo(Boolean.FALSE);
cOrgao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cOrgao.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaOrgaoTemp.remove(cOrgao);
lsCategoriaOrgao.add(cOrgao); lsCategoriaOrgao.add(cOrgao);
categoriaCtrl.setCategoriaorgaoList(lsCategoriaOrgao); categoriaCtrl.setCategoriaorgaoList(lsCategoriaOrgao);
categoriaOrgaoList.removeItem(cOrgao); categoriaOrgaoList.removeItem(cOrgao);
@ -1727,7 +1657,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
cc.setCorridaCtrl(corrida); cc.setCorridaCtrl(corrida);
lsCategoriaCorrida.add(cc); lsCategoriaCorrida.add(cc);
lsCategoriaCorridaTemp.add(cc);
categoriaCorridaList.addItemNovo(cc); categoriaCorridaList.addItemNovo(cc);
categoriaCtrl.setCategoriaCorridaList(lsCategoriaCorrida); categoriaCtrl.setCategoriaCorridaList(lsCategoriaCorrida);
} else { } else {
@ -1756,6 +1685,7 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cCorrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cCorrida.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
categoriaCorridaList.removeItem(cCorrida); categoriaCorridaList.removeItem(cCorrida);
categoriaCorridaService.borrar(cCorrida); categoriaCorridaService.borrar(cCorrida);
// categoriaCtrl.setCategoriaCorridaList(lsCategoriaCorrida);
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarConfiguracionCategoriaController.MSG.selectItem"), Labels.getLabel("editarConfiguracionCategoriaController.MSG.selectItem"),
@ -1810,7 +1740,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
} }
if (!existe) { if (!existe) {
lsCategoriaMercado.add(cMercado); lsCategoriaMercado.add(cMercado);
lsCategoriaMercadoTemp.add(cMercado);
categoriaMercadoList.addItemNovo(cMercado); categoriaMercadoList.addItemNovo(cMercado);
categoriaCtrl.setCategoriaMercadoList(lsCategoriaMercado); categoriaCtrl.setCategoriaMercadoList(lsCategoriaMercado);
} else { } else {
@ -1838,15 +1767,13 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
try { try {
CategoriaMercado cMercado = (CategoriaMercado) categoriaMercadoList.getSelected(); CategoriaMercado cMercado = (CategoriaMercado) categoriaMercadoList.getSelected();
if (cMercado != null) { if (cMercado != null) {
// removo o antigo
lsCategoriaMercado.remove(cMercado); lsCategoriaMercado.remove(cMercado);
cMercado.setFecmodif(Calendar.getInstance().getTime()); cMercado.setFecmodif(Calendar.getInstance().getTime());
cMercado.setActivo(Boolean.FALSE); cMercado.setActivo(Boolean.FALSE);
cMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaMercadoTemp.remove(cMercado); categoriaMercadoList.updateItem(cMercado);
lsCategoriaMercado.add(cMercado);
categoriaCtrl.setCategoriaMercadoList(lsCategoriaMercado);
categoriaMercadoList.removeItem(cMercado); categoriaMercadoList.removeItem(cMercado);
lsCategoriaMercado.add(cMercado);
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarConfiguracionCategoriaController.MSG.selectItem"), Labels.getLabel("editarConfiguracionCategoriaController.MSG.selectItem"),
@ -1888,7 +1815,6 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
cClase.setFecmodif(Calendar.getInstance().getTime()); cClase.setFecmodif(Calendar.getInstance().getTime());
cClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaClase.add(cClase); lsCategoriaClase.add(cClase);
lsCategoriaClaseTemp.add(cClase);
categoriaClaseList.addItemNovo(cClase); categoriaClaseList.addItemNovo(cClase);
categoriaCtrl.setCategoriaClaseList(lsCategoriaClase); categoriaCtrl.setCategoriaClaseList(lsCategoriaClase);
} else { } else {
@ -2007,16 +1933,13 @@ public class EditarConfiguracionCategoriaController extends MyGenericForwardComp
try { try {
CategoriaClase cClase = (CategoriaClase) categoriaClaseList.getSelected(); CategoriaClase cClase = (CategoriaClase) categoriaClaseList.getSelected();
if (cClase != null) { if (cClase != null) {
// removo o antigo
lsCategoriaClase.remove(cClase); lsCategoriaClase.remove(cClase);
cClase.setFecmodif(Calendar.getInstance().getTime()); cClase.setFecmodif(Calendar.getInstance().getTime());
cClase.setActivo(Boolean.FALSE); cClase.setActivo(Boolean.FALSE);
cClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsCategoriaClaseTemp.remove(cClase); categoriaClaseList.updateItem(cClase);
lsCategoriaClase.add(cClase);
categoriaCtrl.setCategoriaClaseList(lsCategoriaClase);
categoriaClaseList.removeItem(cClase); categoriaClaseList.removeItem(cClase);
lsCategoriaClase.add(cClase);
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarConfiguracionCategoriaController.MSG.selectItem"), Labels.getLabel("editarConfiguracionCategoriaController.MSG.selectItem"),

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaDatosCategoriaController.java
View File

@ -42,7 +42,6 @@ import com.rjconsultores.ventaboletos.entidad.Constante;
import com.rjconsultores.ventaboletos.entidad.TipoOcupacion; import com.rjconsultores.ventaboletos.entidad.TipoOcupacion;
import com.rjconsultores.ventaboletos.enums.HorarioLiberacaoVendaPassagem; import com.rjconsultores.ventaboletos.enums.HorarioLiberacaoVendaPassagem;
import com.rjconsultores.ventaboletos.enums.TipoPassagemCores; import com.rjconsultores.ventaboletos.enums.TipoPassagemCores;
import com.rjconsultores.ventaboletos.service.CategoriaDescuentoService;
import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.CategoriaService;
import com.rjconsultores.ventaboletos.service.ConstanteService; import com.rjconsultores.ventaboletos.service.ConstanteService;
import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.DateUtil;
@ -191,14 +190,11 @@ public class EditarConfiguracionCategoriaDatosCategoriaController extends MyGene
private Combobox cmbOcupacion; private Combobox cmbOcupacion;
private Row rowIdTipoOcupacao; private Row rowIdTipoOcupacao;
private TipoOcupacion tipoOcupacion; private TipoOcupacion tipoOcupacion;
@Autowired
private CategoriaDescuentoService categoriaDescuentoService;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
categoriaDescuentoList = (MyListbox) Executions.getCurrent().getArg().get("categoriaDescuentoList"); categoriaDescuentoList = (MyListbox) Executions.getCurrent().getArg().get("categoriaDescuentoList");
categoriaDescuento = (CategoriaDescuento) Executions.getCurrent().getArg().get("categoriaDescuento"); categoriaDescuento = (CategoriaDescuento) Executions.getCurrent().getArg().get("categoriaDescuento");
lsTipoOcupacion = (List<TipoOcupacion>) Executions.getCurrent().getArg().get("lsTipoOcupacion"); lsTipoOcupacion = (List<TipoOcupacion>) Executions.getCurrent().getArg().get("lsTipoOcupacion");
super.doAfterCompose(comp); super.doAfterCompose(comp);