From 68c84809e369062fff0f20b14b3e8a59cf127452 Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 24 Sep 2015 18:11:29 +0000
Subject: [PATCH] FIXES BUG #6491

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@48225 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../hibernate/CalcularPeajeHibernateDAO.java   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
index 74f9d43a7..86664dd55 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
@@ -130,14 +130,24 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 							BigDecimal pedagioPuro = pvo.getImportePeaje();
 							BigDecimal pedagioCalculado = BigDecimal.valueOf(0);
 							if(orgao.getOrgaoConcedenteId() == 21){ // 21 = artesp
-								if(pedagioPuro == null || indice == null ){
+								if(qtdEixos == null || cantAsientos == null ){
 									int[] x ={-1,r.getRutaId()}; 
-									return   x;}
+									return   x;}else{
+										if(indice == null){
+											int[] x ={-2,orgao.getOrgaoConcedenteId()}; 
+											return   x;
+										}
+									}
 								pedagioCalculado = BigDecimal.valueOf(((pedagioPuro.doubleValue() * qtdEixos) / indice.doubleValue()));
 							}else if(orgao.getOrgaoConcedenteId() == 3){// 3 = antt
-								if(pedagioPuro == null || indice == null ){
+								if(qtdEixos == null || cantAsientos == null ){
 									int[] x ={-1,r.getRutaId()}; 
-									return   x;}
+									return   x;}else{
+										if(indice == null){
+											int[] x ={-2,orgao.getOrgaoConcedenteId()}; 
+											return   x;
+										}
+									}
 								pedagioCalculado = BigDecimal.valueOf(((pedagioPuro.doubleValue() * qtdEixos) / ( indice.doubleValue() * cantAsientos)));
 							}