From ac15294de7ce2fc98fa5b6dd68332d626b5ca080 Mon Sep 17 00:00:00 2001
From: bruno <bruno@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 16 Sep 2013 16:22:27 +0000
Subject: [PATCH] - Ajustes RRL Analitico (caso 4551)

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30965 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioReceitaDiariaAgencia.java   |   1 -
 .../templates/RelatorioResumoLinhas.jasper    | Bin 115274 -> 115355 bytes
 .../templates/RelatorioResumoLinhas.jrxml     |   2 +
 .../RelatorioResumoLinhasAnalitico.jasper     | Bin 43616 -> 45261 bytes
 .../RelatorioResumoLinhasAnalitico.jrxml      |  46 +++++++++++++++---
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
index 18e6db168..ecc4dbaaf 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
@@ -650,7 +650,6 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
 		sql.append("    AND PV.TIPOPTOVTA_ID = NVL(:TIPOPTOVTA_ID, PV.TIPOPTOVTA_ID) ");
 		sql.append("    AND TP.TIPOPTOVTA_ID = PV.TIPOPTOVTA_ID ");
 		sql.append("    AND EC.EMPRESA_ID = NVL(:EMPRESA_ID, EC.EMPRESA_ID) ");
-
 		sql.append("    AND ((INSTR(:NUMPUNTOVENTA, ',' || TRIM(PV.NUMPUNTOVENTA) || ',') > 0 AND ");
 		sql.append("        :ISNUMPUNTOVENTATODOS = 'N') OR (:ISNUMPUNTOVENTATODOS = 'S')) ");
 		sql.append("    AND ((INSTR(:ESTADO_ID, ',' || TRIM(ES.ESTADO_ID) || ',') > 0 AND ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper
index 7c9bcd29453dd9ac28aef5c8335380c82564f139..fa2bf2b5af694741fe94eec5e018d9d0b591444b 100644
GIT binary patch
delta 174
zcmX@r!alo|eS^baCO)R=3;7u(H%I?vVH9=p*Yosq33B!H4G3}#_Vo8tuvIXa9>@cf
zPx!Z&mvIe<Exp~6hcS~`nNtA<9Q|AroP4lo-3~PRgtM5jiHV7^v7wo1yor&Sg}FI9
m10y4Y&g4Q?neDTK8ME>P(G`?T-k2mey*`MMbGq#zMqU8DJTDml

delta 120
zcmbQ;%6_VaeS^baCf=*l8~GR|H%I?vVcgvFZyzsX$7I2O65Eq`7;~7X7c(&mPfy@u
zWZlj!z_{L7%)r3H(#Xifz$D(%!qVK>h@F9vkwIs2A*;;xH^Gcqd4lK)N+xeilAC@Z
Mh>>%8-yud`06+93lK=n!

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
index b21dea335..4255eb26d 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
@@ -75,6 +75,7 @@
                    AND BO.FECCORRIDA = CT.FECCORRIDA
                    AND BO.ORIGEN_ID = CTO.ORIGEN_ID
                    AND BO.DESTINO_ID = CTD.DESTINO_ID
+                   AND BO.INDREIMPRESION = 0
                    AND CTD.CORRIDA_ID = CT.CORRIDA_ID
                    AND CTD.FECCORRIDA = CT.FECCORRIDA
                    AND CTO.CORRIDA_ID = CT.CORRIDA_ID
@@ -162,6 +163,7 @@
                    AND TF.ACTIVO = 1
                    AND BL.MOTIVOCANCELACION_ID IS NULL
                    AND BL.INDSTATUSOPERACION = 'F'
+	         AND BL.INDREIMPRESION = 0
                    AND TF.VIGENCIATARIFA_ID = VT.VIGENCIATARIFA_ID
                    AND VT.ACTIVO = 1
                    AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper
index 610d58c34e986466f47f39d0c404829f475c84d0..968e439bb7b7e27bf6ea6673b663785f50916a1e 100644
GIT binary patch
delta 3832
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
MFi~3yo8DOb53#Xu*8l(j

delta 2569
zcmZ{mTTEO<7{||?-9mu^5<tqOxDb$wbSbcQq3NzU?rw3@Wx?Ggu?gu}Dg?D$cFW<?
z3-^1P*wQa1MjvcqLSuXo!b{UgQ)6mkt52Hv-~$?iq4CYcM5$J1zB#i(neM~4|Fi!u
z^ZU=284ln6tp4=9x_UKyAg+v)QurvmTpTeJa*RHzAw#j$+fjzuZ=-`3lp3f@u7Kgl
z`y>rA+lL#~Pr|-{&l9mlv{&ubHK{iKsbr77HzK}ZSZmc!x74!dHZ2_1ntlFIYq)AX
zqoZ4elX^~(t{O^ms6C?Tes64$adl!SjvAXMWQX)<AuQ+x*p%vPX$$$nd;5;0rodNv
z2{s&R4z;(nKD`tnV2PH);MuRCGMcY3+##>Va6!MvuLb^R9<XUaug!d>ZK>FH${*a_
zv;x!7mG!F5-^h_mit=Sdp?#-(9#3m1<o9YU{v<0iQ1|9Gxw>A^WhLYWkghzq-jxPg
z_Z0a+JgskazeLCeWc9?-HrURUAw^NrVYQ+RR(mc|r~0kG$S)8bEdcl1!HGv~VJur1
zQt`3?G5SdukGSD}meKqy!!I#nhGOj>=<nuhwxkHs7F<7Z6ts7KRMkIW*>8uy`IBV(
zM!e2NXb=l4>dyXzXjsVpgr)&&SF)4%3a~bikT>Ins=5QqgD#lq9T3RUK6|qIFC!s1
zhk>zVO2FKefVqKSAt~6DH{(Sl6S=SVH<1kJj1|GH{$i2fkN!OgUStWdlt>bASCW7m
zm_SIHz?3XO2_`6ujR@|;*dA^Z<6?10xZIU+xq)0EDc6*Y>p<>Ke28)57dm!NJHVJ&
znk7u`N|@Y0rjV3rO2%xa%n>^26yt>0?V!=Ho2)Z3mNODEcO_(QAX!LCHYFpU!QI{(
zs-^TFh7xpb*uf8WoN=-AO1RvWaJhk8At~3CjN6Oc*a%LU-E%TpNhY9r)WHT29rciH
zSev!EEwd~DmT5@<?n(l10|N*-kezR~)BB8nbz01eZJEZ4ZCvaV)6cqe-t`_MW4R_F
zb5}y<29kxOTQ?=!`Ze6T@A6r^T8H8D%cTOFab?dD|CA-bvLZ>qT}c9NU;-g&0#mXC
zE11AF#xHjsygQc7r(OUXV;<KXhQ)GQg5|CR%MHW|Nk?wB?;H7T9QkMC=fvK%3G>K3
zV0bL|C3x;i@Z3PWkaX9kWV^o4kKE)Go%`>TiKE^z<>p8ISH{J%DdBQg!sP~Xg``|l
zGVUhj*22Q{Y0CX>db8Z}n1Qg!UKZSiz(RTYq@pBRA0xpu>02V7OFYM~?0Sb;b|5%g
zsM4=5=8wULv(B`GbPX$(B)B`{CJOvB(?*h@Z|*3qtn1;Nvn-EwVaeUUdv4^>P&F^`
zM&7ggttxu7xoj8j*_X|lYhE~OmZ2OpI?wfX>z>#6QsORJb7`a=Q0G4;S@6w50o<D}
z1hV)yX@@6^hiT1Qs>*Obcyi}1{g=T``iN2w!KKpY8l5jUIGv46^^Llt?s$FU`qUDs
Ycs@t3Yj8eo88CIc7{(V<;NEKbe?bLHJOBUy

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
index 78a39bcfb..6924f75b8 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.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="RelatorioResumoLinhasAnalitico" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="2.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="18"/>
 	<property name="ireport.y" value="0"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
@@ -37,7 +37,40 @@
 	<parameter name="GRUPORUTA_ID" class="java.lang.Integer"/>
 	<queryString>
 		<![CDATA[SELECT TAB.*,
-       (TAB.EXTENSAO_KM/TAB.PASSAGEIROS) PAX_KM
+       ROUND((SELECT SUM((DECODE(TR.CANTKMREAL, 0, 1, TR.CANTKMREAL) /
+                        TAB.EXTENSAO_KM) * COUNT(1))
+               FROM CORRIDA       CR,
+                    CORRIDA_TRAMO CT,
+                    TRAMO         TR,
+                    BOLETO        BO,
+                    CORRIDA_TRAMO CTD,
+                    CORRIDA_TRAMO CTO
+              WHERE CR.FECCORRIDA BETWEEN $P{DATA_INICIAL} AND
+                    $P{DATA_FINAL}
+                AND CR.RUTA_ID = TAB.RUTA_ID
+                AND CR.ROLOPERATIVO_ID = TAB.ROLOPERATIVO_ID
+                AND CT.FECCORRIDA = CR.FECCORRIDA
+                AND CT.CORRIDA_ID = CR.CORRIDA_ID
+                AND CR.EMPRESACORRIDA_ID = $P{EMPRESA_ID}
+                AND TR.TRAMO_ID = CT.TRAMO_ID
+                AND BO.CORRIDA_ID = CT.CORRIDA_ID
+                AND BO.FECCORRIDA = CT.FECCORRIDA
+                AND BO.ORIGEN_ID = CTO.ORIGEN_ID
+                AND BO.DESTINO_ID = CTD.DESTINO_ID
+                AND CTD.CORRIDA_ID = CT.CORRIDA_ID
+                AND CTD.FECCORRIDA = CT.FECCORRIDA
+                AND CTO.CORRIDA_ID = CT.CORRIDA_ID
+                AND CTO.FECCORRIDA = CT.FECCORRIDA
+                AND CTO.ACTIVO = 1
+                AND CTD.ACTIVO = 1
+                AND CT.NUMSECUENCIA BETWEEN CTO.NUMSECUENCIA AND
+                    CTD.NUMSECUENCIA
+                AND BO.ACTIVO = 1
+                AND BO.INDREIMPRESION = 0
+                AND (BO.MOTIVOCANCELACION_ID IS NULL OR
+                    BO.MOTIVOCANCELACION_ID = 0)
+              GROUP BY CT.TRAMO_ID, TR.CANTKMREAL),
+             2) * TAB.EXTENSAO_KM PAX_KM
   FROM (SELECT CR.FECCORRIDA,
                RT.RUTA_ID,
                RT.NUMRUTA,
@@ -52,20 +85,21 @@
           FROM RUTA RT, BOLETO BL, CORRIDA CR
          WHERE RT.RUTA_ID = CR.RUTA_ID
            AND CR.FECCORRIDA = BL.FECCORRIDA
-           AND CR.RUTA_ID = NVL($P{RUTA_ID}, CR.RUTA_ID)
-           AND CR.EMPRESACORRIDA_ID = $P{EMPRESA_ID}
-	 AND RT.GRUPORUTA_ID = NVL($P{GRUPORUTA_ID}, RT.GRUPORUTA_ID)
            AND CR.CORRIDA_ID = BL.CORRIDA_ID
            AND BL.MOTIVOCANCELACION_ID IS NULL
            AND BL.INDREIMPRESION = 0
            AND BL.INDSTATUSOPERACION = 'F'
            AND BL.ACTIVO = 1
+           AND CR.RUTA_ID = NVL($P{RUTA_ID}, CR.RUTA_ID)
+           AND CR.EMPRESACORRIDA_ID = $P{EMPRESA_ID}
+           AND RT.GRUPORUTA_ID = NVL($P{GRUPORUTA_ID}, RT.GRUPORUTA_ID)
            AND CR.FECCORRIDA BETWEEN $P{DATA_INICIAL} AND $P{DATA_FINAL}
          GROUP BY CR.FECCORRIDA,
                   RT.RUTA_ID,
                   RT.NUMRUTA,
                   RT.DESCRUTA,
-                  CR.ROLOPERATIVO_ID) TAB]]>
+                  CR.ROLOPERATIVO_ID) TAB
+]]>
 	</queryString>
 	<field name="FECCORRIDA" class="java.sql.Timestamp"/>
 	<field name="RUTA_ID" class="java.math.BigDecimal"/>