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

Merge pull request 'fixes bug#AL-4167' (!551) from AL-4167 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/551
Reviewed-by: aristides <aristides@rjconsultores.com.br>
master 1.85.1
aristides 2024-06-17 23:03:59 +00:00
parent 2e1448c2da 5109097914
commit ed1f8ac922
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<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.85.0</version> <version>1.85.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgenciaNovo.java
View File

@ -40,6 +40,7 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
sql.append(" pv.nombpuntoventa AS agencia, " ); sql.append(" pv.nombpuntoventa AS agencia, " );
sql.append(" p_origen.CVEPARADA AS origem , " ); sql.append(" p_origen.CVEPARADA AS origem , " );
sql.append(" p_destino.CVEPARADA AS destino, " ); sql.append(" p_destino.CVEPARADA AS destino, " );
sql.append(" fpb.descpago AS forma_pago_original, " );
sql.append(" fp.descpago AS forma_pagamento, " ); sql.append(" fp.descpago AS forma_pagamento, " );
sql.append(" coalesce(c.preciopagado, 0) AS tarifa, " ); sql.append(" coalesce(c.preciopagado, 0) AS tarifa, " );
sql.append(" coalesce(c.importepedagio, 0) AS pedagio, " ); sql.append(" coalesce(c.importepedagio, 0) AS pedagio, " );
@ -54,6 +55,8 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
sql.append(" caja c " ); sql.append(" caja c " );
sql.append(" JOIN caja_formapago cfp ON c.caja_id = cfp.caja_id " ); sql.append(" JOIN caja_formapago cfp ON c.caja_id = cfp.caja_id " );
sql.append(" JOIN forma_pago fp ON cfp.formapago_id = fp.formapago_id " ); sql.append(" JOIN forma_pago fp ON cfp.formapago_id = fp.formapago_id " );
sql.append(" JOIN boleto_formapago bfp ON ( c.transacaooriginal_id = bfp.boleto_id ) " );
sql.append(" JOIN forma_pago fpb ON bfp.formapago_id = fpb.formapago_id " );
sql.append(" JOIN punto_venta pv ON pv.puntoventa_id = c.puntoventa_id " ); sql.append(" JOIN punto_venta pv ON pv.puntoventa_id = c.puntoventa_id " );
sql.append(" JOIN marca m ON m.marca_id = c.marca_id AND m.activo = 1 " ); sql.append(" JOIN marca m ON m.marca_id = c.marca_id AND m.activo = 1 " );
sql.append(" LEFT JOIN motivo_cancelacion mc ON (mc.motivocancelacion_id = c.motivocancelacion_id) " ); sql.append(" LEFT JOIN motivo_cancelacion mc ON (mc.motivocancelacion_id = c.motivocancelacion_id) " );
@ -114,18 +117,20 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
BigDecimal seguroOPC = rset.getBigDecimal("seg_opcional"); BigDecimal seguroOPC = rset.getBigDecimal("seg_opcional");
BigDecimal taxa = rset.getBigDecimal("taxa"); BigDecimal taxa = rset.getBigDecimal("taxa");
BigDecimal valor = rset.getBigDecimal("valor"); BigDecimal valor = rset.getBigDecimal("valor");
String formaPagamento = rset.getString("forma_pagamento");
String formaPagamentoOriginal = rset.getString("forma_pago_original");
dataResult.put("DATA", rset.getDate("data")); dataResult.put("DATA", rset.getDate("data"));
dataResult.put("BILHETE", rset.getString("bilhete")); dataResult.put("BILHETE", rset.getString("bilhete"));
dataResult.put("ORIGEM", rset.getString("ORIGEM")); dataResult.put("ORIGEM", rset.getString("ORIGEM"));
dataResult.put("DESTINO", rset.getString("DESTINO")); dataResult.put("DESTINO", rset.getString("DESTINO"));
dataResult.put("AGENCIA", rset.getString("agencia")); dataResult.put("AGENCIA", rset.getString("agencia"));
dataResult.put("FORMA_PAGAMENTO", rset.getString("forma_pagamento"));
dataResult.put("NUMERO_BPE", bpe); dataResult.put("NUMERO_BPE", bpe);
dataResult.put("STATUS", indStatus); dataResult.put("STATUS", indStatus);
dataResult.put("MOTIVO_CANCELAMENTO", motivoCancelamento); dataResult.put("MOTIVO_CANCELAMENTO", motivoCancelamento);
if(isCancelamento) { if(isCancelamento) {
dataResult.put("FORMA_PAGAMENTO", formaPagamentoOriginal);
dataResult.put("TARIFA", tarifa.compareTo(BigDecimal.ZERO) == 0 ? tarifa : tarifa.negate()); dataResult.put("TARIFA", tarifa.compareTo(BigDecimal.ZERO) == 0 ? tarifa : tarifa.negate());
dataResult.put("PEDAGIO", pedagio.compareTo(BigDecimal.ZERO) == 0 ? pedagio : pedagio.negate()); dataResult.put("PEDAGIO", pedagio.compareTo(BigDecimal.ZERO) == 0 ? pedagio : pedagio.negate());
dataResult.put("SEGURO", seguro.compareTo(BigDecimal.ZERO) == 0 ? seguro : seguro.negate()); dataResult.put("SEGURO", seguro.compareTo(BigDecimal.ZERO) == 0 ? seguro : seguro.negate());
@ -133,6 +138,7 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
dataResult.put("TAXA", taxa.compareTo(BigDecimal.ZERO) == 0 ? taxa : taxa.negate()); dataResult.put("TAXA", taxa.compareTo(BigDecimal.ZERO) == 0 ? taxa : taxa.negate());
dataResult.put("VALOR", valor.compareTo(BigDecimal.ZERO) == 0 ? valor : valor.negate()); dataResult.put("VALOR", valor.compareTo(BigDecimal.ZERO) == 0 ? valor : valor.negate());
} else { } else {
dataResult.put("FORMA_PAGAMENTO", formaPagamento);
dataResult.put("TARIFA", tarifa); dataResult.put("TARIFA", tarifa);
dataResult.put("PEDAGIO", pedagio); dataResult.put("PEDAGIO", pedagio);
dataResult.put("SEGURO", seguro); dataResult.put("SEGURO", seguro);

6
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgenciaNovo_pt_BR.properties
View File

@ -13,13 +13,13 @@ SEGURO_OPCIONAL = SEG. OP.
TAXAS = TAXAS TAXAS = TAXAS
TOTAL = TOTAL TOTAL = TOTAL
BILHETE = BILHETE BILHETE = BILHETE
ORIGEM = ORIGEM ORIGEM = ORI
DESTINO = DESTINO DESTINO = DES
TOTAL_GERAL = Total Geral: TOTAL_GERAL = Total Geral:
TOTAL_PV = Total Agência: TOTAL_PV = Total Agência:
MOTIVO_CANCELAMENTO = Motivo Cancel. MOTIVO_CANCELAMENTO = Motivo Cancel.
STATUS = Status STATUS = Status
NUMERO_BPE = Num. BPe NUMERO_BPE = BPe
#Labels cabeçalho #Labels cabeçalho
cabecalho.relatorio=Relatório: cabecalho.relatorio=Relatório:

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

Binary file not shown.

2
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioFormaPagamentoAgenciaNovo" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283"> <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="RelatorioFormaPagamentoAgenciaNovo" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
<property name="ireport.zoom" value="2.5937424601000147"/> <property name="ireport.zoom" value="2.5937424601000147"/>
<property name="ireport.x" value="514"/> <property name="ireport.x" value="574"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>