diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java index 0ecdf3907..5e8afd1a1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java @@ -11,13 +11,17 @@ import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; +import org.zkoss.lang.Objects; import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; import org.zkoss.zkplus.databind.BindingListModelList; import org.zkoss.zul.Comboitem; +import org.zkoss.zul.ComboitemRenderer; import org.zkoss.zul.Datebox; +import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.Aidf; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -65,6 +69,8 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { private MyComboboxEstandar cmbEstado; private MyComboboxEstandar cmbAidf; + private Radio radBPR; + @Override public void doAfterCompose(Component comp) throws Exception { lsEmpresa = empresaService.obtenerTodos(); @@ -89,8 +95,23 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { } lsAidf = aidfService.buscaAidfRMD(empresa.getEmpresaId(), estado.getEstadoId()); + + ComboitemRenderer aidfRenderer = new ComboitemRenderer() { + public void render(Comboitem item, Object data) { + if (data instanceof Aidf) { + Aidf aidf = (Aidf) data; + String label = (aidf.getAidfId() == null ? "" : aidf.getAidfId().toString() + " - ") + + aidf.getSerie() + + (aidf.getSubserie() == null ? "" : "-" + aidf.getSubserie()); + item.setLabel(label); + } else { + item.setLabel(Objects.toString(data)); + } + item.setValue(data); + } + }; + cmbAidf.setItemRenderer(aidfRenderer); cmbAidf.setModel(new BindingListModelList(lsAidf, true)); - } @@ -111,6 +132,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { if (itemEstado != null) { estado = (Estado) itemEstado.getValue(); } + if (itemAidf != null) { aidf = (Aidf) itemAidf.getValue(); } @@ -118,11 +140,29 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { if (empresa != null && estado != null) { try { String rmd = null; - if (aidf != null) - rmd = aidf.getSerie() + aidf.getSubserie(); + if (aidf != null) { + rmd = aidf.getSerie() + (aidf.getSubserie() == null ? "" : "-" + aidf.getSubserie()); + } else { + Messagebox.show( + "É necessario selecionar um RMD", + Labels.getLabel("indexController.mnImpressaoRMD.label"), + Messagebox.OK, Messagebox.INFORMATION); + } - List list = fiscalService.getRegistroImpressaoRMDTipoDVB(dataSourceRead.getConnection(), - datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd); + List list = null; + if (radBPR.isChecked()) { + list = fiscalService.getRegistroImpressaoRMDTipoDVB(dataSourceRead.getConnection(), + datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd); + } else { + + throw new NullPointerException("ERROR: NULL POINTER EXCEPTION"); + + // Messagebox.show( + // "Os relatórios de ECF ainda não estão sendo impressos.", + // Labels.getLabel("indexController.mnImpressaoRMD.label"), + // Messagebox.OK, Messagebox.INFORMATION); + + } Map parametros = new HashMap(); parametros.put("list", list); @@ -141,6 +181,10 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { log.error("", e); } catch (Exception e) { log.error("", e); + + Messagebox.show(e.getMessage(), + Labels.getLabel("indexController.mnImpressaoRMD.label"), + Messagebox.OK, Messagebox.INFORMATION); } } diff --git a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul index cd163c538..d0db7a326 100644 --- a/web/gui/impressaofiscal/busquedaImpressaoRMD.zul +++ b/web/gui/impressaofiscal/busquedaImpressaoRMD.zul @@ -7,8 +7,8 @@ + apply="${busquedaImpressaoRMDController}" contentStyle="overflow:auto" + width="660px" border="normal"> @@ -49,22 +49,27 @@ model="@{winBusquedaImpressaoRMD$composer.lsEmpresa}" constraint="no empty" /> - + - - + + + -