diff --git a/src/com/rjconsultores/ventaboletos/dao/SapDAO.java b/src/com/rjconsultores/ventaboletos/dao/SapDAO.java index 17521eb3b..c43e08fcf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/SapDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/SapDAO.java @@ -12,5 +12,5 @@ public interface SapDAO extends GenericDAO { public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); public boolean atualizaFechamento(Long fechamentocntcorrenteId) throws Exception; - -} + +} \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java index c4494a44a..819065d7d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Repository; import com.rjconsultores.ventaboletos.dao.SapDAO; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.FechamentoCntcorrente; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; @Repository("sapDAO") @@ -57,21 +58,27 @@ public class SapHibernateDAO extends GenericHibernateDAO 1) "); + } + sb.append(" ORDER BY "); sb.append(" pv.nombpuntoventa, fc.fecfechamento "); Query query = getSession().createSQLQuery(sb.toString()); - query.setInteger("empresaId", empresa.getEmpresaId()); - if(dataDe != null && dataAte != null){ - query.setDate("dataDe", dataDe); - query.setDate("dataAte", dataAte); + if( empresa != null ) { + query.setInteger("empresaId", empresa.getEmpresaId()); + } + + if(dataDe != null && dataAte != null){ + query.setDate("dataDe", DateUtil.normalizarToFecha(dataDe)); + query.setDate("dataAte", DateUtil.normalizarToFecha(dataAte)); } @SuppressWarnings("unchecked") @@ -104,6 +111,11 @@ public class SapHibernateDAO extends GenericHibernateDAO public int remessa(List fechamentos) throws Exception ; public List obtenerTodosParaRemessa(Empresa empresa, Date dataDe, Date dataAte, Boolean reenviar); + + public void integracaoSapAutomatica() throws Exception; } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java index 91cede613..ab5e5ae4e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java @@ -108,4 +108,13 @@ public class SapServiceImpl implements SapService{ return constante.getValorconstante(); } + @Override + public void integracaoSapAutomatica() throws Exception { + List listaPendente = obtenerTodosParaRemessa(null, new Date(), new Date(), false); + + if(!listaPendente.isEmpty()) { + remessa(listaPendente); + } + } + }