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

Merge pull request 'fixes bug#AL-3358' (!287) from AL-3358 into master 

Reviewed-on: adm/VentaBoletosAdm#287
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master 1.24.4
aristides 2023-10-13 19:55:07 +00:00
parent 7e07a4b64b 531bc77564
commit 6af09e3d4d
4 changed files with 21 additions and 17 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.24.3</version>
<version>1.24.4</version>
<packaging>war</packaging>
<properties>

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.java
View File

@ -159,7 +159,7 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato
sql.append(" join RUTA_EMPRESA re on re.ruta_id = c.ruta_id ");
sql.append(" join CAJA_FORMAPAGO cf on cf.caja_id=c.caja_id ");
sql.append(" join FORMA_PAGO fp on fp.formapago_id=cf.formapago_id ");
sql.append(" INNER JOIN empresa e on re.empresa_id=e.empresa_id ");
sql.append(" INNER JOIN empresa e on re.empresa_autorizadora_id=e.empresa_id ");
sql.append(" where ");
sql.append(" m.EMPRESA_ID = :EMPRESA_ID ");
sql.append(" and re.empresa_autorizadora_id in ( ");
@ -203,7 +203,7 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico extends Relato
sql.append(" e.empresa_id, ");
sql.append(" e.nombempresa, ");
sql.append(" c.num_bpe ");
sql.append(" ORDER BY u.CVEUSUARIO, ");
sql.append(" ORDER BY e.empresa_id,u.CVEUSUARIO, ");
sql.append(" u.NOMBUSUARIO, ");
sql.append(" pv.NUMPUNTOVENTA, ");
sql.append(" pv.NOMBPUNTOVENTA, ");

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

Binary file not shown.

32
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendaBilhetePorEmpresaAutorizadoraAnalitico.jrxml
View File

