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

Exportação Fiscal : ECF e RMD (issue 8120) 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@64735 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2017-01-09 20:32:14 +00:00
parent 0962ad9d77
commit d62de71d2c
2 changed files with 70 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -17,13 +17,11 @@ import javax.sql.DataSource;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.hibernate.jdbc.Work;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import com.rjconsultores.ventaboletos.dao.FiscalDAO;
import com.rjconsultores.ventaboletos.entidad.Aidf;
import com.rjconsultores.ventaboletos.entidad.EsquemaAgrupacion;
import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.StringHelper;
@ -46,7 +44,7 @@ import com.rjconsultores.ventaboletos.vo.impressaofiscal.ItemFiscalVO;
import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria;
@Repository("fiscalDAO")
public class FiscalHibernateDAO extends GenericHibernateDAO<EsquemaAgrupacion, Integer> implements FiscalDAO {
public class FiscalHibernateDAO implements FiscalDAO {
public static final String DATE_FORMAT_FISCAL = "yyyyMMdd";
private static Logger log = Logger.getLogger(FiscalHibernateDAO.class);
@ -1626,10 +1624,10 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<EsquemaAgrupacion, I
}
@Override
public List<ExportacaoECFTipoPRC> buscarRegistroECFTipoPRC(Connection connection, final Date inicio, final Date fim, final Integer empresaId, final String cveestado) {
final List<ExportacaoECFTipoPRC> retorno = new ArrayList<ExportacaoECFTipoPRC>();
public List<ExportacaoECFTipoPRC> buscarRegistroECFTipoPRC(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) {
List<ExportacaoECFTipoPRC> retorno = new ArrayList<ExportacaoECFTipoPRC>();
final StringBuilder sb = new StringBuilder();
StringBuilder sb = new StringBuilder();
sb.append(" select ecf, datamov, municipio_origem, estado_origem, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao, SUM(valortotal) as valortotal");
sb.append(" from (");
@ -1667,10 +1665,7 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<EsquemaAgrupacion, I
sb.append(" ) group by ecf, datamov, municipio_origem, estado_origem, estado_destino, red_base_calc_icms, porc_red_municipal, porc_red_estadual, tributacao_importacao");
try {
getSession().doWork(new Work() {
@Override
public void execute(Connection conn) throws SQLException {
PreparedStatement ps = conn.prepareStatement(sb.toString());
PreparedStatement ps = connection.prepareStatement(sb.toString());
ps.setLong(1, Long.valueOf(DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)));
ps.setLong(2, Long.valueOf(DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)));
ps.setLong(3, Long.valueOf(empresaId));
@ -1740,8 +1735,6 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<EsquemaAgrupacion, I
rs.close();
ps.close();
}
});
} catch (Exception e) {
log.error(e.getMessage(), e);

3
src/com/rjconsultores/ventaboletos/dao/hibernate/FlywayUtilHibernateDAO.java
View File

@ -27,8 +27,7 @@ public class FlywayUtilHibernateDAO extends GenericHibernateDAO<EsquemaAgrupacio
private static Logger log = LoggerFactory.getLogger(FlywayUtilHibernateDAO.class);
@Autowired
public FlywayUtilHibernateDAO(
@Qualifier("sessionFactory") SessionFactory factory) {
public FlywayUtilHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
setSessionFactory(factory);
}