From abb6e0d6e21a960351690a85b0aac804cdd03c10 Mon Sep 17 00:00:00 2001 From: "fabio.fbarreto" Date: Wed, 1 Nov 2023 11:26:22 -0300 Subject: [PATCH] Padronizacao do campo de KM fix bug#AL-3256 --- ...LinhasAnaliticoSimplificadoSumarizado.java | 2 +- ...atorioResumoLinhasAnaliticoSumarizado.java | 2 +- .../templates/RelatorioResumoLinhas.jasper | Bin 49317 -> 49494 bytes .../templates/RelatorioResumoLinhas.jrxml | 2 +- .../RelatorioResumoLinhasAnalitico.jasper | Bin 120295 -> 120238 bytes .../RelatorioResumoLinhasAnalitico.jrxml | 6 +++--- .../RelatorioResumoLinhasController.java | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java index c83e8c94f..d556fbdca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java @@ -291,7 +291,7 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato sql.append(" nvl(gr.descgrupo, 'Não Definido') grupo_linha, "); sql.append(" ( "); sql.append(" SELECT "); - sql.append(" SUM(nvl(rs.kmoriginal, 0)) "); + sql.append(" SUM(nvl(TR.CANTKMREAL, 0)) "); sql.append(" FROM "); sql.append(" ruta_secuencia rs, "); sql.append(" tramo tr "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java index 93e5aa83f..68d617cc1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java @@ -211,7 +211,7 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio { sqlSb.append(" ELSE 'N' "); sqlSb.append(" END INTERESTADUAL, "); sqlSb.append(" NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, "); - sqlSb.append(" (SELECT SUM(NVL(RS.KMORIGINAL,0)) "); + sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL, 0)) "); sqlSb.append(" FROM RUTA_SECUENCIA RS, "); sqlSb.append(" TRAMO TR "); sqlSb.append(" WHERE RS.RUTA_ID = RT.RUTA_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper index 7d37afb9f19ea28059741f57770cc8dbfdd58684..2d1cd3872f7b92d51d3efcba5a57d218029235c0 100644 GIT binary patch delta 4601 zcmZ{nYitx%6vyXocelVcDs0`BinQPs1S)+gzl@)t`#UaU6O&3n7i?Y~7S=nVS+xSJh zieH&O*d_wG`=&ryc_@bC=klrI801#X$rQJ69?1<24yS~pEaE7OIBc=6^%A^cMnQiE z=W0b|3{Gq1RPhURReHUNa+;0A9#6wTB6L@|*YZT3v)uHfQFAyb(FC!iHv8D5wJZ0> zkWQ-Nh0F3zMp6=whLlqxWvd}I2NqHl#F2W&CcUS+Jce{{wOUiSP(5LsS24oGRjF{Z zdbP(pcC8(&N@8l=SQS0%d^~HCJk42iif3KOR&&9;()IXYPr3RW8 zOWoBxPwL6$JgL7o=Ssc5rBG^J3(onlB|oV~7;SA~Be8Z>tsk;mX2`FTTXP-sHJk}0 zLrZJA{I07N5s$T=^^EU!V&2>w%O?+mi;?|nZ`x9?*uq9q&|l+kEvYC8 zl=#bNeQj6Z(E10`Fq}Z)qa_uikq8^NA^mX=eE)P3{JZ|LxB~uAvg3*fJO7g3-y3ml z{K@IYV-u@uv2ZY2(-vC9lcm;$rb+!QW9a-I{j znX_Qzsj1Mp{;q{%k;_?*41Yy1daU*wBJIzdx7~ji-c$^Ej*l)21S+emOM-s6GzrNl zDX_Zjnn;fT$|EW*2fZS*s?x9zhnjZ8bL_TYd|>FfS3ad2nPt_APYIAQ)~(6 zX?c>jcMyvQE|jLisqI#hACZJ)L_@-8YoURQ0Bk_#Q{MnOHh9j)bP%1f=Y#dc8-sO3hbICe`L?>Dsnj` zl$}Jtx;}RykK-|Tj*|m3h6-TffZNFj17g?(VLZP(gw4nI$S0TVq~1YYFXO{}rGI9U zJq7!dBvXGLYxeUVh$`M9MB%AIdOYbA@`^Q z^0!!T!58=8g^GK#4k1XI2!h8N2yRllrR`>qk+K-J$da;p{$M8;nChXXsn9f7) zYbmeh$sa-iTl#lsvFQnI@1++=`JxeC_gH8n*NFbhZkOE#(jdFv1L=J}*IP(I@+ML6 zSW;xAv(*r&Ig(&H+jxREkwBJ~cY@n}X+qYfp5?9&uph|~_2V)1W2@<>=3qaz@%@JG z^vi%W*)@8OPlL~O0(+7SQ%@daPX}4}Xq!8cC!D}-TgVgQy9|$Z2^-^RZCh*j?a>%r z-r>l)0gn*hLf-+m6HD08u9-ByuyCF)zc44Kz}Gt8mov{-82S6a`q`TAq3ulm|K@Q3 AegFUf delta 4736 zcmaKvYfKbZ6vtLTChq* zmZN^K2@%uUSX#8*wAyGNv^7zaHd2$uHrm>6R@-WA+NQ?V-gC|c@3_PI;mdONZ{1=8C(TF_$%us7!b8MLDT zNgEk(P6iyB7|0$pkUe1rZ4k=6YCD62lboi(Ij6xnG#Om>;NY?+Z1B_YB=4qv5z6x? zLv;QM{WB2-^e^Fd{u{m9um3Lb57j?}_L`AUSWpoGBOd-J7_E20m|3Z|#|T66h+sG; z7!FNfWDml~o-mk43e4|?MG;|k6^+*K!kDIUD=e{sh9!o5bCh!?t6Z4ZS3y0Q@(NhC z+&-L#7NC56&snm>D5P7LwnQY&SjNjXWrZaPNl6k-NV#f4sum2STp&`}6Gob-kfwVI zB9dP8$TfxkJT`p-3@EM^`t$~Qzt|n|dWW}nrVgAb$#j#Ma@Ay}YQZp5F5pa~W%!$S zqP%aXmqeb{`I6pSB@3}gGEK0!YJ#N}3|L&C4Uj!y8<6>Q0Yjb3?H1hwpRb%F^vTL1 zp+&3a32k1LD)hoCuh7AztAxH->gw;&b-%w#i-)x1@$hNs6!G)DQoJ-}b(zq{)!9O? ztj3E*uURd0_Zl4Rqct;x{<_93)Kyj@^iWx*(67oILM`Rfg*wZp3EfnlA@oE!_WV`u z6q@S8-^)o`d@d1R_95DzzAoE0Rhq@=!WFy*U27Bd?$GyZ|F&3eS)jXYsQ3#%uOF9m z%TlEc$jS0%`SRR_Sxaa!Ew}V4?GdzWh=(~F?#5F~ZoyJdZgG~+og-U9b2k1PZO2-S zr$k)dTYx1M^ZK|3PE?Fd#7p89dPf$@5E0931pLn>ubJCzrf1PmE z>cvG%a`U{?0HZ>Qa>bKgLC1@uH}Pp$YylH*I<-N z(YAY1Oeek+qgu)R6ow=x$(?g@mm#`yXyPt=(EX%vueP-N!M8IWM%NCA08v?MggA!~ zBq4&}oFHT-*yo#ffT%yrAr_p7IQ{>QOin0g2 zE|FLD%hlv1j-fjdM${YUatqx^Zjc-2wFnvXKkwtH4lD&zmgJmOm!6UtXc_EcHGYZw&z;&s(qoU!!LmQfzn#tRw@G zY6IscRBFLMr4|fSvheKd$~q8QYMzJvjov}HA?8PM{Qe1X^nVM7rfIQ$zc`Q1IBPP( zl8m4wSEf`?cf&rEb;6FT4A3;l4^yB-XgCS+>CK&BQ9WU>&p z+j+Fx51ZT(cKemrCPj7jZ1M_ZBq^rVw0gy~dS?y=#1Wp>JX?7{ z#>4B)JsY~4@4HGwBB>xG&P|Zif&ob_7?8L?NEHGp4K5yDERg!Q+_p8MD@g;oMsp6! zV8YgVP3tW-GKayATe)Dc;{u(mOy!MjZ4mp0@9Tb5>t3jM=7nu-fcD^U_^~wst_58- zKxdL5VR0_7QoS6S@Tdg?4;QwJAvFU}5OKt>;(684nxqFML80vgx|6h#JLlxip^3X% zFt~Fe+`a9odp9KMZN2j!dBkOV7YRr@h=6k>*vg>^fm$#Sa3P$aqnDsc>rZ>)^YUk` z*7F@@?I5hPK`W#k{U_;q=6vy})U?4h{ZTR8iQ`(XL-w(iL#EDjI2;)+XNJS+OHWUq SI>Qxu=h*tmCcnejF6aMfA| - +