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

fixed bug #7142 #7166 - correção bug pricing específico e troca de valor padrão de venda para 'Sim' na combinação em geração automática de Linhas 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53525 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-03-03 20:43:58 +00:00
parent c579ee7d0b
commit 43cf9d40cd
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java
View File

@ -302,8 +302,8 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
listCboVenda.add(cbiNao.getValue()); listCboVenda.add(cbiNao.getValue());
if (secuenciaRutaTramoCoeficienteVO.getPermiteVenda() == null && this.getId().equalsIgnoreCase("gridrutasecuenciaida")){ if (secuenciaRutaTramoCoeficienteVO.getPermiteVenda() == null && this.getId().equalsIgnoreCase("gridrutasecuenciaida")){
listCboVenda.addSelection(cbiNao.getValue()); listCboVenda.addSelection(cbiSim.getValue());
secuenciaRutaTramoCoeficienteVO.setPermiteVenda(Boolean.FALSE); secuenciaRutaTramoCoeficienteVO.setPermiteVenda(Boolean.TRUE);
} else if (this.getId().equalsIgnoreCase("gridrutasecuenciavolta")){ } else if (this.getId().equalsIgnoreCase("gridrutasecuenciavolta")){
listCboVenda.addSelection(secuenciaRutaTramoCoeficienteVO.getPermiteVenda()?cbiSim.getValue():cbiNao.getValue()); listCboVenda.addSelection(secuenciaRutaTramoCoeficienteVO.getPermiteVenda()?cbiSim.getValue():cbiNao.getValue());
} }

13
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java
View File

@ -7,6 +7,8 @@ import java.util.Locale;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.hibernate.Hibernate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
@ -15,6 +17,7 @@ import org.zkoss.zk.ui.event.Event;
import com.rjconsultores.ventaboletos.entidad.PricingEspecifico; import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion;
import com.rjconsultores.ventaboletos.service.PricingEspecificoService;
import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@ -36,6 +39,9 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward
private MyTextboxDecimal ocupacioninicial; private MyTextboxDecimal ocupacioninicial;
private MyTextboxDecimal ocupacionfinal; private MyTextboxDecimal ocupacionfinal;
@Autowired
private PricingEspecificoService pricingEspecificoService;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico"); pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico");
@ -43,7 +49,6 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward
pricingListEspOcupacion = (MyListbox) Executions.getCurrent().getArg().get("pricingListEspOcupacion"); pricingListEspOcupacion = (MyListbox) Executions.getCurrent().getArg().get("pricingListEspOcupacion");
super.doAfterCompose(comp); super.doAfterCompose(comp);
if (pricingEspecificoOcupacion.getPricingEspecificoOcupacionId() != null) { if (pricingEspecificoOcupacion.getPricingEspecificoOcupacionId() != null) {
Locale locale = new Locale("pt", "BR"); Locale locale = new Locale("pt", "BR");
@ -72,6 +77,12 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward
pricingEspecificoOcupacion.setFecmodif(Calendar.getInstance().getTime()); pricingEspecificoOcupacion.setFecmodif(Calendar.getInstance().getTime());
pricingEspecificoOcupacion.setActivo(true); pricingEspecificoOcupacion.setActivo(true);
if (pricingEspecifico != null && pricingEspecifico.getPricingespecificoId() != null) {
pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId().longValue());
}
Hibernate.initialize(pricingEspecifico);
Hibernate.initialize(pricingEspecificoOcupacion);
List<PricingEspecificoOcupacion> peoList = null; List<PricingEspecificoOcupacion> peoList = null;
if (pricingEspecifico.getPricingEspecificoOcupacionsList() == null || pricingEspecifico.getPricingEspecificoOcupacionsList().isEmpty()) { if (pricingEspecifico.getPricingEspecificoOcupacionsList() == null || pricingEspecifico.getPricingEspecificoOcupacionsList().isEmpty()) {
peoList = new ArrayList<PricingEspecificoOcupacion>(); peoList = new ArrayList<PricingEspecificoOcupacion>();