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

fixes bug 0010024 - commit Trunk 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@76585 d1611594-4594-4d17-8e1d-87c2c4800839
master
bruno.neves 2017-11-20 12:06:05 +00:00
parent 2d99d1c528
commit 1cc1c06644
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -910,8 +910,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>(); List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>();
List<BoletoComissao> auxLsBoletoComissao = qr.list(); List<BoletoComissao> auxLsBoletoComissao = qr.list();
for (BoletoComissao boletoComissao : auxLsBoletoComissao) { for (BoletoComissao boletoComissao : auxLsBoletoComissao) {
if(boletoComissao.getIndstatusboleto().equals("E") && boletoComissao.getLogconferenciaId()== null) { if(!boletoComissao.isBilheteEntregaConferidoVenda()) {
boletoComissao.setConferido(isConferidoVenta(boletoComissao)); boletoComissao.setConferido(isConferidoVenta(boletoComissao));
} }
if (boletoComissao.getFormapagos() == null) { if (boletoComissao.getFormapagos() == null) {
boletoComissao.setFormapagos(new ArrayList<FormapagoVO>()); boletoComissao.setFormapagos(new ArrayList<FormapagoVO>());

6
src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
View File

@ -1,4 +1,4 @@
package com.rjconsultores.ventaboletos.vo.comissao; package com.rjconsultores.ventaboletos.vo.comissao;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -708,6 +708,10 @@ public class BoletoComissao {
public void setNombpasajero(String nombpasajero) { public void setNombpasajero(String nombpasajero) {
this.nombpasajero = nombpasajero; this.nombpasajero = nombpasajero;
} }
public boolean isBilheteEntregaConferidoVenda() {
return isStatusEntregue() && this.getLogconferenciaId() != null;
}
public IndStatusBoleto getIndstatusboletoEnum() { public IndStatusBoleto getIndstatusboletoEnum() {
return IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto()); return IndStatusBoleto.getIndStatusBoleto(getIndstatusboleto());