fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIXES BUG #6491 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@48225 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-09-24 18:11:29 +00:00
parent 211dc006d7
commit 68c84809e3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
View File

@ -130,14 +130,24 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
BigDecimal pedagioPuro = pvo.getImportePeaje(); BigDecimal pedagioPuro = pvo.getImportePeaje();
BigDecimal pedagioCalculado = BigDecimal.valueOf(0); BigDecimal pedagioCalculado = BigDecimal.valueOf(0);
if(orgao.getOrgaoConcedenteId() == 21){ // 21 = artesp if(orgao.getOrgaoConcedenteId() == 21){ // 21 = artesp
if(pedagioPuro == null || indice == null ){ if(qtdEixos == null || cantAsientos == null ){
int[] x ={-1,r.getRutaId()}; 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())); pedagioCalculado = BigDecimal.valueOf(((pedagioPuro.doubleValue() * qtdEixos) / indice.doubleValue()));
}else if(orgao.getOrgaoConcedenteId() == 3){// 3 = antt }else if(orgao.getOrgaoConcedenteId() == 3){// 3 = antt
if(pedagioPuro == null || indice == null ){ if(qtdEixos == null || cantAsientos == null ){
int[] x ={-1,r.getRutaId()}; 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))); pedagioCalculado = BigDecimal.valueOf(((pedagioPuro.doubleValue() * qtdEixos) / ( indice.doubleValue() * cantAsientos)));
} }