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

fixes bug #7000 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@51673 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2015-12-30 12:37:51 +00:00
parent ee32968040
commit 9462861fba
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
@ -15,6 +16,7 @@ import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@Scope("prototype")
@ -28,6 +30,7 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
private EmpresaService empresaService;
private Textbox txtCompetencia;
private MyComboboxPuntoVenta cmbPuntoVenta;
private PuntoVenta puntoVenta;
private Empresa empresa;
private List<Empresa> lsEmpresas;
@ -44,7 +47,10 @@ public class BusquedaConferenciaComissaoController extends MyGenericForwardCompo
Map<String, Object> args = new HashMap<String, Object>();
args.put("competencia", txtCompetencia.getValue());
args.put("empresa", empresa);
args.put("puntoVenta", puntoVenta);
if(StringUtils.isNotBlank(cmbPuntoVenta.getValue())) {
args.put("puntoVenta", puntoVenta);
}
openWindow("/gui/comissao/conferenciaComissao.zul",
Labels.getLabel("conferenciaComissaoController.window.title"), args, MODAL);