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

fixes bug #8882 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@68110 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-04-17 21:56:44 +00:00
parent 24b67a9608
commit 0de782b500
6 changed files with 136 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/rjconsultores/ventaboletos/constantes/Constantes.java
View File

@ -25,6 +25,7 @@ public class Constantes {
public static final Long MVO_CANCEL_BOLETO_ENTREGADO = new Long(16); public static final Long MVO_CANCEL_BOLETO_ENTREGADO = new Long(16);
public static final Long MVO_CANCEL_BOLETO_AGRUPAMENTO = new Long(17); public static final Long MVO_CANCEL_BOLETO_AGRUPAMENTO = new Long(17);
public static final Long MVO_CANCEL_GERACAO_OCD = new Long(99); public static final Long MVO_CANCEL_GERACAO_OCD = new Long(99);
public static final Long MVO_CANCEL_QUITACAO_OCD = new Long(35);
public static Long TPV_DIRECTO_NORMAL = new Long(1); public static Long TPV_DIRECTO_NORMAL = new Long(1);
public static Long TPV_MANUAL = new Long(3); public static Long TPV_MANUAL = new Long(3);

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

@ -202,12 +202,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
Map<String, Object> parametros = carregarParametros(competencia, empresa, puntoVenta, dataMovimento); Map<String, Object> parametros = carregarParametros(competencia, empresa, puntoVenta, dataMovimento);
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ") .append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ")
.append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(B.FECHORVENTA, 'DD/MM/YY') as \"datamovimento\" ") .append("PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECHORVENTA, 'DD/MM/YY') as \"datamovimento\" ")
.append("FROM BOLETO B ") .append("FROM CAJA C ")
.append("INNER JOIN PUNTO_VENTA PV ON B.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ") .append("INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ")
.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ") .append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
.append("WHERE PV.ACTIVO = 1 ") .append("WHERE PV.ACTIVO = 1 ")
.append("AND B.FECHORVENTA BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') "); .append("AND C.FECHORVENTA BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {
sQuery.append("AND M.EMPRESA_ID = ? "); sQuery.append("AND M.EMPRESA_ID = ? ");
@ -216,7 +216,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
sQuery.append("AND PV.PUNTOVENTA_ID = ? "); sQuery.append("AND PV.PUNTOVENTA_ID = ? ");
} }
sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(B.FECHORVENTA, 'DD/MM/YY') "); sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECHORVENTA, 'DD/MM/YY') ");
int idxParametro = 1; int idxParametro = 1;
stmt = con.prepareStatement(sQuery.toString()); stmt = con.prepareStatement(sQuery.toString());
@ -593,12 +593,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
if (conferencia != null && conferencia.getConferenciaId() != null) { if (conferencia != null && conferencia.getConferenciaId() != null) {
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", LOG.OBSERVACAO AS \"observacao\", LOG.PRECO AS \"preco\", ") .append("SELECT LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", LOG.OBSERVACAO AS \"observacao\", LOG.PRECO AS \"preco\", ")
.append("LOG.STATUS AS \"status\", B.NUMFOLIOSISTEMA AS \"numfoliosistema\", LOG.TIPO AS \"tipo\", ") .append("LOG.STATUS AS \"status\", NVL(B.NUMFOLIOSISTEMA,C.NUMFOLIOSISTEMA) AS \"numfoliosistema\", LOG.TIPO AS \"tipo\", ")
.append("O.NUMOPERACION AS \"numoperacion\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", U.NOMBUSUARIO AS \"nombusuario\", ") .append("O.NUMOPERACION AS \"numoperacion\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", U.NOMBUSUARIO AS \"nombusuario\", ")
.append("LOG.FECMODIF AS \"fecmodif\", LOG.INDCREDITO AS \"indcredito\", B.BOLETO_ID AS \"boletoId\", O.OCD_ID AS \"ocdId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", TI.DESCTIPO AS \"desctipoinformativo\", ") .append("LOG.FECMODIF AS \"fecmodif\", LOG.INDCREDITO AS \"indcredito\", B.BOLETO_ID AS \"boletoId\", O.OCD_ID AS \"ocdId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", TI.DESCTIPO AS \"desctipoinformativo\", ")
.append("CP.DESCPENDENCIA AS \"descpendencia\", LOG.INDMESMODIA AS \"descComportamentoData\" ") .append("CP.DESCPENDENCIA AS \"descpendencia\", LOG.INDMESMODIA AS \"descComportamentoData\", C.CAJA_ID AS \"cajaId\" ")
.append("FROM LOG_CONFERENCIA LOG ") .append("FROM LOG_CONFERENCIA LOG ")
.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ") .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ")
.append("LEFT JOIN CAJA C ON C.CAJA_ID = LOG.CAJA_ID ")
.append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ") .append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ")
.append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") .append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ")
.append("LEFT JOIN OCD O ON O.OCD_ID = LOG.OCD_ID ") .append("LEFT JOIN OCD O ON O.OCD_ID = LOG.OCD_ID ")
@ -622,10 +623,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.addScalar("nombusuario", Hibernate.STRING) .addScalar("nombusuario", Hibernate.STRING)
.addScalar("fecmodif", Hibernate.TIMESTAMP) .addScalar("fecmodif", Hibernate.TIMESTAMP)
.addScalar("indcredito", Hibernate.SHORT) .addScalar("indcredito", Hibernate.SHORT)
.addScalar("boletoId", Hibernate.LONG).addScalar("ocdId", Hibernate.LONG) .addScalar("boletoId", Hibernate.LONG)
.addScalar("ocdId", Hibernate.LONG)
.addScalar("eventoextraId", Hibernate.LONG) .addScalar("eventoextraId", Hibernate.LONG)
.addScalar("desctipoinformativo", Hibernate.STRING) .addScalar("desctipoinformativo", Hibernate.STRING)
.addScalar("descpendencia", Hibernate.STRING) .addScalar("descpendencia", Hibernate.STRING)
.addScalar("cajaId", Hibernate.LONG)
.setResultTransformer(Transformers.aliasToBean(LogConferenciaVO.class)); .setResultTransformer(Transformers.aliasToBean(LogConferenciaVO.class));
qr.setParameter("conferenciaId", conferencia.getConferenciaId()); qr.setParameter("conferenciaId", conferencia.getConferenciaId());
@ -688,6 +691,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
} }
@SuppressWarnings("unchecked")
@Override @Override
public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia) public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia)
throws BusinessException { throws BusinessException {
@ -696,69 +700,58 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
conferencia.getPuntoVenta(), conferencia.getDatamovimento()); conferencia.getPuntoVenta(), conferencia.getDatamovimento());
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT B.BOLETO_ID AS \"boletoId\", B.NUMASIENTO AS \"numAsiento\", B.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", ") .append("SELECT C.CAJA_ID AS \"cajaId\", C.NUMASIENTO AS \"numAsiento\", C.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", C.NUMOPERACION AS \"numoperacion\", C.NUMFOLIOSISTEMA AS \"numFolioSistema\", ")
.append("B.NUMOPERACION AS \"numoperacion\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\", B.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", ") .append("C.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", C.NUMFOLIOPREIMPRESO AS \"numFolioPreImpreso\", EST.CVEESTADO AS \"uf\", CAT.DESCCATEGORIA AS \"desccategoria\", ")
.append("B.NUMFOLIOPREIMPRESO AS \"numFolioPreImpreso\", EST.CVEESTADO AS \"uf\", CAT.DESCCATEGORIA AS \"desccategoria\", ") .append("NVL(C.PRECIOPAGADO,0) AS \"valorpagado\", NVL(C.IMPORTEOUTROS,0) AS \"seguroOutros\", NVL(C.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(C.IMPORTESEGURO,0) AS \"seguro\", ")
.append("NVL(B.PRECIOPAGADO,0) AS \"valorpagado\", NVL(B.IMPORTEOUTROS,0) AS \"seguroOutros\", ") .append("NVL(C.IMPORTETAXAEMBARQUE,0) AS \"embarque\", C.TIPOVENTA_ID AS \"tipoVenta\", C.INDSTATUSBOLETO AS \"indstatusboleto\", LOG.STATUS AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", ")
.append("NVL(B.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(B.IMPORTESEGURO,0) AS \"seguro\", NVL(B.IMPORTETAXAEMBARQUE,0) AS \"embarque\", ") .append("FP.DESCPAGO AS \"descpago\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", MC.DESCMOTIVO AS \"descmotivocancelacion\", U.NOMBUSUARIO AS \"nombusuario\", C.MOTIVOCANCELACION_ID AS \"motivocancelacionId\", ")
.append("B.TIPOVENTA_ID AS \"tipoVenta\", B.INDSTATUSBOLETO AS \"indstatusboleto\", LOG.STATUS AS \"status\", ") .append("CF.IMPORTE AS \"importeFp\", COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", COMCAT.COMEMPCATEGORIA_ID AS \"comempcategoriaId\", C.NOMBPASAJERO AS \"nombpasajero\", ")
.append("FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", ") .append("E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", C.FECCORRIDA AS \"feccorrida\", C.CORRIDA_ID \"corridaId\", ")
.append("MC.DESCMOTIVO AS \"descmotivocancelacion\", U.NOMBUSUARIO AS \"nombusuario\", B.MOTIVOCANCELACION_ID AS \"motivocancelacionId\", ") .append("NVL(T.PRECIO,0) + NVL(T.IMPORTEPEDAGIO,0) + NVL(T.IMPORTETAXAEMBARQUE,0) + NVL(T.IMPORTESEGURO,0) + NVL(T.IMPORTEOUTROS,0) AS \"valorTabela\", ")
.append("BF.IMPORTE AS \"importeFp\", COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", COMCAT.COMEMPCATEGORIA_ID AS \"comempcategoriaId\", ") .append("C.INDCANCELACION AS \"indCancelacion\", C.INDREIMPRESION AS \"indreimpresion\" ")
.append("BO1.TIPOVENTA_ID \"tipoVentaOriginal1\", BO2.TIPOVENTA_ID \"tipoVentaOriginal2\", OCD.OCD_ID \"ocdId\", ") .append("FROM CAJA C ")
.append("B.NOMBPASAJERO AS \"nombpasajero\", E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", ") .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ")
.append("B.FECCORRIDA AS \"feccorrida\", B.CORRIDA_ID \"corridaId\", B.BOLETOORIGINAL_ID AS \"boletoOriginalId\", ")
.append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\", ")
.append("NVL(tarifa.PRECIO,0) + NVL(tarifa.IMPORTEPEDAGIO,0) + NVL(tarifa.IMPORTETAXAEMBARQUE,0) + NVL(tarifa.IMPORTESEGURO,0) + NVL(tarifa.IMPORTEOUTROS,0) AS \"valorTabela\", ")
.append("NVL(OCD.VALOR_PAGAR,0) AS \"valorPagarOcd\", NVL(OCD.VALOR_TARJETA,0) AS \"valorTarjetaOcd\", ")
.append("B.INDCANCELACION AS \"indCancelacion\", BA.TIPOVENTA_ID AS \"tipoventaAnteriorId\", B.INDREIMPRESION AS \"indreimpresion\" ")
.append("FROM BOLETO B ")
.append("LEFT JOIN BOLETO BO1 ON BO1.BOLETO_ID = B.BOLETOORIGINAL_ID ")
.append("LEFT JOIN BOLETO BO2 ON BO2.BOLETO_ID = BO1.BOLETOORIGINAL_ID ")
.append("LEFT JOIN BOLETO BA ON BA.BOLETO_ID = B.BOLETOANTERIOR_ID ")
.append("LEFT JOIN OCD OCD ON B.BOLETOORIGINAL_ID = OCD.BOLETO_ID ")
.append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ")
.append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.PARADA_ID ") .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.PARADA_ID ")
.append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ") .append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ")
.append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ") .append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = C.CATEGORIA_ID ")
.append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.BOLETO_ID = B.BOLETO_ID AND LOG.ACTIVO = 1 ") .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.CAJA_ID = C.CAJA_ID AND LOG.ACTIVO = 1 ")
.append("LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = B.MOTIVOCANCELACION_ID ") .append("LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = C.MOTIVOCANCELACION_ID ")
.append("INNER JOIN BOLETO_FORMAPAGO BF ON BF.BOLETO_ID = B.BOLETO_ID ") .append("INNER JOIN CAJA_FORMAPAGO CF ON CF.CAJA_ID = C.CAJA_ID ")
.append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = BF.FORMAPAGO_ID ") .append("INNER JOIN FORMA_PAGO FP ON FP.FORMAPAGO_ID = CF.FORMAPAGO_ID ")
.append("INNER JOIN USUARIO U ON B.USUARIO_ID = U.USUARIO_ID ") .append("INNER JOIN USUARIO U ON C.USUARIO_ID = U.USUARIO_ID ")
.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ") .append("INNER JOIN MARCA M ON C.MARCA_ID = M.MARCA_ID ")
.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
.append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ") .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
.append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ") .append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = C.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ")
.append("INNER JOIN TARIFA tarifa ON (tarifa.RUTA_ID = B.RUTA_ID AND tarifa.ORIGEN_ID = B.ORIGEN_ID AND tarifa.DESTINO_ID = B.DESTINO_ID AND tarifa.MARCA_ID = M.MARCA_ID) ") .append("INNER JOIN TARIFA T ON (T.RUTA_ID = C.RUTA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.DESTINO_ID = C.DESTINO_ID AND T.MARCA_ID = M.MARCA_ID) ")
.append("INNER JOIN VIGENCIA_TARIFA vigenciaTarifa ON (vigenciaTarifa.VIGENCIATARIFA_ID = tarifa.VIGENCIATARIFA_ID) ") .append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ")
.append("WHERE B.ACTIVO = 1 ") .append("WHERE C.ACTIVO = 1 ")
.append("AND B.FECCREACION BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ") //.append("AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID <> :motivocancelacionIdQuitacaoOcd) ")
.append("AND B.FECCREACION BETWEEN vigenciaTarifa.FECINICIOVIGENCIA AND vigenciaTarifa.FECFINVIGENCIA "); .append("AND C.FECHORVENTA BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ")
.append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {
sQuery.append("AND M.EMPRESA_ID = :empresaId "); sQuery.append("AND M.EMPRESA_ID = :empresaId ");
} }
if (parametros.containsKey("puntoventaId")) { if (parametros.containsKey("puntoventaId")) {
sQuery.append("AND B.PUNTOVENTA_ID = :puntoventaId "); sQuery.append("AND C.PUNTOVENTA_ID = :puntoventaId ");
} }
if (StringUtils.isNotBlank(conferencia.getNumfoliosistema())) { if (StringUtils.isNotBlank(conferencia.getNumfoliosistema())) {
sQuery.append("AND B.NUMFOLIOSISTEMA = :numfoliosistema "); sQuery.append("AND C.NUMFOLIOSISTEMA = :numfoliosistema ");
parametros.put("numfoliosistema", conferencia.getNumfoliosistema()); parametros.put("numfoliosistema", conferencia.getNumfoliosistema());
} }
sQuery.append("ORDER BY B.BOLETO_ID "); sQuery.append("ORDER BY C.CAJA_ID ");
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
Query qr = getSession().createSQLQuery(sQuery.toString()) Query qr = getSession().createSQLQuery(sQuery.toString())
.addScalar("boletoId", Hibernate.LONG) .addScalar("cajaId", Hibernate.LONG)
.addScalar("boletoOriginalId", Hibernate.LONG)
.addScalar("numAsiento", Hibernate.STRING) .addScalar("numAsiento", Hibernate.STRING)
.addScalar("numAsientoVinculado", Hibernate.STRING) .addScalar("numAsientoVinculado", Hibernate.STRING)
.addScalar("numFolioSistema", Hibernate.STRING) .addScalar("numFolioSistema", Hibernate.STRING)
.addScalar("numSeriePreimpresa", Hibernate.STRING) .addScalar("numSeriePreimpresa", Hibernate.STRING)
.addScalar("numFolioPreImpreso", Hibernate.STRING) .addScalar("numFolioPreImpreso", Hibernate.STRING)
.addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING) .addScalar("uf", Hibernate.STRING)
.addScalar("desccategoria", Hibernate.STRING)
.addScalar("valorpagado", Hibernate.BIG_DECIMAL) .addScalar("valorpagado", Hibernate.BIG_DECIMAL)
.addScalar("valorTabela", Hibernate.BIG_DECIMAL) .addScalar("valorTabela", Hibernate.BIG_DECIMAL)
.addScalar("seguroOutros", Hibernate.BIG_DECIMAL) .addScalar("seguroOutros", Hibernate.BIG_DECIMAL)
@ -774,26 +767,19 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.addScalar("descmotivocancelacion", Hibernate.STRING) .addScalar("descmotivocancelacion", Hibernate.STRING)
.addScalar("nombusuario", Hibernate.STRING) .addScalar("nombusuario", Hibernate.STRING)
.addScalar("motivoCancelacionId", Hibernate.INTEGER) .addScalar("motivoCancelacionId", Hibernate.INTEGER)
.addScalar("motivoCancelacionOriginal1", Hibernate.INTEGER)
.addScalar("motivoCancelacionOriginal2", Hibernate.INTEGER)
.addScalar("importeFp", Hibernate.BIG_DECIMAL) .addScalar("importeFp", Hibernate.BIG_DECIMAL)
.addScalar("comempformapagoId", Hibernate.INTEGER) .addScalar("comempformapagoId", Hibernate.INTEGER)
.addScalar("comempcategoriaId", Hibernate.INTEGER) .addScalar("comempcategoriaId", Hibernate.INTEGER)
.addScalar("numoperacion", Hibernate.STRING) .addScalar("numoperacion", Hibernate.STRING)
.addScalar("tipoVentaOriginal1", Hibernate.INTEGER)
.addScalar("tipoVentaOriginal2", Hibernate.INTEGER)
.addScalar("ocdId", Hibernate.INTEGER)
.addScalar("nombpasajero", Hibernate.STRING) .addScalar("nombpasajero", Hibernate.STRING)
.addScalar("indcarboletosdevolvidosconf", Hibernate.BOOLEAN) .addScalar("indcarboletosdevolvidosconf", Hibernate.BOOLEAN)
.addScalar("feccorrida", Hibernate.DATE) .addScalar("feccorrida", Hibernate.DATE)
.addScalar("corridaId", Hibernate.INTEGER) .addScalar("corridaId", Hibernate.INTEGER)
.addScalar("valorPagarOcd", Hibernate.BIG_DECIMAL)
.addScalar("valorTarjetaOcd", Hibernate.BIG_DECIMAL)
.addScalar("indCancelacion", Hibernate.BOOLEAN) .addScalar("indCancelacion", Hibernate.BOOLEAN)
.addScalar("tipoventaAnteriorId", Hibernate.INTEGER)
.addScalar("indreimpresion", Hibernate.BOOLEAN) .addScalar("indreimpresion", Hibernate.BOOLEAN)
.setResultTransformer(Transformers.aliasToBean(BoletoComissao.class)); .setResultTransformer(Transformers.aliasToBean(BoletoComissao.class));
setParametros(qr, parametros); setParametros(qr, parametros);
//qr.setParameter("motivocancelacionIdQuitacaoOcd", Constantes.MVO_CANCEL_QUITACAO_OCD.intValue());
List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>(); List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>();
List<BoletoComissao> auxLsBoletoComissao = qr.list(); List<BoletoComissao> auxLsBoletoComissao = qr.list();
@ -870,9 +856,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
Query qr = getSession().createSQLQuery(sQuery.toString()) Query qr = getSession().createSQLQuery(sQuery.toString())
.addScalar("ocdId", Hibernate.LONG).addScalar("numoperacion", Hibernate.STRING) .addScalar("ocdId", Hibernate.LONG)
.addScalar("fecinc", Hibernate.DATE).addScalar("fecpagar", Hibernate.DATE) .addScalar("numoperacion", Hibernate.STRING)
.addScalar("fecpago", Hibernate.DATE).addScalar("indpago", Hibernate.BOOLEAN) .addScalar("fecinc", Hibernate.DATE)
.addScalar("fecpagar", Hibernate.DATE)
.addScalar("fecpago", Hibernate.DATE)
.addScalar("indpago", Hibernate.BOOLEAN)
.addScalar("valorPagar", Hibernate.BIG_DECIMAL) .addScalar("valorPagar", Hibernate.BIG_DECIMAL)
.addScalar("penalizacion", Hibernate.BIG_DECIMAL) .addScalar("penalizacion", Hibernate.BIG_DECIMAL)
.addScalar("status", Hibernate.INTEGER) .addScalar("status", Hibernate.INTEGER)
@ -970,7 +959,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
public List<LogConferencia> carregarLogConferencia(Long conferenciaId) throws BusinessException { public List<LogConferencia> carregarLogConferencia(Long conferenciaId) throws BusinessException {
try { try {
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT log ").append("FROM LogConferencia log ") .append("SELECT log ")
.append("FROM LogConferencia log ")
.append("WHERE log.activo = 1 ") .append("WHERE log.activo = 1 ")
.append("AND log.conferencia.conferenciaId = :conferenciaId "); .append("AND log.conferencia.conferenciaId = :conferenciaId ");
Query qr = getSession().createQuery(sQuery.toString()); Query qr = getSession().createQuery(sQuery.toString());

11
src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
View File

@ -92,6 +92,9 @@ public class LogConferencia implements Serializable {
@Column(name = "INDMESMODIA") @Column(name = "INDMESMODIA")
private Boolean indmesmodia; private Boolean indmesmodia;
@Column(name = "CAJA_ID")
private Long cajaId;
public Long getLogconferenciaId() { public Long getLogconferenciaId() {
return logconferenciaId; return logconferenciaId;
} }
@ -260,4 +263,12 @@ public class LogConferencia implements Serializable {
this.indmesmodia = indmesmodia; this.indmesmodia = indmesmodia;
} }
public Long getCajaId() {
return cajaId;
}
public void setCajaId(Long cajaId) {
this.cajaId = cajaId;
}
} }

38
src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
View File

@ -381,7 +381,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
BigDecimal total = BigDecimal.ZERO; BigDecimal total = BigDecimal.ZERO;
if (lsBoletoComissao != null) { if (lsBoletoComissao != null) {
for (BoletoComissao boletoComissao : lsBoletoComissao) { for (BoletoComissao boletoComissao : lsBoletoComissao) {
if(boletoComissao.isNaoSomarBilhete()) { if(boletoComissao.isNotSomarBilhete()) {
continue; continue;
} }
@ -402,7 +402,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
BigDecimal totalOcd = BigDecimal.ZERO; BigDecimal totalOcd = BigDecimal.ZERO;
if (lsBoletoComissao != null) { if (lsBoletoComissao != null) {
for (BoletoComissao boletoComissao : lsBoletoComissao) { for (BoletoComissao boletoComissao : lsBoletoComissao) {
if(boletoComissao.isNaoSomarBilhete()) { if(boletoComissao.isNotSomarBilhete()) {
continue; continue;
} }
if (boletoComissao.isOcd()) { if (boletoComissao.isOcd()) {
@ -426,7 +426,12 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
BigDecimal total = BigDecimal.ZERO; BigDecimal total = BigDecimal.ZERO;
if (lsEventosFinanceiros != null) { if (lsEventosFinanceiros != null) {
for (EventosFinanceirosVO eventosFinanceiros : lsEventosFinanceiros) { for (EventosFinanceirosVO eventosFinanceiros : lsEventosFinanceiros) {
total = total.add(eventosFinanceiros.getImpingreso()); /*total = total.add(eventosFinanceiros.getImpingreso());*/
if (eventosFinanceiros.isCredito()) {
total = MoneyHelper.somar(total, eventosFinanceiros.getImpingreso());
} else if (eventosFinanceiros.isDebito()) {
total = MoneyHelper.subtrair(total, eventosFinanceiros.getImpingreso().abs());
}
} }
} }
return total; return total;
@ -461,7 +466,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
resumoComissao.setTotalOcd(totalOcd); resumoComissao.setTotalOcd(totalOcd);
carregarTotalFormapago(resumoComissao, boletoComissaos, lsEventosFinanceiros); carregarTotalFormapago(resumoComissao, boletoComissaos, lsEventosFinanceiros);
subtrairOcdFormapagoDinheiro(totalOcd, resumoComissao); //subtrairOcdFormapagoDinheiro(totalOcd, resumoComissao);
carregarTotalDeposito(resumoComissao, boletoComissaos, lsEventosFinanceiros); carregarTotalDeposito(resumoComissao, boletoComissaos, lsEventosFinanceiros);
resumoComissao.setQuantidadeEcf(puntoVentaDAO.quantidadeECFPorPuntoVenta(conferencia.getEmpresa().getEmpresaId(), conferencia.getPuntoVenta().getPuntoventaId())); resumoComissao.setQuantidadeEcf(puntoVentaDAO.quantidadeECFPorPuntoVenta(conferencia.getEmpresa().getEmpresaId(), conferencia.getPuntoVenta().getPuntoventaId()));
@ -483,7 +488,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
BigDecimal totalDeposito = BigDecimal.ZERO; BigDecimal totalDeposito = BigDecimal.ZERO;
for (BoletoComissao boletoComissao : boletoComissaos) { for (BoletoComissao boletoComissao : boletoComissaos) {
if (!boletoComissao.isNaoSomarBilhete()) { if (!boletoComissao.isNotSomarBilhete()) {
for (FormapagoVO formapago : boletoComissao.getFormapagos()) { for (FormapagoVO formapago : boletoComissao.getFormapagos()) {
if(formaspagosDeposito.contains(formapago.getFormapagoId())) { if(formaspagosDeposito.contains(formapago.getFormapagoId())) {
//somando as vendas //somando as vendas
@ -492,11 +497,14 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
//subtraindo os cancelamentos //subtraindo os cancelamentos
} else if(boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) { } else if(boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte()); totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
//subtraindo as trocas //subtraindo as trocas e devolucoes
} else if(boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) { } else if(boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) {
if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) { if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) {
totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte()); totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
} }
//subtraindo as quitacoes de ocd
} else if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
totalDeposito = MoneyHelper.subtrair(totalDeposito, formapago.getImporte());
} }
} }
} }
@ -509,15 +517,15 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
if (eventosFinanceiros.isCredito()) { if (eventosFinanceiros.isCredito()) {
totalDeposito = MoneyHelper.somar(totalDeposito, eventosFinanceiros.getImpingreso()); totalDeposito = MoneyHelper.somar(totalDeposito, eventosFinanceiros.getImpingreso());
} else if (eventosFinanceiros.isDebito()) { } else if (eventosFinanceiros.isDebito()) {
totalDeposito = MoneyHelper.subtrair(totalDeposito, eventosFinanceiros.getImpingreso().compareTo(BigDecimal.ZERO) >= 0 ? eventosFinanceiros.getImpingreso() : eventosFinanceiros.getImpingreso().abs()); totalDeposito = MoneyHelper.subtrair(totalDeposito, eventosFinanceiros.getImpingreso().abs());
} }
} }
} }
//subtraindo as ocds pagas //subtraindo as ocds pagas
if(resumoComissao.getTotalOcd() != null && resumoComissao.getTotalOcd().getValorPagar() != null) { /*if(resumoComissao.getTotalOcd() != null && resumoComissao.getTotalOcd().getValorPagar() != null) {
totalDeposito = MoneyHelper.subtrair(totalDeposito, resumoComissao.getTotalOcd().getValorPagar()); totalDeposito = MoneyHelper.subtrair(totalDeposito, resumoComissao.getTotalOcd().getValorPagar());
} }*/
resumoComissao.setValorDeposito(totalDeposito); resumoComissao.setValorDeposito(totalDeposito);
@ -563,7 +571,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
private void carregarTotalFormapago(ResumoComissao resumoComissao, List<BoletoComissao> boletoComissaos, List<EventosFinanceirosVO> lsEventosFinanceiros) { private void carregarTotalFormapago(ResumoComissao resumoComissao, List<BoletoComissao> boletoComissaos, List<EventosFinanceirosVO> lsEventosFinanceiros) {
List<FormapagoVO> totalFormapagos = new ArrayList<FormapagoVO>(); List<FormapagoVO> totalFormapagos = new ArrayList<FormapagoVO>();
for (BoletoComissao boletoComissao : boletoComissaos) { for (BoletoComissao boletoComissao : boletoComissaos) {
if (!boletoComissao.isNaoSomarBilhete()) { if (!boletoComissao.isNotSomarBilhete()) {
for (FormapagoVO formapagoBoleto : boletoComissao.getFormapagos()) { for (FormapagoVO formapagoBoleto : boletoComissao.getFormapagos()) {
FormapagoVO formapago; FormapagoVO formapago;
if (totalFormapagos.contains(formapagoBoleto)) { if (totalFormapagos.contains(formapagoBoleto)) {
@ -573,14 +581,20 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
totalFormapagos.add(formapago); totalFormapagos.add(formapago);
} }
//somando as vendas
if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) { if (boletoComissao.isAbaBilheteVendido() || boletoComissao.isAbaGapVendido() || boletoComissao.isAbaBilheteManual()) {
formapago.add(formapagoBoleto.getImporte()); formapago.add(formapagoBoleto.getImporte());
//subtraindo os cancelamentos
} else if (boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) { } else if (boletoComissao.isAbaBilheteCancelado() || boletoComissao.isAbaGapCancelado()) {
formapago.subtract(formapagoBoleto.getImporte()); formapago.subtract(formapagoBoleto.getImporte());
//subtraindo as trocas e devolucoes
} else if(boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) { } else if(boletoComissao.isAbaBilheteDevolvido() || boletoComissao.isAbaGapDevolvido()) {
if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido()) { if(boletoComissao.isMotivocancelacionTrocado() || boletoComissao.isMotivocancelacionDevolvido() || boletoComissao.isMotivocancelacionQuitacaoOcd()) {
formapago.subtract(formapagoBoleto.getImporte()); formapago.subtract(formapagoBoleto.getImporte());
} }
//subtraindo as quitacoes de ocd
} else if(boletoComissao.isMotivocancelacionQuitacaoOcd()) {
formapago.subtract(formapagoBoleto.getImporte());
} }
} }
} }
@ -597,7 +611,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
if (eventosFinanceiros.isCredito()) { if (eventosFinanceiros.isCredito()) {
formapagoEventoFinanceiro.add(eventosFinanceiros.getImpingreso()); formapagoEventoFinanceiro.add(eventosFinanceiros.getImpingreso());
} else if (eventosFinanceiros.isDebito()) { } else if (eventosFinanceiros.isDebito()) {
formapagoEventoFinanceiro.subtract(eventosFinanceiros.getImpingreso().compareTo(BigDecimal.ZERO) >= 0 ? eventosFinanceiros.getImpingreso() : eventosFinanceiros.getImpingreso().abs()); formapagoEventoFinanceiro.subtract(eventosFinanceiros.getImpingreso().abs());
} }
} }

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

@ -80,6 +80,8 @@ public class BoletoComissao {
private Integer tipoventaAnteriorId; private Integer tipoventaAnteriorId;
private Long cajaId;
public Integer getEmpresaId() { public Integer getEmpresaId() {
return empresaId; return empresaId;
} }
@ -303,10 +305,10 @@ public class BoletoComissao {
if (obj == null) if (obj == null)
return false; return false;
BoletoComissao other = (BoletoComissao) obj; BoletoComissao other = (BoletoComissao) obj;
if (getBoletoId() == null) { if (getCajaId() == null) {
if (other.getBoletoId() != null) if (other.getCajaId() != null)
return false; return false;
} else if (!getBoletoId().equals(other.getBoletoId())) } else if (!getCajaId().equals(other.getCajaId()))
return false; return false;
return true; return true;
} }
@ -388,10 +390,6 @@ public class BoletoComissao {
} }
public String getSituacaoBilhete() { public String getSituacaoBilhete() {
if("768596".equals(getNumFolioSistema())) {
System.out.println("");
}
if (isOcd()) { if (isOcd()) {
return "OCD"; return "OCD";
} }
@ -442,7 +440,7 @@ public class BoletoComissao {
} }
public boolean isOcd() { public boolean isOcd() {
return getOcdId() != null && isStatusCancelado() && !isFormapagoTrocaPassagem(); return isMotivocancelacionGeracaoOcd() && isStatusCancelado() && !isFormapagoTrocaPassagem();
} }
public String getNombusuario() { public String getNombusuario() {
@ -510,11 +508,11 @@ public class BoletoComissao {
} }
public Integer getTipoVentaOriginal() { public Integer getTipoVentaOriginal() {
if(isVendaBilheteTroca(tipoVenta) || isVendaBilheteTransferencia(tipoVenta)) { /*if(isVendaBilheteTroca(tipoVenta) || isVendaBilheteTransferencia(tipoVenta)) {
return tipoVentaOriginal2 != null ? tipoVentaOriginal2 return tipoVentaOriginal2 != null ? tipoVentaOriginal2
: tipoVentaOriginal1 != null ? tipoVentaOriginal1 : tipoVentaOriginal1 != null ? tipoVentaOriginal1
: tipoventaAnteriorId != null ? tipoventaAnteriorId : tipoVenta; : tipoventaAnteriorId != null ? tipoventaAnteriorId : tipoVenta;
} }*/
return tipoVenta; return tipoVenta;
} }
@ -542,11 +540,11 @@ public class BoletoComissao {
this.ocdId = ocdId; this.ocdId = ocdId;
} }
private boolean isBoletoOriginal() { /* private boolean isBoletoOriginal() {
return boletoOriginalId == null return boletoOriginalId == null
&& getMotivoCancelacionOriginal() != null && getMotivoCancelacionOriginal() != null
&& getMotivoCancelacionOriginal() == Constantes.MVO_CANCEL_BOLETO_AGRUPAMENTO.intValue(); && getMotivoCancelacionOriginal() == Constantes.MVO_CANCEL_BOLETO_AGRUPAMENTO.intValue();
} }*/
public Integer getMotivoCancelacionOriginal() { public Integer getMotivoCancelacionOriginal() {
return motivoCancelacionOriginal2 != null ? motivoCancelacionOriginal2 : motivoCancelacionOriginal1; return motivoCancelacionOriginal2 != null ? motivoCancelacionOriginal2 : motivoCancelacionOriginal1;
@ -653,16 +651,21 @@ public class BoletoComissao {
&& getMotivoCancelacionId() == Constantes.MVO_CANCEL_GERACAO_OCD.intValue(); && getMotivoCancelacionId() == Constantes.MVO_CANCEL_GERACAO_OCD.intValue();
} }
public boolean isMotivocancelacionQuitacaoOcd() {
return !isSemMotivocancelacion()
&& getMotivoCancelacionId() == Constantes.MVO_CANCEL_QUITACAO_OCD.intValue();
}
/** ABA BILHETE MANUAL */ /** ABA BILHETE MANUAL */
public boolean isBilhetesManualVendido() { public boolean isBilhetesManualVendido() {
return (isVendaBilheteManual(getTipoVentaOriginal()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao return (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao
(isVendaBilheteManual(getTipoVentaOriginal()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida; (isVendaBilheteManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida;
} }
/** ABA BILHETE MANUAL */ /** ABA BILHETE MANUAL */
public boolean isBilhetesAbertoManualVendido() { public boolean isBilhetesAbertoManualVendido() {
return (isVendaBilheteAbertoManual(getTipoVentaOriginal()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao return (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isSemMotivocancelacion()) || // Venda sem alteracao
(isVendaBilheteAbertoManual(getTipoVentaOriginal()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida; (isVendaBilheteAbertoManual(getTipoVenta()) && isStatusVendido() && isMotivocancelacionTransferido()); // Venda transferida;
} }
public boolean isStatusVendido() { public boolean isStatusVendido() {
@ -826,7 +829,7 @@ public class BoletoComissao {
return false; return false;
} }
if((isVendaBilheteTransferencia(getTipoVenta())) && isVendaGap(getTipoVentaOriginal())) { if(isVendaBilheteTransferencia(getTipoVenta())) {
return false; return false;
} }
@ -877,11 +880,7 @@ public class BoletoComissao {
return false; return false;
} }
if((isVendaBilheteTransferencia(getTipoVenta())) && !isVendaGap(getTipoVentaOriginal())) { return (isStatusVendido() || isStatusTroca()) && isNotNumFolioPreImpressoGerado();
return false;
}
return isStatusVendido() || isStatusTroca();
} }
/** Define bilhete na aba de gap cancelada */ /** Define bilhete na aba de gap cancelada */
@ -959,12 +958,12 @@ public class BoletoComissao {
return "BoletoComissao [boletoId=" + boletoId + ", tipoVenta=" + tipoVenta + ", indstatusboleto=" + indstatusboleto + ", motivoCancelacionId=" + motivoCancelacionId + ", descmotivocancelacion=" + descmotivocancelacion + ", tipoVentaOriginal1=" + tipoVentaOriginal1 + ", tipoVentaOriginal2=" + tipoVentaOriginal2 + ", indCancelacion=" + indCancelacion + ", indreimpresion=" + indreimpresion + ", total=" + getTotal() + "]"; return "BoletoComissao [boletoId=" + boletoId + ", tipoVenta=" + tipoVenta + ", indstatusboleto=" + indstatusboleto + ", motivoCancelacionId=" + motivoCancelacionId + ", descmotivocancelacion=" + descmotivocancelacion + ", tipoVentaOriginal1=" + tipoVentaOriginal1 + ", tipoVentaOriginal2=" + tipoVentaOriginal2 + ", indCancelacion=" + indCancelacion + ", indreimpresion=" + indreimpresion + ", total=" + getTotal() + "]";
} }
public boolean isNaoSomarBilhete() { public boolean isNotSomarBilhete() {
/*if(getIndreimpresion() != null && getIndreimpresion()) { if(getIndreimpresion() != null && getIndreimpresion()) {
return true; return true;
}*/ }
if(isStatusTroca() && isVendaBilheteTransferencia(getTipoVenta())) { /* if(isStatusTroca() && isVendaBilheteTransferencia(getTipoVenta())) {
return true; return true;
} }
@ -982,9 +981,17 @@ public class BoletoComissao {
if(isMotivocancelacionAgrupamento()) { if(isMotivocancelacionAgrupamento()) {
return true; return true;
} }*/
return false; return false;
} }
public Long getCajaId() {
return cajaId;
}
public void setCajaId(Long cajaId) {
this.cajaId = cajaId;
}
} }

9
src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
View File

@ -32,6 +32,7 @@ public class LogConferenciaVO {
private String desctipoinformativo; private String desctipoinformativo;
private String descpendencia; private String descpendencia;
private String descComportamentoData; private String descComportamentoData;
private Long cajaId;
public LogConferenciaVO() { public LogConferenciaVO() {
super(); super();
@ -286,4 +287,12 @@ public class LogConferenciaVO {
this.descComportamentoData = descComportamentoData; this.descComportamentoData = descComportamentoData;
} }
public Long getCajaId() {
return cajaId;
}
public void setCajaId(Long cajaId) {
this.cajaId = cajaId;
}
} }