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

fixes bug #10474 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78901 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-02-08 19:41:07 +00:00
parent ce4ed3ac0b
commit db93f0cda8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2295,8 +2295,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" cast(f.fechorfolio as date) as dataEmissaoRMD,");
sb.append(" (case when s.aliasorigen_id is null then eo.estado_id else cos.estado_id end) as codigoParticipante,");
sb.append(" ei.codestabelecimento as codigoEstabelecimento,");
sb.append(" a.acfiscal as numeroAIDF,");
sb.append(" a.serie as serieAIDF,");
sb.append(" coalesce(a.acfiscal, 'X') as numeroAIDF,");
sb.append(" coalesce(a.serie, 'X') as serieAIDF,");
sb.append(" a.subserie as subSerieAIDF,");
sb.append(" f.folio as numeroFormularioBilheteAIDF,");
sb.append(" (case when coalesce(f.indcancelacion, 0) = 1 then 'S' else 'N' end) as documentoCancelado,");
@ -2325,7 +2325,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" ei.porcredestadual as porcReducaoEstadual,");
sb.append(" ei.tributacaoimportacao as tributacaoImportacao,");
sb.append(" b.rmd_id,");
sb.append(" b.aidf_id,");
sb.append(" coalesce(b.aidf_id, -1),");
sb.append(" b.caja_id");
sb.append(" from folio_consumo_rmd f");
sb.append(" join estado eof on eof.estado_id = f.estado_id");
@ -2335,7 +2335,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" left join empresa_imposto eif on eif.activo = 1 and eif.empresa_id = f.empresa_id and eif.estado_id = eof.estado_id");
sb.append(" left join inscricao_estadual ie on ie.empresa_id = f.empresa_id and ie.estado_id = eof.estado_id and ie.activo = 1");
sb.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id");
sb.append(" left join caja b on b.activo = 1 and b.indreimpresion = 0 and b.rmd_id = (case when coalesce(f.indcancelacion, 0) = 1 then -1 else f.rmd_id end) and b.empresacorrida_id = f.empresa_id and b.foliormd = f.folio and to_char(b.fechorventa, 'ddmmyyyy') = to_char(f.fechorfolio, 'ddmmyyyy')");
sb.append(" left join caja b on b.activo = 1 and b.rmd_id = (case when coalesce(f.indcancelacion, 0) = 1 then -1 else f.rmd_id end) and b.empresacorrida_id = f.empresa_id and b.foliormd = f.folio and to_char(b.fechorventa, 'ddmmyyyy') = to_char(f.fechorfolio, 'ddmmyyyy')");
sb.append(" left join parada po on po.parada_id = b.origen_id and po.activo = 1 ");
sb.append(" left join ciudad co on co.ciudad_id = po.ciudad_id and co.activo = 1 ");
sb.append(" left join estado eo on eo.estado_id = co.estado_id and eo.activo = 1 ");
@ -2358,8 +2358,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
sb.append(" and f.empresa_id = ? ");
sb.append(" and eof.cveestado like ? ");
sb.append(" and ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) ");
sb.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) ");
sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) ");
try {
PreparedStatement ps = connection.prepareStatement(sb.toString());
ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00");