- 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

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 ");

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

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"/>