From 741f70f28041ce57187adb012e8e77e1c013872b Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Fri, 17 Feb 2023 11:17:15 -0300
Subject: [PATCH] =?UTF-8?q?fixes=20bug#AL-2047=20Ajustes=20nas=20colunas?=
 =?UTF-8?q?=20-=20Largura=20e=20posi=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 +-
 .../templates/RelatorioTaxasLinha.jasper      | Bin 72444 -> 72442 bytes
 .../templates/RelatorioTaxasLinha.jrxml       | 108 +++++++++---------
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/pom.xml b/pom.xml
index ee9b0a850..5583e23a7 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.0.56</version>
+	<version>1.0.57</version>
 	<packaging>war</packaging>
  
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jasper
index ce49e6886c43dcf45139f2e364ac9af1d6338f89..2a2e80fe2b6df68bf22d96699bf060d1657bd75a 100644
GIT binary patch
delta 748
zcmeyfmF3q~mJJg{Sq&I~VDfco&CUBo-?OmV0(piY?&LdC-@v@Q&DW(>7#UY@{v-30
zh4JL%K4tgKno22*jL$dsDX(H=3<ZlcsAe-V7K53_>gkM(6T!?!8cB?-k_-%ttYGd0
ztuzQ%4$O7Zfy&x|xgT^B8Cj))iZ_C}bM><rSrviYvtVwpA&?6)>OGjtX`Ic-#KZw+
z?=^{HWaQl}Vb;tE^^ReP)Z}wc{F_hOH!wmxF&QRQ?q~rKG6V^2KIh~E^c#?=yxGpB
zl@aJa5c9cf8PI=VW}|xv$d4dVNzW>fA3@CRUZo&Ef|vn5`7l3%wfg2Wa)R6`2M$<6
zANkF7{!pjefHepNX23iK(y$<?2kPz3h9L`Jegw(<3~dDa5yYM!z6a!tkMYWz>myr0
z&HyphqYapW&Hyp1;|ih9*!(em3WO;KmRXxvz{qF=W;!MVT>=SWke<sa?J$>sxJ_w&
zFzZ2Fi;QNl^&s|x%)Nq)p_}Jb&j(t)*{*gM6Es@qRV!~+Xn<NRHyOm;*$B1|#Pn^3
z+Xv#_Z)t?t2jX_L!R-Ta?K&X#f!NPFCxF5i#GKV#EXc%Yuvu{KPF*2$Gcyw-149cV
gbBlOmBTGYbv(0x--Sij66fc>qC@44mnG~ZK0LrE3tpET3

delta 766
zcmeyhmF3S?mJJg{S(O-oVDfco&CUBo-?Olq19_?-?&LdC-@v?>&DW(>7#XK;{v-30
zg>mcTK4tgKno22*jF&g}DX(H=^ahJGsAe-VW`dc<>gkM(?O^63jU+}^IiQgr!Q2U2
zX<#lRKbY&J1CeFa1#>^>CPHMFg1K|`vmo5VU~aG>l=~3O<uuM_WMcdeX74qLVr1uG
zEC7MY0&}%DdzuAtLOo^}A~pG(6aVIu_6>|s&%uPs9W5Y2F_VEpo6kA<0DTE$DsQ%P
zX=McZ6vTY)S_bqfnAzxF0`e_LRMN8w<XaGPyH_d5w;*PKPd?1IV6DCoF3`6iZk<2W
z1G-?YKwt*Udmz~bK|N5<Z#E2B0AW4^EBqPS2=*yR)%@^1ASZl`SKeG7*#dF`h^ZcJ
zzzlQ(h*=$12zA2dkMUC=#_)q>)+QD(0s|VP$T1n}lBHno<&<`a!oy&0Q(7O)dXQp^
zjApR)AohdIy@HJ1o99)}2U@+^u67p_G;-%vD{oe4fLIOmE{MCc5o{lb>Dvsq55&FS
z(g?E;#O-K<+Xv#>bwKO`v7dEL0EI1xIjg%^kcHXEz;rYJ+?~1-Mn<M)28KXvWE5{=
mXl`n0%+A2b$e=U1kX2^$pHtiYg)vo>OjZ<>oBl+KQ49b+7V=jB

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml
index 47c01b9a4..a62e6c827 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jrxml
@@ -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="RelatorioTaxasLinha" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="205"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
@@ -144,14 +144,14 @@
 					<text><![CDATA[Total Empresa: ]]></text>
 				</staticText>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="0617c1e5-cd2f-4b67-ba79-d68c6604275e" x="331" y="1" width="30" height="11">
+					<reportElement uuid="0617c1e5-cd2f-4b67-ba79-d68c6604275e" x="341" y="1" width="30" height="11">
 						<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{TOTAL_EMBARQUE_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="64e6d5bd-b475-479b-a12b-c4c28025fd57" x="361" y="1" width="30" height="11">
+					<reportElement uuid="64e6d5bd-b475-479b-a12b-c4c28025fd57" x="371" y="1" width="30" height="11">
 						<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
@@ -170,56 +170,56 @@
 					</graphicElement>
 				</line>
 				<textField>
-					<reportElement uuid="95408a88-e07a-409a-a11d-5061362a9521" x="241" y="1" width="30" height="11">
+					<reportElement uuid="95408a88-e07a-409a-a11d-5061362a9521" x="261" y="1" width="25" height="11">
 						<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{EMBARQUE_VENDIDOS_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="e6546467-4251-4025-a0b8-e6502bc5b141" x="271" y="1" width="30" height="11">
+					<reportElement uuid="e6546467-4251-4025-a0b8-e6502bc5b141" x="286" y="1" width="25" height="11">
 						<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{PEDAGIO_VENDIDOS_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="d3f05b2b-2c01-4b3b-a471-e79b0e5bbd75" x="301" y="1" width="30" height="11">
+					<reportElement uuid="d3f05b2b-2c01-4b3b-a471-e79b0e5bbd75" x="316" y="1" width="30" height="11">
 						<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{SEGURO_VENDIDOS_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="">
-					<reportElement uuid="aae4ca90-ecdd-4f3b-9199-20a7bd86ae56" x="421" y="1" width="30" height="11">
+					<reportElement uuid="aae4ca90-ecdd-4f3b-9199-20a7bd86ae56" x="433" y="1" width="27" height="11">
 						<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{qtdSeguroOpcionalCancelado_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="1e9dd609-759a-47ba-abe8-16186f491d24" x="451" y="1" width="30" height="11">
+					<reportElement uuid="1e9dd609-759a-47ba-abe8-16186f491d24" x="461" y="1" width="33" height="11">
 						<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{totalValorSeguroOpcionalCancelado_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="">
-					<reportElement uuid="b60d9e41-0cee-4745-b7de-e8893a5730f3" x="481" y="1" width="30" height="11">
+					<reportElement uuid="b60d9e41-0cee-4745-b7de-e8893a5730f3" x="495" y="1" width="25" height="11">
 						<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{qtdSeguroOpcionalVendidos_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="6f182823-9822-49ec-a0e1-76cca114addc" x="511" y="1" width="30" height="11">
+					<reportElement uuid="6f182823-9822-49ec-a0e1-76cca114addc" x="520" y="1" width="30" height="11">
 						<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$V{totalValorseguroOpcionalVendido_1}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00">
-					<reportElement uuid="5162f048-897c-495a-9033-20c188c17d4e" x="391" y="1" width="30" height="11">
+					<reportElement uuid="5162f048-897c-495a-9033-20c188c17d4e" x="401" y="1" width="30" height="11">
 						<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 					</reportElement>
 					<textElement textAlignment="Right"/>
@@ -355,7 +355,7 @@
 		</band>
 	</pageHeader>
 	<columnHeader>
-		<band height="12">
+		<band height="13">
 			<line>
 				<reportElement uuid="04a75f17-3686-484b-be43-7b7e22e9def7" x="0" y="0" width="554" height="1"/>
 				<graphicElement>
@@ -363,28 +363,28 @@
 				</graphicElement>
 			</line>
 			<staticText>
-				<reportElement uuid="9c579f27-ee14-4804-b73d-64994a6e41ec" x="0" y="1" width="34" height="11"/>
+				<reportElement uuid="9c579f27-ee14-4804-b73d-64994a6e41ec" x="0" y="1" width="48" height="11"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Prefixo]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f" x="37" y="1" width="55" height="11"/>
+				<reportElement uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f" x="49" y="1" width="61" height="11"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Origem]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="92" y="1" width="55" height="11"/>
+				<reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="110" y="1" width="61" height="11"/>
 				<textElement>
 					<font size="7"/>
 				</textElement>
 				<text><![CDATA[Destino]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="151" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="171" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -394,7 +394,7 @@
 				<text><![CDATA[Emb.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="93a5880a-7547-4e53-85f4-09a6c22d5699" mode="Transparent" x="181" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="93a5880a-7547-4e53-85f4-09a6c22d5699" mode="Transparent" x="201" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -404,7 +404,7 @@
 				<text><![CDATA[Ped.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="1d4f5650-a014-468d-a9b2-c58887492ace" mode="Transparent" x="211" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="1d4f5650-a014-468d-a9b2-c58887492ace" mode="Transparent" x="231" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -414,7 +414,7 @@
 				<text><![CDATA[Seg.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="9b724ccc-0e90-4271-9e51-54128161d074" mode="Transparent" x="331" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="9b724ccc-0e90-4271-9e51-54128161d074" mode="Transparent" x="341" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -424,7 +424,7 @@
 				<text><![CDATA[T. Emb.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="88be8133-60fd-45a5-9c81-363647bb3002" mode="Transparent" x="361" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="88be8133-60fd-45a5-9c81-363647bb3002" mode="Transparent" x="371" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -434,7 +434,7 @@
 				<text><![CDATA[T. Ped.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="bb5f610e-adc6-4f73-ba16-11ce1ec169a3" mode="Transparent" x="391" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="bb5f610e-adc6-4f73-ba16-11ce1ec169a3" mode="Transparent" x="401" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -444,7 +444,7 @@
 				<text><![CDATA[T. Seg.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c41834a6-5ca0-4bba-a5ac-0cc2dd7a35b5" mode="Transparent" x="241" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="c41834a6-5ca0-4bba-a5ac-0cc2dd7a35b5" mode="Transparent" x="261" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -454,7 +454,7 @@
 				<text><![CDATA[Q. Emb]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="88257609-1874-4558-b57a-bc6f811f7896" mode="Transparent" x="271" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="88257609-1874-4558-b57a-bc6f811f7896" mode="Transparent" x="286" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -464,7 +464,7 @@
 				<text><![CDATA[Q. Ped]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="276a9b95-f7ce-44e7-a3a9-65f7fd6944fd" mode="Transparent" x="301" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="276a9b95-f7ce-44e7-a3a9-65f7fd6944fd" mode="Transparent" x="316" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -474,7 +474,7 @@
 				<text><![CDATA[Q. Seg]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="b5fde6f7-0dce-4379-bd51-9ca891f2ee64" mode="Transparent" x="421" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="b5fde6f7-0dce-4379-bd51-9ca891f2ee64" mode="Transparent" x="433" y="1" width="27" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -484,7 +484,7 @@
 				<text><![CDATA[Q. SO.C]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="8234630e-a75c-41eb-8bdf-5f4741e30a18" mode="Transparent" x="451" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="8234630e-a75c-41eb-8bdf-5f4741e30a18" mode="Transparent" x="461" y="1" width="33" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -494,7 +494,7 @@
 				<text><![CDATA[T. SO.C]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="8ec41c30-637d-47bf-9034-7bf2325a340c" mode="Transparent" x="481" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="8ec41c30-637d-47bf-9034-7bf2325a340c" mode="Transparent" x="495" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -504,7 +504,7 @@
 				<text><![CDATA[Q. SO]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="24525295-120f-4704-bc9a-ea2fdd548246" mode="Transparent" x="511" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
+				<reportElement uuid="24525295-120f-4704-bc9a-ea2fdd548246" mode="Transparent" x="520" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@@ -518,109 +518,109 @@
 	<detail>
 		<band height="12">
 			<textField>
-				<reportElement uuid="b12cbc2b-3eac-4c2c-b94c-cac2e746b2c2" x="0" y="1" width="34" height="11"/>
+				<reportElement uuid="b12cbc2b-3eac-4c2c-b94c-cac2e746b2c2" x="0" y="1" width="48" height="11"/>
 				<box rightPadding="5"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{PREFIXO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d19cff45-ad13-4a6b-b6f3-3e871a6d8d58" x="37" y="1" width="55" height="11"/>
+				<reportElement uuid="d19cff45-ad13-4a6b-b6f3-3e871a6d8d58" x="110" y="1" width="61" height="11"/>
 				<box rightPadding="5"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{CIDADE_ORIGEM}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f868a599-c0bb-4187-97b6-7681b753abbf" x="92" y="1" width="55" height="11"/>
+				<reportElement uuid="f868a599-c0bb-4187-97b6-7681b753abbf" x="49" y="1" width="61" height="11"/>
 				<box rightPadding="5"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{CIDADE_DESTINO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="6454beed-fb72-4aa5-8bff-7eb4ea6c26ba" x="151" y="1" width="30" height="11">
+				<reportElement uuid="6454beed-fb72-4aa5-8bff-7eb4ea6c26ba" x="171" y="1" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right" markup="none"/>
 				<textFieldExpression><![CDATA[$F{IMPORTETAXAEMBARQUE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="1242bccb-ce44-47d6-ac13-6f4df97f707e" x="181" y="1" width="30" height="11">
+				<reportElement uuid="1242bccb-ce44-47d6-ac13-6f4df97f707e" x="201" y="1" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{IMPORTEPEDAGIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="2184d556-1501-4525-8d09-510f9d798b86" x="211" y="1" width="30" height="11">
+				<reportElement uuid="2184d556-1501-4525-8d09-510f9d798b86" x="231" y="1" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{IMPORTESEGURO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="58c1e14e-9c44-4e34-8b57-fbb6af384ce3" x="331" 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>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{TOTAL_EMBARQUE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="05426ccc-ff54-4381-8406-ae0c4290a54b" x="361" 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>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{TOTAL_PEDAGIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="8a365def-0ad3-48e8-b942-5d00f5d74a21" x="391" 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>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{TOTAL_SEGURO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="7059069b-3c22-416a-afc1-d05473a3d429" x="241" y="1" width="30" height="11">
+				<reportElement uuid="7059069b-3c22-416a-afc1-d05473a3d429" x="261" y="1" width="25" height="11">
 					<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{EMBARQUE_VENDIDOS}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="049ba79a-5ee9-4ee2-80d7-d498ad7d7125" x="271" y="1" width="30" height="11">
+				<reportElement uuid="049ba79a-5ee9-4ee2-80d7-d498ad7d7125" x="286" y="0" width="25" height="11">
 					<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{PEDAGIO_VENDIDOS}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="c15ba1bc-2040-4a73-a221-52d574fbedb4" x="301" y="1" width="30" height="11">
+				<reportElement uuid="c15ba1bc-2040-4a73-a221-52d574fbedb4" x="316" y="1" width="25" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{SEGURO_VENDIDOS}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="14366362-112f-4407-af42-1d4bb373340a" x="451" y="1" width="30" height="11">
+				<reportElement uuid="14366362-112f-4407-af42-1d4bb373340a" x="461" y="1" width="33" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{totalValorSeguroOpcionalCancelado}]]></textFieldExpression>
 			</textField>
 			<textField pattern="">
-				<reportElement uuid="9921ad8d-d1bd-4789-becc-583210c0b4e9" x="421" y="1" width="30" height="11">
+				<reportElement uuid="9921ad8d-d1bd-4789-becc-583210c0b4e9" x="433" y="1" width="27" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{qtdSeguroOpcionalCancelado}]]></textFieldExpression>
 			</textField>
 			<textField pattern="">
-				<reportElement uuid="1d0ddaa7-506e-4e81-b798-d6832489da83" x="481" y="1" width="30" height="11">
+				<reportElement uuid="1d0ddaa7-506e-4e81-b798-d6832489da83" x="495" y="1" width="25" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{qtdSeguroOpcionalVendidos}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00">
-				<reportElement uuid="fb64c49c-1370-47fd-a0b0-e4d5f24d02d9" x="511" y="1" width="30" height="11">
+				<reportElement uuid="fb64c49c-1370-47fd-a0b0-e4d5f24d02d9" x="520" y="1" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
@@ -631,14 +631,14 @@
 	<lastPageFooter>
 		<band height="11">
 			<textField evaluationTime="Auto" pattern="#,##0.00">
-				<reportElement uuid="1d265368-d216-4cec-a824-a0c0b5536a43" x="331" y="0" width="30" height="11">
+				<reportElement uuid="1d265368-d216-4cec-a824-a0c0b5536a43" x="341" y="0" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{TOTAL_EMBARQUE_2}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Auto" pattern="#,##0.00">
-				<reportElement uuid="adfa3eb3-6ab0-4141-aced-e3d231e4f433" x="361" y="0" width="30" height="11">
+				<reportElement uuid="adfa3eb3-6ab0-4141-aced-e3d231e4f433" x="371" y="0" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
@@ -656,56 +656,56 @@
 				</graphicElement>
 			</line>
 			<textField evaluationTime="Auto" pattern="#,##0.00">
-				<reportElement uuid="a4f4cff0-6b6e-42f0-9f07-7cbd06f5a545" x="391" y="0" width="30" height="11">
+				<reportElement uuid="a4f4cff0-6b6e-42f0-9f07-7cbd06f5a545" x="401" y="0" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{TOTAL_SEGURO_2}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="58961ea4-a59e-4a77-b898-b2df93fc43cb" x="241" y="0" width="30" height="11">
+				<reportElement uuid="58961ea4-a59e-4a77-b898-b2df93fc43cb" x="261" y="0" width="25" height="11">
 					<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{EMBARQUE_VENDIDOS_2}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="96bd08a5-5321-4938-8d4b-5260faa9a283" x="271" y="0" width="30" height="11">
+				<reportElement uuid="96bd08a5-5321-4938-8d4b-5260faa9a283" x="286" y="0" width="25" height="11">
 					<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PEDAGIO_VENDIDOS_2}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="c090f6cf-7340-4990-92d0-101fbf056cb7" x="301" y="0" width="30" height="11">
+				<reportElement uuid="c090f6cf-7340-4990-92d0-101fbf056cb7" x="316" y="0" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{SEGURO_VENDIDOS_2}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Auto" pattern="#,##0.00">
-				<reportElement uuid="8e2ee368-5832-4f62-875e-0267b5759e18" x="421" y="0" width="30" height="11">
+				<reportElement uuid="8e2ee368-5832-4f62-875e-0267b5759e18" x="433" y="0" width="27" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{qtdSeguroOpcionalCancelado_2}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Auto" pattern="#,##0.00">
-				<reportElement uuid="20bce09a-9883-41fc-ad0c-8759f8cad519" x="451" y="0" width="30" height="11">
+				<reportElement uuid="20bce09a-9883-41fc-ad0c-8759f8cad519" x="461" y="0" width="33" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{totalValorSeguroOpcionalCancelado_2}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Auto" pattern="">
-				<reportElement uuid="c3ab4658-281d-4d4b-ab42-0119e259812e" x="481" y="0" width="30" height="11">
+				<reportElement uuid="c3ab4658-281d-4d4b-ab42-0119e259812e" x="495" y="0" width="25" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{qtdSeguroOpcionalVendidos_2}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Auto" pattern="#,##0.00">
-				<reportElement uuid="e550f9d5-3815-4158-9162-2366889d1963" x="511" y="0" width="30" height="11">
+				<reportElement uuid="e550f9d5-3815-4158-9162-2366889d1963" x="520" y="0" width="30" height="11">
 					<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right"/>