@ -1,7 +1,7 @@
<?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="RelatorioVendaBilhetePorEmpresaAutorizadora" pageWidth="1900" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1860" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c">
<property name="ireport.zoom" value="1.610510000000003"/>
<property name="ireport.x" value="0"/>
<property name="ireport.x" value="1719"/>
<property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@ -41,28 +41,32 @@
<field name="EMPRESAAUTORIZADORA" class="java.lang.String"/>
<field name="NUMBPE" class="java.lang.String"/>
<variable name="TOTAL_TARIFA" class="java.math.BigDecimal" resetType="Group" resetGroup="EMPRESA_AUTORIZADORA" calculation="Sum">
<variableExpression><![CDATA[$F{TARIFA}]]></variableExpression>
<variableExpression><![CDATA[$F{TARIFA}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TARIFA}.multiply(new java.math.BigDecimal("-1") ):$F{TARIFA}]]></variableExpression>
</variable>
<variable name="TOTALGERAL_TARIFA" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{TARIFA}]]></variableExpression>
<variableExpression><![CDATA[$F{TARIFA}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TARIFA}.multiply(new java.math.BigDecimal("-1") ):$F{TARIFA}]]></variableExpression>
</variable>
<variable name="TOTAL_TXEMBARQUE" class="java.math.BigDecimal" resetType="Group" resetGroup="EMPRESA_AUTORIZADORA" calculation="Sum">
<variableExpression><![CDATA[$F{TX_EMBARQUE}]]></variableExpression>
<variableExpression><![CDATA[$F{TX_EMBARQUE}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TX_EMBARQUE}.multiply(new java.math.BigDecimal("-1") ):$F{TX_EMBARQUE}]]></variableExpression>
</variable>
<variable name="TOTALGERAL_TXEMBARQUE" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{TX_EMBARQUE}]]></variableExpression>
<variableExpression><![CDATA[$F{TX_EMBARQUE}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TX_EMBARQUE}.multiply(new java.math.BigDecimal("-1") ):$F{TX_EMBARQUE}]]></variableExpression>
</variable>
<variable name="TOTAL_PEDAGIO" class="java.math.BigDecimal" resetType="Group" resetGroup="EMPRESA_AUTORIZADORA" calculation="Sum">
<variableExpression><![CDATA[$F{PEDAGIO}]]></variableExpression>
<variableExpression><![CDATA[$F{PEDAGIO}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{PEDAGIO}.multiply(new java.math.BigDecimal("-1") ):$F{PEDAGIO}]]></variableExpression>
</variable>
<variable name="TOTALGERAL_PEDAGIO" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{PEDAGIO}]]></variableExpression>
<variableExpression><![CDATA[$F{PEDAGIO}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{PEDAGIO}.multiply(new java.math.BigDecimal("-1") ):$F{PEDAGIO}]]></variableExpression>
</variable>
<variable name="TOTAL_TOTALBILHETE" class="java.math.BigDecimal" resetType="Group" resetGroup="EMPRESA_AUTORIZADORA" calculation="Sum">
<variableExpression><![CDATA[$F{TOTAL_BILHETE}]]></variableExpression>
<variableExpression><![CDATA[$F{TOTAL_BILHETE}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TOTAL_BILHETE}.multiply(new java.math.BigDecimal("-1") ):$F{TOTAL_BILHETE}]]></variableExpression>
</variable>
<variable name="TOTALGERAL_TOTALBILHETE" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{TOTAL_BILHETE}]]></variableExpression>
<variableExpression><![CDATA[$F{TOTAL_BILHETE}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TOTAL_BILHETE}.multiply(new java.math.BigDecimal("-1") ):$F{TOTAL_BILHETE}]]></variableExpression>
</variable>
<variable name="NEGATIVO" class="java.math.BigDecimal">
<variableExpression><![CDATA[-1]]></variableExpression>
<initialValueExpression><![CDATA[-1]]></initialValueExpression>
</variable>
<group name="EMPRESA_AUTORIZADORA">
<groupExpression><![CDATA[$F{EMPRESAAUTORIZADORA_ID}]]></groupExpression>
@ -228,7 +232,7 @@
<textElement textAlignment="Left" markup="none">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA["Cód. Bilheteiro " ]]></textFieldExpression>
<textFieldExpression><![CDATA["Cód. Bilheteiro "]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="false">
<reportElement uuid="cf67c704-990d-476b-b216-6c6fc14f5016" x="0" y="0" width="84" height="19"/>
@ -446,21 +450,21 @@
<textElement textAlignment="Left">
<font fontName="SansSerif" size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{TX_EMBARQUE}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{TX_EMBARQUE}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TX_EMBARQUE}.multiply(new java.math.BigDecimal("-1") ):$F{TX_EMBARQUE}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="false">
<reportElement uuid="7c0246f5-739b-440c-a242-915117bd9fd1" x="1046" y="0" width="50" height="20"/>
<textElement textAlignment="Left">
<font fontName="SansSerif" size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PEDAGIO}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{PEDAGIO}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{PEDAGIO}.multiply(new java.math.BigDecimal("-1") ):$F{PEDAGIO}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="false">
<reportElement uuid="dd401917-6047-4e1b-9722-31fe8d096594" x="1096" y="0" width="50" height="20"/>
<textElement textAlignment="Left">
<font fontName="SansSerif" size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{TARIFA}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{TARIFA}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TARIFA}.multiply(new java.math.BigDecimal("-1") ):$F{TARIFA}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement uuid="27ec5d64-d949-4b02-a4a7-d6c5db93b3bd" x="1780" y="0" width="78" height="20"/>
@ -481,7 +485,7 @@
<textElement textAlignment="Left">
<font fontName="SansSerif" size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{TOTAL_BILHETE}]]></textFieldExpression>
<textFieldExpression><![CDATA[$F{TOTAL_BILHETE}!=null && $F{STATUS_PASSAGEM}.equals("CANCELADO")?$F{TOTAL_BILHETE}.multiply(new java.math.BigDecimal("-1") ):$F{TOTAL_BILHETE}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="false">
<reportElement uuid="8ad565b3-b12c-4fef-a1c7-836e7415436d" x="1517" y="0" width="104" height="20"/>