From e94fce65184ca1863dfd2acce6a9adee686b868e Mon Sep 17 00:00:00 2001
From: rodrigo <rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 20 Aug 2013 21:39:57 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29979
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../impl/RelatorioOrigemDestino.java          | 139 +++++++++++++-----
 .../templates/RelatorioOrigemDestino.jasper   | Bin 69200 -> 71187 bytes
 .../templates/RelatorioOrigemDestino.jrxml    |  43 ++++--
 .../RelatorioOrigemDestinoController.java     |  83 ++++++-----
 web/WEB-INF/i3-label_pt_BR.label              |   2 +-
 5 files changed, 182 insertions(+), 85 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
index da4e56e51..6ff801f74 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
@@ -31,45 +31,109 @@ public class RelatorioOrigemDestino extends Relatorio {
 
 		String sql = getSQL(empresaIds, corridasIds, dataDe, dataAte, bilhetesGratuitos, trechosSemMovimento);
 
-		List<PesoOperacional> lsPesoOperacionalRelatorio = getPesoOperacional(corridasIds, dataDe, dataAte, bilhetesGratuitos);
+		List<PesoOperacional> lsPesoOperacionalRelatorio = getPesoOperacional(corridasIds, dataDe, dataAte, bilhetesGratuitos, empresaIds, trechosSemMovimento);
 		getParametros().put("lsPesoOperacionalRelatorio", lsPesoOperacionalRelatorio);
 		getParametros().put("SQL", sql);
 	}
 
 	private List<PesoOperacional> getPesoOperacional(String corridasIds, String dataDe, String dataAte,
-			Boolean bilhetesGratuitos) throws SQLException {
+			Boolean bilhetesGratuitos, String empresaIds, Boolean mostratTrechosSemMovimento) throws SQLException {
 		StringBuilder sql = new StringBuilder();
-		sql.append("	SELECT ");
-		sql.append("        CA.CORRIDA_ID CORRIDA_ID, ");
-		sql.append("        CA.FECCORRIDA FECCORRIDA, ");
-		sql.append("	    O.CVEPARADA CVE_ORIGEM, ");
-		sql.append("	    O.DESCPARADA ORIGEM, ");
-		sql.append("	    D.CVEPARADA CVE_DESTINO, ");
-		sql.append("	    D.DESCPARADA DESTINO, ");
-		sql.append("	    SUM(CA.PRECIOPAGADO) RECEITA ");
-		sql.append("	FROM CAJA CA ");
-		sql.append("        INNER JOIN PARADA O ON O.PARADA_ID = CA.ORIGEN_ID ");
-		sql.append("	    INNER JOIN PARADA D ON D.PARADA_ID = CA.DESTINO_ID  ");
-		sql.append("	WHERE CA.ACTIVO = 1 ");
-		sql.append("	        AND ca.indreimpresion = 0 ");
-		sql.append("	        AND CA.PRECIOBASE IS NOT NULL ");
-		if (bilhetesGratuitos) {
-			sql.append("        AND CA.PRECIOBASE >= 0 ");
+
+		if (mostratTrechosSemMovimento) {
+			sql.append("	SELECT TRAMOS.*, NVL(SOMA.RECEITA, 0) RECEITA ");
+			sql.append("	FROM ");
+			sql.append("	    ( ");
+			sql.append("	        SELECT ");
+			sql.append("	            CA.CORRIDA_ID CORRIDA_ID, ");
+			sql.append("	            CA.FECCORRIDA FECCORRIDA, ");
+			sql.append("	            O.CVEPARADA CVE_ORIGEM, ");
+			sql.append("	            O.DESCPARADA ORIGEM, ");
+			sql.append("	            D.CVEPARADA CVE_DESTINO, ");
+			sql.append("	            D.DESCPARADA DESTINO, ");
+			sql.append("	            SUM(CA.PRECIOPAGADO) RECEITA ");
+			sql.append("	      FROM CAJA CA ");
+			sql.append("	      INNER JOIN PARADA O ON O.PARADA_ID = CA.ORIGEN_ID ");
+			sql.append("	      INNER JOIN PARADA D ON D.PARADA_ID = CA.DESTINO_ID ");
+			sql.append("	      WHERE CA.ACTIVO = 1 ");
+			sql.append("	      AND ca.indreimpresion = 0 ");
+			sql.append("	      AND CA.PRECIOBASE IS NOT NULL ");
+			if (bilhetesGratuitos) {
+				sql.append("      AND CA.PRECIOBASE >= 0 ");
+			} else {
+				sql.append("      AND CA.PRECIOBASE > 0 ");
+			}
+			if (!corridasIds.equals("Todas")) {
+				sql.append("      AND CA.CORRIDA_ID IN (").append(corridasIds).append(")");
+			}
+			sql.append("	      AND CA.FECCORRIDA BETWEEN TO_DATE('").append(dataDe).append("','DD/MM/YYYY HH24:MI:SS') AND TO_DATE('").append(dataAte).append("','DD/MM/YYYY HH24:MI:SS') ");
+			sql.append("		  AND CA.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
+			sql.append("	      GROUP BY ");
+			sql.append("	           CA.CORRIDA_ID, ");
+			sql.append("	           CA.FECCORRIDA, ");
+			sql.append("	           O.CVEPARADA, ");
+			sql.append("	           O.DESCPARADA, ");
+			sql.append("	           D.CVEPARADA, ");
+			sql.append("	           D.DESCPARADA ");
+			sql.append("	) SOMA ");
+			sql.append("	RIGHT JOIN ");
+			sql.append("	    ( ");
+			sql.append("	        SELECT ");
+			sql.append("	            CO.CORRIDA_ID CORRIDA_ID, ");
+			sql.append("	            CO.FECCORRIDA FECCORRIDA, ");
+			sql.append("	            O.CVEPARADA CVE_ORIGEM, ");
+			sql.append("	            O.DESCPARADA ORIGEM, ");
+			sql.append("	            D.CVEPARADA CVE_DESTINO, ");
+			sql.append("	            D.DESCPARADA DESTINO ");
+			sql.append("	      FROM CORRIDA CO ");
+			sql.append("	      INNER JOIN RUTA R ON R.RUTA_ID=CO.RUTA_ID ");
+			sql.append("	      INNER JOIN RUTA_COMBINACION RC ON RC.RUTA_ID=R.RUTA_ID ");
+			sql.append("	      INNER JOIN TRAMO TR ON TR.TRAMO_ID=RC.TRAMO_ID ");
+			sql.append("	      INNER JOIN PARADA O ON O.PARADA_ID = TR.ORIGEN_ID ");
+			sql.append("	      INNER JOIN PARADA D ON D.PARADA_ID = TR.DESTINO_ID ");
+			sql.append("	      WHERE R.ACTIVO = 1 AND RC.ACTIVO = 1 AND TR.ACTIVO = 1 ");
+			if (!corridasIds.equals("Todas")) {
+				sql.append("      AND CO.CORRIDA_ID IN (").append(corridasIds).append(")");
+			}
+			sql.append("	      AND CO.FECCORRIDA BETWEEN TO_DATE('").append(dataDe).append("','DD/MM/YYYY HH24:MI:SS') AND TO_DATE('").append(dataAte).append("','DD/MM/YYYY HH24:MI:SS') ");
+			sql.append("		  AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
+			sql.append("	)TRAMOS ");
+			sql.append("	ON (TRAMOS.CORRIDA_ID=SOMA.CORRIDA_ID AND TRAMOS.FECCORRIDA=SOMA.FECCORRIDA AND TRAMOS.CVE_ORIGEM=SOMA.CVE_ORIGEM AND TRAMOS.CVE_DESTINO=SOMA.CVE_DESTINO) ");
+			sql.append("	ORDER BY TRAMOS.CORRIDA_ID ");
 		} else {
-			sql.append("        AND CA.PRECIOBASE > 0 ");
+			sql.append("	SELECT ");
+			sql.append("        CA.CORRIDA_ID CORRIDA_ID, ");
+			sql.append("        CA.FECCORRIDA FECCORRIDA, ");
+			sql.append("	    O.CVEPARADA CVE_ORIGEM, ");
+			sql.append("	    O.DESCPARADA ORIGEM, ");
+			sql.append("	    D.CVEPARADA CVE_DESTINO, ");
+			sql.append("	    D.DESCPARADA DESTINO, ");
+			sql.append("	    SUM(CA.PRECIOPAGADO) RECEITA ");
+			sql.append("	FROM CAJA CA ");
+			sql.append("        INNER JOIN PARADA O ON O.PARADA_ID = CA.ORIGEN_ID ");
+			sql.append("	    INNER JOIN PARADA D ON D.PARADA_ID = CA.DESTINO_ID  ");
+			sql.append("	WHERE CA.ACTIVO = 1 ");
+			sql.append("	        AND ca.indreimpresion = 0 ");
+			sql.append("	        AND CA.PRECIOBASE IS NOT NULL ");
+			if (bilhetesGratuitos) {
+				sql.append("        AND CA.PRECIOBASE >= 0 ");
+			} else {
+				sql.append("        AND CA.PRECIOBASE > 0 ");
+			}
+			if (!corridasIds.equals("Todas")) {
+				sql.append("        AND CA.CORRIDA_ID IN (").append(corridasIds).append(")");
+			}
+			sql.append("	    AND CA.FECCORRIDA BETWEEN TO_DATE('").append(dataDe).append("','DD/MM/YYYY HH24:MI:SS') AND TO_DATE('").append(dataAte).append("','DD/MM/YYYY HH24:MI:SS') ");
+			sql.append("		AND CA.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
+			sql.append("	GROUP BY ");
+			sql.append("       CA.CORRIDA_ID, ");
+			sql.append("       CA.FECCORRIDA, ");
+			sql.append("	   O.CVEPARADA, ");
+			sql.append("	   O.DESCPARADA, ");
+			sql.append("	   D.CVEPARADA, ");
+			sql.append("	   D.DESCPARADA ");
+			sql.append("    ORDER BY CA.CORRIDA_ID ");
 		}
-		if (!corridasIds.equals("Todas")) {
-			sql.append("        AND CA.CORRIDA_ID IN (").append(corridasIds).append(")");
-		}
-		sql.append("	    AND CA.FECCORRIDA BETWEEN TO_DATE('").append(dataDe).append("','DD/MM/YYYY HH24:MI:SS') AND TO_DATE('").append(dataAte).append("','DD/MM/YYYY HH24:MI:SS') ");
-		sql.append("	GROUP BY ");
-		sql.append("       CA.CORRIDA_ID, ");
-		sql.append("       CA.FECCORRIDA, ");
-		sql.append("	   O.CVEPARADA, ");
-		sql.append("	   O.DESCPARADA, ");
-		sql.append("	   D.CVEPARADA, ");
-		sql.append("	   D.DESCPARADA ");
-		sql.append("    ORDER BY CA.CORRIDA_ID ");
 
 		Connection conexao = getConexao();
 
@@ -159,7 +223,6 @@ public class RelatorioOrigemDestino extends Relatorio {
 
 				PesoOperacional pesoOperacional = new PesoOperacional();
 				pesoOperacional.setCorridaId(idCorrida);
-				// pesoOperacional.setFecCorrida(id.getFeccorrida());
 				pesoOperacional.setLocalidade(parada);
 				pesoOperacional.setReceitaSaida(receitaSaida);
 				pesoOperacional.setReceitaChegada(receitaChegada);
@@ -180,6 +243,15 @@ public class RelatorioOrigemDestino extends Relatorio {
 		sql.append("	SELECT ");
 		sql.append("	    resultado.*, ");
 		sql.append("	    SUM(TR.CANTKMREAL) KM_CORRIDA, ");
+		sql.append("	   ( ");
+		sql.append("	        SELECT MAX(DA.CANTASIENTOS) ");
+		sql.append("	        FROM CORRIDA CO ");
+		sql.append("	            INNER JOIN ROL_OPERATIVO ROL ON ROL.ROLOPERATIVO_ID=CO.ROLOPERATIVO_ID ");
+		sql.append("	            INNER JOIN DIAGRAMA_AUTOBUS DA ON DA.DIAGRAMAAUTOBUS_ID = ROL.DIAGRAMAAUTOBUS_ID ");
+		sql.append("	        WHERE CO.CORRIDA_ID=RESULTADO.CORRIDA_ID ");
+		sql.append("		        AND CO.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
+		sql.append("	        GROUP BY DA.DIAGRAMAAUTOBUS_ID ");
+		sql.append("	    ) DISPONIBILIDADE, ");
 		sql.append("	    ( SELECT  COUNT(*) ");
 		sql.append("	      FROM caja ca ");
 		sql.append("	            INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
@@ -189,7 +261,6 @@ public class RelatorioOrigemDestino extends Relatorio {
 		sql.append("		        AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
 		sql.append("	            AND ca.indreimpresion = 0 ");
 		sql.append("	            AND CA.PRECIOBASE IS NOT NULL ");
-		sql.append("                AND CO.ACTIVO = 1 ");
 		if (bilhetesGratuitos) {
 			sql.append("            AND CA.PRECIOBASE >= 0 ");
 		} else {
@@ -207,7 +278,6 @@ public class RelatorioOrigemDestino extends Relatorio {
 		sql.append("		        AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
 		sql.append("	            AND ca.indreimpresion = 0 ");
 		sql.append("	            AND CA.PRECIOBASE IS NOT NULL ");
-		sql.append("                AND CO.ACTIVO = 1 ");
 		if (bilhetesGratuitos) {
 			sql.append("            AND CA.PRECIOBASE >= 0 ");
 		} else {
@@ -237,7 +307,6 @@ public class RelatorioOrigemDestino extends Relatorio {
 		sql.append("	        INNER JOIN EMPRESA EM ON EM.EMPRESA_ID = CO.EMPRESACORRIDA_ID ");
 		sql.append("	        INNER JOIN RUTA RU ON RU.RUTA_ID = CO.RUTA_ID ");
 		sql.append("	        WHERE CA.ACTIVO = 1 ");
-		sql.append("	        AND CO.ACTIVO = 1 ");
 		sql.append("	        AND RU.ACTIVO = 1 ");
 		sql.append("	        AND EM.ACTIVO = 1 ");
 		sql.append("	        AND ORI.ACTIVO = 1 ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper
index e1c3f69ad47032c2e55f9cb8f40142b45642b287..7aed6321dd830ef03ac1cd376bfb8de39de147bb 100644
GIT binary patch
delta 21447
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

delta 19968
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
index c5c85938e..e4a84bfab 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
@@ -35,6 +35,7 @@
 	<field name="PRECIOBASE" class="java.math.BigDecimal"/>
 	<field name="ABSOLUTO_TOTAL_CORRIDA" class="java.lang.Integer"/>
 	<field name="EQUIVALENTE_TOTAL_CORRIDA" class="java.math.BigDecimal"/>
+	<field name="DISPONIBILIDADE" class="java.lang.Integer"/>
 	<variable name="RECEITA_1" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id" calculation="Sum">
 		<variableExpression><![CDATA[$F{RECEITA}]]></variableExpression>
 	</variable>
@@ -83,6 +84,9 @@
 	<variable name="KM_CORRIDA_1" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id" calculation="Sum">
 		<variableExpression><![CDATA[$F{KM_CORRIDA}]]></variableExpression>
 	</variable>
+	<variable name="PAX_OFERTADO" class="java.math.BigDecimal">
+		<variableExpression><![CDATA[$F{KM_CORRIDA}.multiply(new BigDecimal($V{CORRIDA_ID_2}.toString())).multiply(new BigDecimal($F{DISPONIBILIDADE}.toString()))]]></variableExpression>
+	</variable>
 	<group name="group_corrida_id">
 		<groupExpression><![CDATA[$F{CORRIDA_ID}]]></groupExpression>
 		<groupHeader>
@@ -248,7 +252,7 @@
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="231">
+			<band height="252">
 				<textField pattern="#,##0.00">
 					<reportElement uuid="47543add-d41f-4a2d-bd53-424b419773d2" x="226" y="1" width="60" height="20"/>
 					<textElement textAlignment="Right">
@@ -397,45 +401,45 @@
 					<textFieldExpression><![CDATA[$V{sum_equivalente}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement uuid="a8bb0411-9a3c-49da-9ef4-b7d1bc20696e" positionType="Float" x="0" y="230" width="555" height="1"/>
+					<reportElement uuid="a8bb0411-9a3c-49da-9ef4-b7d1bc20696e" positionType="Float" x="0" y="231" width="555" height="1"/>
 				</line>
 				<staticText>
-					<reportElement uuid="d4f3ad63-ee47-44d6-9ffd-966cf144a7d1" x="0" y="170" width="140" height="20"/>
+					<reportElement uuid="d4f3ad63-ee47-44d6-9ffd-966cf144a7d1" x="0" y="191" width="140" height="20"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Localidade]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="4e986dd5-a716-4d02-a723-3e9fbed1d4fd" x="140" y="170" width="74" height="20"/>
+					<reportElement uuid="4e986dd5-a716-4d02-a723-3e9fbed1d4fd" x="140" y="191" width="74" height="20"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Rec. Saida]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="07c2b3bb-13ef-4862-95d6-da697714905e" x="214" y="170" width="74" height="20"/>
+					<reportElement uuid="07c2b3bb-13ef-4862-95d6-da697714905e" x="214" y="191" width="74" height="20"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Rec. Chegada]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="8930f2c6-9cbe-419a-9678-8d72dc141eed" x="288" y="170" width="74" height="20"/>
+					<reportElement uuid="8930f2c6-9cbe-419a-9678-8d72dc141eed" x="288" y="191" width="74" height="20"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Soma]]></text>
 				</staticText>
 				<staticText>
-					<reportElement uuid="64d4208c-4752-4389-aa26-4ca6e97db6ac" x="362" y="170" width="74" height="20"/>
+					<reportElement uuid="64d4208c-4752-4389-aa26-4ca6e97db6ac" x="362" y="191" width="74" height="20"/>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
 					<text><![CDATA[Peso]]></text>
 				</staticText>
 				<componentElement>
-					<reportElement uuid="fc473644-667d-480e-adf3-0b7abdc99aa5" x="0" y="190" width="436" height="20" isRemoveLineWhenBlank="true"/>
+					<reportElement uuid="fc473644-667d-480e-adf3-0b7abdc99aa5" x="0" y="211" width="436" height="20" isRemoveLineWhenBlank="true"/>
 					<jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" printOrder="Vertical">
 						<datasetRun subDataset="peso_operacional" uuid="cceb69bf-5b20-4d36-b039-25196730651a">
 							<datasetParameter name="corrida_id_relatorio">
@@ -483,7 +487,7 @@
 					</jr:list>
 				</componentElement>
 				<staticText>
-					<reportElement uuid="f65284c0-c782-4168-b4be-867c1fbcdd79" x="0" y="150" width="140" height="20"/>
+					<reportElement uuid="f65284c0-c782-4168-b4be-867c1fbcdd79" x="0" y="171" width="140" height="20"/>
 					<textElement>
 						<font size="11" isBold="true"/>
 					</textElement>
@@ -500,9 +504,26 @@
 					<textFieldExpression><![CDATA[$V{KM_CORRIDA_1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement uuid="100f3e8f-adf0-4ef9-879f-40112d482e13" x="0" y="1" width="100" height="20"/>
+					<reportElement uuid="aa398d64-4ed7-4b94-b687-c305fd57fc50" x="0" y="1" width="100" height="20"/>
 					<textElement/>
-					<textFieldExpression><![CDATA[$F{EQUIVALENTE_TOTAL_CORRIDA}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{DISPONIBILIDADE}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement uuid="214d1ffb-e86e-4d8c-a7a2-3138ac92f161" x="0" y="141" width="74" height="20"/>
+					<textElement>
+						<font isBold="true"/>
+					</textElement>
+					<text><![CDATA[Pax Ofertado:]]></text>
+				</staticText>
+				<textField pattern="#,##0.00">
+					<reportElement uuid="5c8faa69-f13d-41c0-9ba4-46007cae9716" x="74" y="141" width="100" height="20"/>
+					<textElement/>
+					<textFieldExpression><![CDATA[$V{PAX_OFERTADO}]]></textFieldExpression>
+				</textField>
+				<textField pattern="#,##0.00">
+					<reportElement uuid="f73cbb8b-ccfd-4145-8314-7f6da15129b8" x="294" y="121" width="100" height="20"/>
+					<textElement/>
+					<textFieldExpression><![CDATA[$V{sum_pax_km}.divide( $V{PAX_OFERTADO}, 2, 2 )]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupFooter>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java
index 55c1d0714..7b6c767e1 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java
@@ -98,7 +98,7 @@ public class RelatorioOrigemDestinoController extends MyGenericForwardComposer {
 		if (corridaList.getData().length == 0) {
 			try {
 				Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),
-						Labels.getLabel("relatorioLinhaOperacionalController.window.title"),
+						Labels.getLabel("relatorioOrigemDestinoController.window.title"),
 						Messagebox.OK, Messagebox.INFORMATION);
 			} catch (InterruptedException ex) {
 			}
@@ -133,50 +133,57 @@ public class RelatorioOrigemDestinoController extends MyGenericForwardComposer {
 		Date dataDe = datInicial.getValue();
 		Date dataAte = datFinal.getValue();
 
-		Map<String, Object> parametros = new HashMap<String, Object>();
-		parametros.put("BILHETES_GRATUITOS", chkBilhetesGratuitos.isChecked());
-		parametros.put("TRECHOS_SEM_MOVIMENTO", chkTrechoSemMovimento.isChecked());
-		parametros.put("DATA_DE", sdf.format(dataDe));
-		parametros.put("DATA_ATE", sdf.format(dataAte));
-		parametros.put("DATA_DE_WHERE", sdf.format(dataDe) + " 00:00:00");
-		parametros.put("DATA_ATE_WHERE", sdf.format(dataAte) + " 23:59:59");
-
-		Comboitem cbiEmpresa = cmbEmpresa.getSelectedItem();
-		String empresaId;
-		String empresas;
-		if (cbiEmpresa != null) {
-			Empresa empresa = (Empresa) cbiEmpresa.getValue();
-			empresaId = empresa.getEmpresaId().toString();
-			empresas = empresa.getNombempresa();
+		Boolean trechoSemMovimento = chkTrechoSemMovimento.isChecked();
+		if ((trechoSemMovimento) && (lsCorridasSelecionadas.isEmpty())) {
+			Messagebox.show(Labels.getLabel("relatorioOrigemDestinoController.MSG.trechoSemMovimento"),
+					Labels.getLabel("relatorioOrigemDestinoController.window.title"),
+					Messagebox.OK, Messagebox.INFORMATION);
 		} else {
-			empresaId = "0";
-			empresas = "";
-			for (int i = 0; i < lsEmpresa.size(); i++) {
-				Empresa empresa = lsEmpresa.get(i);
-				empresaId = empresaId + ", " + empresa.getEmpresaId();
-				empresas = empresas + ", " + empresa.getNombempresa();
+			Map<String, Object> parametros = new HashMap<String, Object>();
+			parametros.put("BILHETES_GRATUITOS", chkBilhetesGratuitos.isChecked());
+			parametros.put("TRECHOS_SEM_MOVIMENTO", chkTrechoSemMovimento.isChecked());
+			parametros.put("DATA_DE", sdf.format(dataDe));
+			parametros.put("DATA_ATE", sdf.format(dataAte));
+			parametros.put("DATA_DE_WHERE", sdf.format(dataDe) + " 00:00:00");
+			parametros.put("DATA_ATE_WHERE", sdf.format(dataAte) + " 23:59:59");
+
+			Comboitem cbiEmpresa = cmbEmpresa.getSelectedItem();
+			String empresaId;
+			String empresas;
+			if (cbiEmpresa != null) {
+				Empresa empresa = (Empresa) cbiEmpresa.getValue();
+				empresaId = empresa.getEmpresaId().toString();
+				empresas = empresa.getNombempresa();
+			} else {
+				empresaId = "0";
+				empresas = "";
+				for (int i = 0; i < lsEmpresa.size(); i++) {
+					Empresa empresa = lsEmpresa.get(i);
+					empresaId = empresaId + ", " + empresa.getEmpresaId();
+					empresas = empresas + ", " + empresa.getNombempresa();
+				}
 			}
-		}
-		parametros.put("EMPRESA_IDS", empresaId);
-		parametros.put("EMPRESAS", empresas);
+			parametros.put("EMPRESA_IDS", empresaId);
+			parametros.put("EMPRESAS", empresas);
 
-		String corridaIds = "";
-		if (!lsCorridasSelecionadas.isEmpty()) {
-			for (int i = 0; i < lsCorridasSelecionadas.size(); i++) {
-				Corrida corrida = lsCorridasSelecionadas.get(i);
-				corridaIds = corridaIds + ", " + corrida.getId().getCorridaId();
+			String corridaIds = "";
+			if (!lsCorridasSelecionadas.isEmpty()) {
+				for (int i = 0; i < lsCorridasSelecionadas.size(); i++) {
+					Corrida corrida = lsCorridasSelecionadas.get(i);
+					corridaIds = corridaIds + ", " + corrida.getId().getCorridaId();
+				}
+			} else {
+				corridaIds = "TTodas";
 			}
-		} else {
-			corridaIds = "TTodas";
-		}
-		parametros.put("CORRIDAS_SELECIONADAS", corridaIds.substring(1, corridaIds.length()));
+			parametros.put("CORRIDAS_SELECIONADAS", corridaIds.substring(1, corridaIds.length()));
 
-		Relatorio relatorio = new RelatorioOrigemDestino(parametros, dataSource.getConnection());
+			Relatorio relatorio = new RelatorioOrigemDestino(parametros, dataSource.getConnection());
 
-		Map<String, Object> args = new HashMap<String, Object>();
-		args.put("relatorio", relatorio);
+			Map<String, Object> args = new HashMap<String, Object>();
+			args.put("relatorio", relatorio);
 
-		openWindow("/component/reportView.zul",
+			openWindow("/component/reportView.zul",
 						Labels.getLabel("relatorioOrigemDestinoController.window.title"), args, MODAL);
+		}
 	}
 }
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 433cff9fb..32435c1ad 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -4447,6 +4447,6 @@ relatorioOrigemDestinoController.descRuta.label = Linha
 relatorioOrigemDestinoController.MSG.selecionarCorridas = Selecione algum serviço para gerar o relatório.
 relatorioOrigemDestinoController.chkBilhetesGratuitos.value = Considerar bilhetes gratuitos
 relatorioOrigemDestinoController.chkTrechoSemMovimento.value = Exibir trechos sem movimento
-
+relatorioOrigemDestinoController.MSG.trechoSemMovimento = Para exibir trechos sem movimento é necessário selecionar quais são os serviços desejados.