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

Merge branch 'master' into AL-4549

master
Fernando Abimael Alvarez Uc 2024-08-02 08:56:59 -06:00
parent 330407fb5f 210899b9b6
commit 4c632a84aa
3 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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.118.0</version> <version>1.118.2</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.90.0</modelWeb.version> <modelWeb.version>1.90.0</modelWeb.version>
<flyway.version>1.77.0</flyway.version> <flyway.version>1.77.1</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

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

Binary file not shown.

70
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jrxml
View File

@ -536,7 +536,7 @@
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="8f6976c6-bd48-447f-a07f-f6bbbc33b8f6" mode="Transparent" x="153" y="1" width="34" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement uuid="8f6976c6-bd48-447f-a07f-f6bbbc33b8f6" mode="Transparent" x="153" y="1" width="34" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
</textElement> </textElement>
@ -549,115 +549,149 @@
<textField> <textField>
<reportElement uuid="b12cbc2b-3eac-4c2c-b94c-cac2e746b2c2" x="0" y="1" width="31" height="11"/> <reportElement uuid="b12cbc2b-3eac-4c2c-b94c-cac2e746b2c2" x="0" y="1" width="31" height="11"/>
<box rightPadding="5"/> <box rightPadding="5"/>
<textElement/> <textElement>
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{PREFIXO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{PREFIXO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="d19cff45-ad13-4a6b-b6f3-3e871a6d8d58" x="92" y="1" width="61" height="11"/> <reportElement uuid="d19cff45-ad13-4a6b-b6f3-3e871a6d8d58" x="92" y="1" width="61" height="11"/>
<box rightPadding="5"/> <box rightPadding="5"/>
<textElement/> <textElement>
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{CIDADE_DESTINO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{CIDADE_DESTINO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="f868a599-c0bb-4187-97b6-7681b753abbf" x="31" y="1" width="61" height="11"/> <reportElement uuid="f868a599-c0bb-4187-97b6-7681b753abbf" x="31" y="1" width="61" height="11"/>
<box rightPadding="5"/> <box rightPadding="5"/>
<textElement/> <textElement>
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{CIDADE_ORIGEM}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{CIDADE_ORIGEM}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="6454beed-fb72-4aa5-8bff-7eb4ea6c26ba" x="187" y="1" width="24" height="11"> <reportElement uuid="6454beed-fb72-4aa5-8bff-7eb4ea6c26ba" x="187" y="1" width="24" height="11">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" markup="none"/> <textElement textAlignment="Right" markup="none">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{IMPORTETAXAEMBARQUE}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{IMPORTETAXAEMBARQUE}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="1242bccb-ce44-47d6-ac13-6f4df97f707e" x="211" y="1" width="25" height="11"> <reportElement uuid="1242bccb-ce44-47d6-ac13-6f4df97f707e" x="211" y="1" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{IMPORTEPEDAGIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{IMPORTEPEDAGIO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="2184d556-1501-4525-8d09-510f9d798b86" x="236" y="1" width="25" height="11"> <reportElement uuid="2184d556-1501-4525-8d09-510f9d798b86" x="236" y="1" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{IMPORTESEGURO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{IMPORTESEGURO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="58c1e14e-9c44-4e34-8b57-fbb6af384ce3" x="341" y="1" width="30" height="11"> <reportElement uuid="58c1e14e-9c44-4e34-8b57-fbb6af384ce3" x="341" y="1" width="30" height="11">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{TOTAL_EMBARQUE}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{TOTAL_EMBARQUE}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="05426ccc-ff54-4381-8406-ae0c4290a54b" x="371" y="1" width="30" height="11"> <reportElement uuid="05426ccc-ff54-4381-8406-ae0c4290a54b" x="371" y="1" width="30" height="11">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{TOTAL_PEDAGIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{TOTAL_PEDAGIO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="8a365def-0ad3-48e8-b942-5d00f5d74a21" x="401" y="1" width="30" height="11"> <reportElement uuid="8a365def-0ad3-48e8-b942-5d00f5d74a21" x="401" y="1" width="30" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{TOTAL_SEGURO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{TOTAL_SEGURO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="7059069b-3c22-416a-afc1-d05473a3d429" x="261" y="1" width="25" height="11"> <reportElement uuid="7059069b-3c22-416a-afc1-d05473a3d429" x="261" y="1" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{EMBARQUE_VENDIDOS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{EMBARQUE_VENDIDOS}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="049ba79a-5ee9-4ee2-80d7-d498ad7d7125" x="286" y="1" width="30" height="11"> <reportElement uuid="049ba79a-5ee9-4ee2-80d7-d498ad7d7125" x="286" y="1" width="30" height="11">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{PEDAGIO_VENDIDOS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{PEDAGIO_VENDIDOS}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="c15ba1bc-2040-4a73-a221-52d574fbedb4" x="316" y="1" width="25" height="11"> <reportElement uuid="c15ba1bc-2040-4a73-a221-52d574fbedb4" x="316" y="1" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{SEGURO_VENDIDOS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{SEGURO_VENDIDOS}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="14366362-112f-4407-af42-1d4bb373340a" x="461" y="1" width="33" height="11"> <reportElement uuid="14366362-112f-4407-af42-1d4bb373340a" x="461" y="1" width="33" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{totalValorSeguroOpcionalCancelado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{totalValorSeguroOpcionalCancelado}]]></textFieldExpression>
</textField> </textField>
<textField pattern=""> <textField pattern="">
<reportElement uuid="9921ad8d-d1bd-4789-becc-583210c0b4e9" x="433" y="1" width="27" height="11"> <reportElement uuid="9921ad8d-d1bd-4789-becc-583210c0b4e9" x="433" y="1" width="27" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{qtdSeguroOpcionalCancelado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{qtdSeguroOpcionalCancelado}]]></textFieldExpression>
</textField> </textField>
<textField pattern=""> <textField pattern="">
<reportElement uuid="1d0ddaa7-506e-4e81-b798-d6832489da83" x="495" y="1" width="25" height="11"> <reportElement uuid="1d0ddaa7-506e-4e81-b798-d6832489da83" x="495" y="1" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{qtdSeguroOpcionalVendidos}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{qtdSeguroOpcionalVendidos}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="fb64c49c-1370-47fd-a0b0-e4d5f24d02d9" x="520" y="1" width="34" height="11"> <reportElement uuid="fb64c49c-1370-47fd-a0b0-e4d5f24d02d9" x="520" y="1" width="34" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Center"/> <textElement textAlignment="Center">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{totalValorseguroOpcionalVendido}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{totalValorseguroOpcionalVendido}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="da706924-1662-451e-8841-3b6559657b90" x="153" y="1" width="34" height="11"/> <reportElement uuid="da706924-1662-451e-8841-3b6559657b90" x="153" y="1" width="34" height="11"/>
<textElement textAlignment="Center" markup="none"/> <textElement textAlignment="Center" markup="none">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$F{fecHorventa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{fecHorventa}]]></textFieldExpression>
</textField> </textField>
</band> </band>