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

fixes bug#11765 

dev:thiago
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@84062 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2018-08-08 21:08:06 +00:00
parent 98b2fabde2
commit 9f76d8f06f
2 changed files with 11 additions and 1 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

@ -851,7 +851,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append(" AND LC.TRANSACAOORIGINAL_ID = C.TRANSACAOORIGINAL_ID ")
.append(" AND LC.LOGCONFERENCIA_ID <> LOG.LOGCONFERENCIA_ID) IS NOT NULL) ")
.append(" THEN 1 ELSE 0 END AS \"conferidoEntrega\", ")
.append("C.PTOVTAVENTA_ID AS ptovtaventaId ")
.append("C.PTOVTAVENTA_ID AS ptovtaventaId, ")
.append("C.PUNTOVENTA_ID AS puntoventaId ")
.append("FROM CAJA C ")
.append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ")
.append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ")
@ -965,6 +966,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
boletoComissao.setEmpresaId(rSet.getInt("empresaId"));
boletoComissao.setTransacaoId(rSet.getLong("transacaoId") > 0 ? rSet.getLong("transacaoId") : null);
boletoComissao.setPtovtaventaId(rSet.getInt("ptovtaventaId"));
boletoComissao.setPuntoVentaId(rSet.getInt("puntoventaId"));
boletoComissao.setConferidoEntrega(rSet.getBoolean("conferidoEntrega"));
if(boletoComissao.getStatus() == null && boletoComissao.getConferidoEntrega() != null && boletoComissao.getConferidoEntrega()) {

8
src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
View File

@ -584,6 +584,14 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
IndStatusBoleto statusBoleto = IndStatusBoleto.valueOf(rcc.getIndstatusboleto());
boolean isSaidaCaixa = rcc.getMotivoCancelacionId() != null;
boolean isEntregaPassagem = statusBoleto.equals(IndStatusBoleto.E) && (rcc.getMotivoCancelacionId() == null);
/*
* Exclui os bilhetes que não foram entregues na agencia da comissão que está sendo calculada
*/
if(isEntregaPassagem && !ptovtaComissao.getPuntoventaId().getPuntoventaId().equals(rcc.getPuntoVentaId())) {
continue;
}
if(rcc.isMotivocancelacionTransferido() || rcc.isMotivocancelacionQuitacaoOcd() || rcc.isDiferencaTrocaGeracaoOcd()) {
continue;
}