From e0c2b45d8c3f1a424dc84334a797ef72b591af7b Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Thu, 3 Oct 2024 15:55:40 -0300
Subject: [PATCH] =?UTF-8?q?fixes=20bug#AL-4889=20Tratamento=20para=20reimp?=
 =?UTF-8?q?ress=C3=A3o,=20que=20no=20caso=20n=C3=A3o=20ira=20entrar=20nos?=
 =?UTF-8?q?=20somat=C3=B3rios.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 +-
 .../impl/RelatorioOperacionalFinanceiro.java  |   6 +-
 .../RelatorioOperacionalFinanceiro.jasper     | Bin 73895 -> 77959 bytes
 .../RelatorioOperacionalFinanceiro.jrxml      |  89 +++++++++++++++++-
 4 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79c5cf753..5482d94d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.149.2</version>
+	<version>1.149.3</version>
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
index ef0df98db..d3731362e 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
@@ -197,7 +197,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
 		sql.append("              AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 18)  ");
 		sql.append("              THEN 'VENDA PRE-PAGA'  ");
 		sql.append("               ");
-		sql.append("              WHEN c.MOTIVOCANCELACION_ID IS NULL  AND c.indreimpresion = 1");
+		sql.append("              WHEN c.MOTIVOCANCELACION_ID IS NULL  AND c.indreimpresion = 1 AND c.MOTIVOREIMPRESION_ID IS NULL");
 		sql.append("              AND (c.INDSTATUSBOLETO = 'E' AND c.TIPOVENTA_ID in (5,12,18))  ");
 		sql.append("              THEN 'IMPRESSAO POSTERIOR'  ");
 		sql.append("               ");		
@@ -207,6 +207,10 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
 		sql.append("               ");
 		sql.append("              WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 ");
 		sql.append("		     THEN 'CANCELADO' ");
+		
+		sql.append("              WHEN c.INDREIMPRESION = 1 and c.MOTIVOREIMPRESION_ID = 99 ");
+		sql.append("		     THEN 'REIMPRESSO' ");
+		
 		sql.append("		   END)  ");
 		sql.append("    ) AS tipo ");
 		sql.append("FROM caja c  ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jasper
index 33e7c3b5578e0104757bd48e5f403c0da195c36c..831a7381c43f5210c3516611ce4de901752ed750 100644
GIT binary patch
delta 17357
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

delta 15117
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
BakBsb

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
index 3114bc21f..c6fee178a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
@@ -2,7 +2,7 @@
 <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="RelatorioOperacionalFinanceiro" pageWidth="950" pageHeight="595" orientation="Landscape" columnWidth="930" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb">
 	<property name="ireport.zoom" value="1.239669421487605"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="11"/>
+	<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"/>
 	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@@ -39,6 +39,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 ($F{tarifa}
 .add( $F{taxaembarque} )
 .add( $F{pedagio} )
@@ -55,6 +59,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 0
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+0
+:
 $F{qtde}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -66,6 +74,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{tarifa}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -77,6 +89,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{taxaembarque}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -88,6 +104,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{pedagio}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -99,6 +119,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{outros}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
@@ -110,6 +134,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{seguro}]]></variableExpression>
 	</variable>
 	<variable name="totalTrechoGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho">
@@ -128,6 +156,11 @@ $F{seguro}]]></variableExpression>
 $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
+:
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+
 :
 ($F{tarifa}
 .add( $F{taxaembarque} )
@@ -145,6 +178,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 0
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+0
+:
 $F{qtde}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaTarifa" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -156,6 +193,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{tarifa}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaTaxaEmbarque" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -167,6 +208,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{taxaembarque}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaPedagio" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -178,6 +223,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{pedagio}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaOutros" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -189,6 +238,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{outros}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaSeguro" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@@ -200,10 +253,14 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{seguro}]]></variableExpression>
 	</variable>
 	<variable name="totalLinhaGeral" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha">
-		<variableExpression><![CDATA[$V{totalLinha}]]></variableExpression>
+		<variableExpression><![CDATA[$V{totalTrecho}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
 	<variable name="soma" class="java.math.BigDecimal" resetType="None">
@@ -226,6 +283,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 ($F{tarifa}
 .add( $F{taxaembarque} )
 .add( $F{pedagio} )
@@ -242,6 +303,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 0
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+0
+:
 $F{qtde}]]></variableExpression>
 	</variable>
 	<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
@@ -253,6 +318,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{tarifa}]]></variableExpression>
 	</variable>
 	<variable name="totalTaxaEmbarque" class="java.math.BigDecimal" calculation="Sum">
@@ -264,6 +333,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{taxaembarque}]]></variableExpression>
 	</variable>
 	<variable name="totalPedagio" class="java.math.BigDecimal" calculation="Sum">
@@ -275,6 +348,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{pedagio}]]></variableExpression>
 	</variable>
 	<variable name="totalOutros" class="java.math.BigDecimal" calculation="Sum">
@@ -286,6 +363,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{outros}]]></variableExpression>
 	</variable>
 	<variable name="totalSeguro" class="java.math.BigDecimal" calculation="Sum">
@@ -297,6 +378,10 @@ $F{tipo}.equals("IMPRESSAO POSTERIOR")
 ?
 new java.math.BigDecimal("0")
 :
+$F{tipo}.equals("REIMPRESSO")
+?
+new java.math.BigDecimal("0")
+:
 $F{seguro}]]></variableExpression>
 	</variable>
 	<variable name="totalGeral" class="java.math.BigDecimal">