fixes bug #7985
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@62411 d1611594-4594-4d17-8e1d-87c2c4800839master
valdevir
parent
c40c63cd8e
commit
79fe435360
|
|
@ -100,7 +100,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "unchecked", "deprecation" })
|
||||
private void carregarPuntoVentas(List<ConferenciaComissaoVO> lsConferencias, String competencia,
|
||||
Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
|
||||
try {
|
||||
|
|
@ -132,6 +131,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
|
||||
sQuery.append("ORDER BY PV.NOMBPUNTOVENTA ");
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
Query qr = getSession().createSQLQuery(sQuery.toString())
|
||||
.addScalar("puntoventaId", Hibernate.INTEGER)
|
||||
.addScalar("numPuntoVenta", Hibernate.STRING)
|
||||
|
|
@ -147,7 +147,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private void carregarConferenciasRegistradas(List<ConferenciaComissaoVO> lsConferencias,
|
||||
String competencia, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
|
||||
try {
|
||||
|
|
@ -174,7 +173,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
private void setParametros(Query qr, Map<String, Object> parametros) {
|
||||
for (Entry<String, Object> parametro : parametros.entrySet()) {
|
||||
if (parametro.getValue() instanceof Collection) {
|
||||
|
|
@ -499,14 +497,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "unchecked", "deprecation" })
|
||||
public List<EventosFinanceirosVO> carregarEventosFinanceiros(Conferencia conferencia)
|
||||
throws BusinessException {
|
||||
try {
|
||||
Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(),
|
||||
conferencia.getPuntoVenta(), conferencia.getDatamovimento());
|
||||
StringBuilder sQuery = new StringBuilder()
|
||||
.append("SELECT EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ")
|
||||
.append("SELECT EE.BOLETO_ID AS \"boletoId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ")
|
||||
.append("EE.IMPINGRESO AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ")
|
||||
.append("LOG.STATUS AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", ")
|
||||
.append("TEE.INDTIPO AS \"indtipo\", U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", ")
|
||||
|
|
@ -531,7 +528,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
sQuery.append("ORDER BY TEE.DESCTIPOEVENTO ");
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
Query qr = getSession().createSQLQuery(sQuery.toString())
|
||||
.addScalar("boletoId", Hibernate.LONG)
|
||||
.addScalar("eventoextraId", Hibernate.LONG)
|
||||
.addScalar("numdocumento", Hibernate.STRING)
|
||||
.addScalar("impingreso", Hibernate.BIG_DECIMAL)
|
||||
|
|
@ -557,7 +556,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "deprecation", "unchecked" })
|
||||
public List<LogConferenciaVO> carregarLogConferencia(Conferencia conferencia)
|
||||
throws BusinessException {
|
||||
try {
|
||||
|
|
@ -579,6 +577,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
.append("WHERE LOG.ACTIVO = 1 ")
|
||||
.append("AND LOG.CONFERENCIA_ID = :conferenciaId ");
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
Query qr = getSession().createSQLQuery(sQuery.toString())
|
||||
.addScalar("logconferenciaId", Hibernate.LONG)
|
||||
.addScalar("observacao", Hibernate.STRING)
|
||||
|
|
@ -659,7 +658,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "unchecked", "deprecation" })
|
||||
public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia)
|
||||
throws BusinessException {
|
||||
try {
|
||||
|
|
@ -717,6 +715,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
sQuery.append("ORDER BY B.BOLETO_ID ");
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
Query qr = getSession().createSQLQuery(sQuery.toString())
|
||||
.addScalar("boletoId", Hibernate.LONG)
|
||||
.addScalar("boletoOriginalId", Hibernate.LONG)
|
||||
|
|
@ -795,7 +794,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "unchecked", "deprecation" })
|
||||
public List<OcdVO> carregarOcds(Conferencia conferencia) throws BusinessException {
|
||||
try {
|
||||
Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(),
|
||||
|
|
@ -823,6 +821,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
sQuery.append("AND O.PUNTOVENTAPAGO_ID = :puntoventaId ");
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
Query qr = getSession().createSQLQuery(sQuery.toString())
|
||||
.addScalar("ocdId", Hibernate.LONG).addScalar("numoperacion", Hibernate.STRING)
|
||||
.addScalar("fecinc", Hibernate.DATE).addScalar("fecpagar", Hibernate.DATE)
|
||||
|
|
@ -873,7 +872,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
@Transactional
|
||||
private void gerarLancamentoContaCorrente(Conferencia conferencia) throws BusinessException {
|
||||
try {
|
||||
|
||||
Calendar cal = Calendar.getInstance();
|
||||
cal.add(Calendar.DAY_OF_MONTH, 1);
|
||||
|
||||
List<LogConferencia> lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId());
|
||||
String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy");
|
||||
|
|
@ -881,8 +881,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
|
||||
for (LogConferencia logConferencia : lsLogConferencia) {
|
||||
|
||||
Calendar cal = Calendar.getInstance();
|
||||
|
||||
if(!Boolean.TRUE.equals(logConferencia.getIndmesmodia())){
|
||||
cal.add(Calendar.DAY_OF_MONTH, 1);
|
||||
}
|
||||
|
|
@ -918,7 +916,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<LogConferencia> carregarLogConferencia(Long conferenciaId) throws BusinessException {
|
||||
try {
|
||||
StringBuilder sQuery = new StringBuilder()
|
||||
|
|
@ -978,7 +975,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
|
|||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento,
|
||||
Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
|
||||
try {
|
||||
|
|
|
|||
Loading…
Reference in New Issue