From 618b16098b53b8c4e00c323a5162126404ea23af Mon Sep 17 00:00:00 2001
From: valdevir <valdevir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 10 Dec 2020 13:15:45 +0000
Subject: [PATCH] fixes bug#19789 qua: dev:Valdir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104664 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...orioResumoLinhasAnaliticoSumarizado.jasper | Bin 105120 -> 105150 bytes
 ...torioResumoLinhasAnaliticoSumarizado.jrxml |  12 ++++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jasper
index b15a5357364b0c935f4c372b7e76c2714296539b..b5e72c5ade5901b7d285b60cedd050f46f47845a 100644
GIT binary patch
delta 3008
zcmZ{mTTE0}6o$`_I3sgV#Njf)h+G6g24s{G5D~CNG*RTDqNYgDG-;`=noeqysu4|m
zXqpI~m}P8Qi%r_5Nlgu*Hm0$yO&X&%X_NX;(i-fOPgNh9G_95Hz1AM)3`2QX`{!S4
z?{8nuK4(6d@Z6a2d|o|?45ux-YJAV+RCbEB&uMzRujugWN30Xxy(v-4*S@W*r@gmr
zV9WEyL^S2V_`8p%(wdK3)^|IssAYHb?Cjb;uysr4<~H5$v<_!@h**iYXXg$*Mm+6&
z`S(MNjF0`33edTyCC;s<!?>ix_`!c0VBgf;t(Ps!TI6(}3_4q<{m%Vo9WFn^_|+hK
zl8TkC)M8HEncnU4GL2Vy{#8U={*svQU2|B^?rR<lH>nUfrJ6C-xXQCtxu0$TwWdA^
zp2HR2q~L(7TW-v(p+oZ$_<?xl@jQ5v7n4VW3y?*vso1Bcb14<aR1=(!ZONrU8ulPe
zKh94eEETuSgNW*R)PuI<p35{ONIoxishUAAL+*QLAj<4pfMc!|mFgbNRFKA_cBi>Z
zZ>J%udbIcub@f=mD}BL-lK<Pf3Mx)VBfVtvnD5(oQ;m|FjxA=w>c4l=F`}BK3%R+n
z5QFht(;}Qyxv!*Y&OmoOcRho1O^c;uaV%F(b(#1T_b77-?yBbg61*4h^|2o(Tq|gx
ztA4c5p{#`cZ4~#9teMkOlPJo@YpOXb&9iK@fSmBT0PV_AfR)aJz4^2#7hU!$_0Xkp
z2+`<r_&s9KgOa!|E{^Nr^0@vX7XgHvp9-tVAHZ+eKu-b~vp4G@Ikd`<V#tt2^N>dK
zkVYdPL9{w!>w~l|9~ZE}8E&c}6rj@EuJ1?MCJGl|t=+FRhuy*uLl{Og!)Rt0&5YeN
z96}MgozW{nstuwMebicr0G$e=)L?%O&c+_nSPnyi6+^H_GuCLv8qL@tH+Ej3dctId
zpBBzWozf@{#|0&Zpp0ge(Tp;hQODh=UzXtwgE~<(8+BfzIE)BN3_%&qD5Du=G^0ig
zibjjo1@5DV#b`3Lo)Xl-9NH(E!{M@U#1M|r%rTldMl<KKdr4<Xu}ZPND4k&yEk`BV
zX>0}7+t)RV!-TNJ5SG!*GMZUNGi$=l+Fr)nr*F+v8449-x(p%TZ4KezgfIHNB5w;r
za>NXyH6u^-VfDwKm|m^)Ft_*~O_r;BE04s{74g+f>Ix3`WHn+4$!I1S&8sn*S98z3
znvW_l9DCebD`y_}bCr0-{!^1UJQ9)^LNc03Ml;E1COvYKzF(=n8hun&rO${4tI+4Z
z#*uWNt#A@NG+GURgBY?moAd|X?2oCG#P;L_9f_zHlk|2*TMANq9`{6Ug!qR46+)HT
zUVV-ms<GKF(0C33!HY2m-knImOM>xvrfBxr`T~5mks9<G_=h#9Ksnv5LAyEa)>W}v
ziC+DRQ+rdRC&!^uCMU)mlXE8$CMOBm8_}{im1b|Kw-$TU0ex1BDf>Ci<FJu=9x>=@
z7@=jN=h%Kzq_;m$G(XoJ?jzbr6|2>IeItDvK|T$v#x}c4!#H#bObiVxD_1|eX3|}A
zFikBpMJF>msbdYQ(J9QcYZP-p56Yomm|`R_#hQa@YBjS&bTYF)_OR}ulXdDg^v^6f
zhwjv&-ae>jz(IXK)Z^|EBVh(&%`pR0t7p(GI(Y^|Gc$-<3!;Pj5573CLw-41u{Vux
z=$bl))5uy|TVEGxTsu%7ZfL9vdo92UIY;IPX?h*J*WRkf@B1?oYogX_C+rQ<+ZU1Z
EA5~sw!~g&Q

delta 3393
zcmZvedraF^6vulyXxAdI@f>vJSze_;p&ic_(djk<W4v^AN;8)c6~ju_n31>*_J@Bc
zi?UzHH9p8p_J=XSY$0<oP6!z>CR?(Rn8lEpKw`}1{%|uU8b$Hmb8gG8^zz5Kr}umA
zJ)e8-<Hy1^)1_;sE3Q>Y);hAB^MTd1ETi$J*7|tJ=&qap`th2@H*PT89593pN&EW-
z5BCJS4jwwtF=jYxJ}1oiQ^H0<%zc9c9l?Y9wq)(z-w$AFe(|3K08O)R6l=e1Ov1;)
zn}7G;CP-Qk6Bu4M7z`;|?}SZzV>5%DF@i-)-1O_jR4KYZW9a}@Iw=jMhnq)qed)5V
zWad5a!otiF^uRYb5EfV)z<J&*@<ul#ix0_QK_l#yDR{_|5hipYIT*6G18UfX9pKd|
zxe>*)HTdZSc$?4hEj2BP&>hci!*O>Lp<g%Io=B&i1x+z&>|4rR6PV)XE5LvPGX#0&
zb7lnCFsm{bV`QoYs@RR4F-b}yikRc1B|4b@dSHPtZ(gxNSjStA1AenYMLbZ2)^R73
zttNqky^|!ig55}h)4IV`(ExKpNSqtmUmp0yQ}6+AT9dK4oeameY8yy_39hYDb2Jrt
zx3nKqQ46F|NLoZIV}0pxA68iHF1XE`ja~3*Ja8jljD!7=0X;g%rbuTVyO0@Etmde)
z9p9e?qa1OL8e2BB^9$g<n9IW1Ja3t{{!$*R&Vj=|CttM%O+^SVLzlR4A^sN?oFqIS
zFR=Ae$S~0q%v}N*1>}c9VMD^`$<Y%uvOh9ig|=dMF?TNf1TETRYYp@5hEqOqVJ&Fd
z6bPg$5J(^d=?est^v8<825s7BZ8ml!4?ctz_9PEpG<V>-o?$)tu-6w5nb8a=GLx#v
zOaf(=K4z9aW*%VaHYkK{ZTd?aJ7j}q=x0NA$YqyoP$F0VyA3L1fUF||2#q$~m{CaX
zhysBE2|@aZAbms_)*}?z;j~Qqy?t9+-&v6s&A6ftq$(gtAPDIrg!B<&To3VQ0lXz4
zJ}KM|F)bj_Oer8pRX~tH5Yk5o=_ACH9^zIJwD8R^6+^3J2^E6}<dL{6DA3F*C`eUM
zkU$jDM+)g9#jKv<atYLOiXTd%6#i1Egbub?4sE`#1O=L_3JOvc6eJLZ^pQgPNO4tC
zuwDmT<OL8f!G8|0^VECFpxXDHNR4J$k(yLRY7!{5^hN63asYn;@O6nk1<Uvp{8h%E
zDS8TK%D0w(PcWcaQ819IU?71Qq>sy&J}!SnzX{6~Fd4a*LzU5cd8HCYd`|=ennwx-
zQWXp&5QFrQLHfw>NYC(d6%28PXPwc5Fz1ZD8eYHE%wfnF<6)#44<iM(?&2>qO+i7u
zx~E(QY18fbMypXzcE1{5t!x)K<vDrT1qXaNf(1>cf`wEC3kk?luMdi0k;3-VV$H<U
z(q9Apl4PldfA5RguQl+TJU>IVk*e`(^4FbLtxAxhaVSVhRgjWERnrH>kdi=Eb40Gx
zSRDj-_FHwZR@yF-qwy<}lgjS6q1q&Uu}eMV(}0+KB;Xy|uirht__p%TZDRP?t8Z@m
z-dg=^-3xi_Og(g$b_pIdoeCaO1&<?{|2G_s?V=4MS%F1DJXR+=(Eu*!B!IaF4scXV
ziYA}{AT<U+c8R*QlCJ<DAs!$g$|5ojvRM!0K_FU+Z1&Itjn>zMh(>&B&GL5)0EJ)$
zULaoqKtepga1<bH*om7H9N0(WBafhUSU}}#?>8h~-}J(9Nbxo`dOYstptsIj*WkS#
WYJ{ZY>9L(*L%rrU+t}wHLH7S*7w~@o

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml
index 4b308f84d..82b674454 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml
@@ -1,8 +1,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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="3.138428376721017"/>
-	<property name="ireport.x" value="1379"/>
-	<property name="ireport.y" value="292"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="388"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -46,6 +46,7 @@ FROM
   (SELECT TAB.INDSENTIDOIDA,
     TAB.RUTA_ID,
     TAB.NUMRUTA,
+    TAB.PREFIXO,
     TAB.DESCRUTA,
     TAB.INTERESTADUAL,
     TAB.GRUPO_LINHA,
@@ -100,6 +101,7 @@ FROM
       (SELECT RUTA_ID,
         INDSENTIDOIDA,
         NUMRUTA,
+        PREFIXO
         FECCORRIDA,
         DESCRUTA,
         INTERESTADUAL,
@@ -180,7 +182,7 @@ FROM
         AND CR.RUTA_ID = NVL($P{RUTA_ID}, CR.RUTA_ID)
         AND DECODE($P{GRUPORUTA_ID}, NULL, 1, RT.GRUPORUTA_ID) = DECODE($P{GRUPORUTA_ID}, NULL, 1, $P{GRUPORUTA_ID})
         AND CR.CORRIDA_ID            = BL.CORRIDA_ID
-        AND CR.EMPRESACORRIDA_ID     = 10
+        AND CR.EMPRESACORRIDA_ID     = $P{EMPRESA_ID}
         AND CR.ORIGEN_ID             = PO.PARADA_ID
         AND CR.DESTINO_ID            = PD.PARADA_ID
         AND PO.CIUDAD_ID             = CO.CIUDAD_ID
@@ -209,6 +211,7 @@ FROM
       GROUP BY RUTA_ID,
         INDSENTIDOIDA,
         NUMRUTA,
+        PREFIXO,
         FECCORRIDA,
         DESCRUTA,
         INTERESTADUAL,
@@ -244,6 +247,7 @@ ORDER BY SUB.DESCRUTA,
 	</queryString>
 	<field name="RUTA_ID" class="java.math.BigDecimal"/>
 	<field name="NUMRUTA" class="java.lang.String"/>
+	<field name="PREFIXO" class="java.lang.String"/>
 	<field name="DESCRUTA" class="java.lang.String"/>
 	<field name="INTERESTADUAL" class="java.lang.String"/>
 	<field name="GRUPO_LINHA" class="java.lang.String"/>
@@ -998,7 +1002,7 @@ ORDER BY SUB.DESCRUTA,
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{NUMRUTA}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{PREFIXO}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="9c07acec-d267-4686-b7b0-edbb1899fc95" x="15" y="0" width="141" height="16"/>