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

Fixes Bug #0009235 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71675 d1611594-4594-4d17-8e1d-87c2c4800839
master
alexandre.lima 2017-07-20 19:37:25 +00:00
parent 176560fcc4
commit 1ee5cbc7bb
1 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
View File

@ -92,35 +92,35 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
}
public void onClick$btnCalcularPeaje(Event ev) throws InterruptedException {
OrgaoConcedente orgao ;
OrgaoConcedente orgao;
boolean orgaoListaRutasHasIndices = true;
if(!listSelectedRutas.isEmpty()){
if (!listSelectedRutas.isEmpty()) {
orgao = null;
for(Ruta r : listSelectedRutas){
if(r.getOrgaoConcedente().getIndicePeaje() == null){
for (Ruta r : listSelectedRutas) {
if (r.getOrgaoConcedente().getIndicePeaje() == null) {
orgaoListaRutasHasIndices = false;
lsIdsOrgSemIndice.add(r.getOrgaoConcedente().getOrgaoConcedenteId());
}
}
}else{
} else {
orgao = ((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue());
}
if ((orgao != null && orgao.getIndicePeaje() != null) || (!listSelectedRutas.isEmpty() && orgaoListaRutasHasIndices)) {
List<Ruta> lsRuta;
if(!listSelectedRutas.isEmpty()){
if (!listSelectedRutas.isEmpty()) {
lsRuta = listSelectedRutas;
}else{
} else {
lsRuta = rutaService.buscaRutasFromOrgao(orgao);
}
boolean usarICMS;
if(rdConsiderarICMSSi.isChecked()){
if (rdConsiderarICMSSi.isChecked()) {
usarICMS = true;
}else{
} else {
usarICMS = false;
}
if (!validarImpostoICMSEmpresa(lsRuta) && usarICMS){
if (!validarImpostoICMSEmpresa(lsRuta) && usarICMS) {
Messagebox.show("Foram encontradas empresas com ICMS nulo, o cálculo não poderá ser realizado.",
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.OK, Messagebox.ERROR);
@ -135,8 +135,10 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.OK, Messagebox.INFORMATION);
} catch (RuntimeException e) {
// TODO throw: especific exception should be created
String error[] = e.getMessage().split(";");
if (e.getMessage().trim().length() > 0) {
String error[] = e.getMessage().split(";");
if (error.length == 2) {
String type = error[0];
String ruta = error[1];
@ -156,14 +158,21 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
Labels.getLabel("MSG.Error"),
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
}
} else {
e.printStackTrace();
}
// TODO else: show some generic error for unexpected error
} catch (Exception e) {
Messagebox.show(
"A empresa " + e.getMessage() + " não possui ICMS cadastrado.",
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
}
} else {
if(orgao != null){
if (orgao != null) {
Messagebox.show(
Labels.getLabel("calcularPeajeController.MSG.orgaoSemIndice", new Object[] { orgao.getOrgaoConcedenteId() }),
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
}else{
} else {
Messagebox.show(
Labels.getLabel("calcularPeajeController.MSG.orgaoSemIndice", new Object[] { retornaIdsOrgaoSemIndice(lsIdsOrgSemIndice) }),
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
@ -172,26 +181,26 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
}
}
private String retornaIdsOrgaoSemIndice(Set<Integer> s){
private String retornaIdsOrgaoSemIndice(Set<Integer> s) {
List l = new ArrayList<Integer>(s);
if(l.size()==1){
if (l.size() == 1) {
return l.get(0).toString();
}else{
} else {
StringBuilder sb = new StringBuilder();
sb.append(l.get(0).toString());
for(int x = 1 ; x < l.size() ; x++){
sb.append(", "+l.get(x).toString());
for (int x = 1; x < l.size(); x++) {
sb.append(", " + l.get(x).toString());
}
return sb.toString();
}
}
private boolean validarImpostoICMSEmpresa(List<Ruta> lsRuta){
private boolean validarImpostoICMSEmpresa(List<Ruta> lsRuta) {
Set<Integer> lsEmpresaId = new LinkedHashSet<Integer>();
for (Ruta ruta: lsRuta){
for (RutaEmpresa rutaEmpresa: ruta.getLsRutaEmpresa()){
if (lsEmpresaId.contains(rutaEmpresa.getEmpresa().getEmpresaId())){
for (Ruta ruta : lsRuta) {
for (RutaEmpresa rutaEmpresa : ruta.getLsRutaEmpresa()) {
if (lsEmpresaId.contains(rutaEmpresa.getEmpresa().getEmpresaId())) {
continue;
}
@ -199,9 +208,9 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
}
}
for (Integer empresaId: lsEmpresaId){
for (EmpresaImposto empresaImposto: empresaImpostoService.buscarEmpresaImposto(empresaId)){
if (empresaImposto.getIcms() == null){
for (Integer empresaId : lsEmpresaId) {
for (EmpresaImposto empresaImposto : empresaImpostoService.buscarEmpresaImposto(empresaId)) {
if (empresaImposto.getIcms() == null) {
return false;
}
}
@ -209,6 +218,7 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
return true;
}
public void onClick$btnAddRuta(Event ev) throws InterruptedException {
if (cmbRuta.getSelectedItem() != null) {
listSelectedRutas.add((Ruta) cmbRuta.getSelectedItem().getValue());