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

FIXES BUG #6876 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50846 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-12-02 11:35:31 +00:00
parent ae2b2eea9e
commit 846c5bd498
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java
View File

@ -195,12 +195,19 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
List<ConfRestricaoCanalVenta> ls = new ArrayList<ConfRestricaoCanalVenta>() ;
for (int i = 0; i < confRestricaoCanalVentaList.getData().length; i++){
ConfRestricaoCanalVenta listElement = (ConfRestricaoCanalVenta)confRestricaoCanalVentaList.getData()[i];
if(isConfRestricaoCanalVentasEquivalentes(c , listElement)){
return true;
ConfRestricaoCanalVenta elementList = (ConfRestricaoCanalVenta)confRestricaoCanalVentaList.getData()[i];
if(c.getConfRestricaoCanalVentaId() == null){
if(isConfRestricaoCanalVentasEquivalentes(c , elementList)){
return true;
}
}else{
if(!c.getConfRestricaoCanalVentaId().equals(elementList.getConfRestricaoCanalVentaId())){
isConfRestricaoCanalVentasEquivalentes(c , elementList);
}else{
continue;
}
}
}
return false;
}
@ -216,8 +223,7 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
&& isIntercessaoDiasSemana(a,b)
){
return true;
}
if(a.getRuta().equals(b.getRuta())
}else if(a.getRuta().equals(b.getRuta())
&& a.getTipoPuntoVenta().equals(b.getTipoPuntoVenta())
&& a.getCorridaId().equals(b.getCorridaId())
&& a.getOrigem().equals(b.getOrigem())