diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java index 356335eac..42683a876 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java @@ -19,7 +19,6 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; -import org.zkoss.zul.Intbox; import org.zkoss.zul.Textbox; import com.rjconsultores.ventaboletos.entidad.Aidf; @@ -29,6 +28,7 @@ import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.InscricaoEstadual; import com.rjconsultores.ventaboletos.service.AidfService; +import com.rjconsultores.ventaboletos.service.DetAbastoBoletoService; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EstadoService; import com.rjconsultores.ventaboletos.service.MovimentacionBilhetesService; @@ -48,6 +48,9 @@ public class EditarAidfController extends MyGenericForwardComposer { @Autowired private AidfService aidfService; + @Autowired + private DetAbastoBoletoService detAbastoBoletoService; + @Autowired private EstadoService estadoService; @@ -79,7 +82,7 @@ public class EditarAidfController extends MyGenericForwardComposer { private Textbox txtDocFiscal; private Textbox txtAcFiscal; private Textbox txtSerie; - private Intbox txtSubSerie; + private Textbox txtSubSerie; private Textbox txtFormInicial; private Textbox txtFormFinal; private Textbox txtFecAquisicao; @@ -90,6 +93,7 @@ public class EditarAidfController extends MyGenericForwardComposer { private Textbox txtFormfinal; private Button btnApagar; + private Button btnSalvar; private Datebox dtbFecadquisicion; private Datebox dtbFecvencimiento; @@ -114,7 +118,12 @@ public class EditarAidfController extends MyGenericForwardComposer { if (aidf.getAidfId() == null) { btnApagar.setVisible(Boolean.FALSE); - } + } + + if(detAbastoBoletoService.buscabDetAbastoBoletoToVerifyIfAidfCanBeEditable(aidf).size() >0){ + btnSalvar.setVisible(Boolean.FALSE); + btnApagar.setVisible(Boolean.FALSE); + } } public void onClick$btnSalvar(Event ev) throws InterruptedException { @@ -275,11 +284,11 @@ public class EditarAidfController extends MyGenericForwardComposer { this.txtSerie = txtSerie; } - public Intbox getTxtSubSerie() { + public Textbox getTxtSubSerie() { return txtSubSerie; } - public void setTxtSubSerie(Intbox txtSubSerie) { + public void setTxtSubSerie(Textbox txtSubSerie) { this.txtSubSerie = txtSubSerie; } @@ -377,5 +386,14 @@ public class EditarAidfController extends MyGenericForwardComposer { public void setTxtFormfinal(Textbox txtFormfinal) { this.txtFormfinal = txtFormfinal; - } + } + + public Button getBtnSalvar() { + return btnSalvar; + } + + public void setBtnSalvar(Button btnSalvar) { + this.btnSalvar = btnSalvar; + } + } \ No newline at end of file diff --git a/web/gui/gr/editarAidf.zul b/web/gui/gr/editarAidf.zul index 84bfe7722..69b5a5b27 100644 --- a/web/gui/gr/editarAidf.zul +++ b/web/gui/gr/editarAidf.zul @@ -3,7 +3,7 @@ - +