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

fixes bug#11169 

dev: julio
qua: julio

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@82359 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-06-04 20:16:41 +00:00
parent daded84cb9
commit ab12c5bea0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,8 +95,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("select distinct "); sql.append("select distinct ");
sql.append(" (case when r2.numserie20 is null then 'X' else '' end) || imp.numserie20 as numImpressora, "); sql.append(" (case when r2.numserie20 is null then '' else r2.numserie20 end) || imp.numserie20 as numImpressora, ");
sql.append(" (case when r4.caja_id is null then '000001' else r4.coo end) as coo, "); sql.append(" coalesce(b.numfoliosistema, (case when r4.caja_id is null then '000001' else r4.coo end)) as coo, ");
sql.append(" to_char(b.feccreacion, 'yyyymmdd') as dataEmissao, "); sql.append(" to_char(b.feccreacion, 'yyyymmdd') as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.caja_id as boletoId, "); sql.append(" b.caja_id as boletoId, ");
@ -120,9 +120,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" imp.modelo as modeloImpressora, "); sql.append(" imp.modelo as modeloImpressora, ");
sql.append(" b.usuario_id as numCaixa, "); sql.append(" b.usuario_id as numCaixa, ");
sql.append(" b.preciopagado as importetarifa, "); sql.append(" b.preciopagado as importetarifa, ");
sql.append(" b.importetaxaembarque as importetaxaembarque, ");
sql.append(" b.importepedagio as importepedagio, ");
sql.append(" b.importeseguro as importeseguro, ");
sql.append(" cs.descclase AS claseServicio, "); sql.append(" cs.descclase AS claseServicio, ");
sql.append(" translate(imp.numcnpj, ' / - . ', ' ') as cnpjEcf, "); sql.append(" translate(imp.numcnpj, ' / - . ', ' ') as cnpjEcf, ");
sql.append(" coalesce(ei.icms, eos.icms) as icms, "); sql.append(" coalesce(ei.icms, eos.icms) as icms, ");
@ -168,18 +165,17 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" left join estado eds on eds.estado_id = cds.estado_id "); sql.append(" left join estado eds on eds.estado_id = cds.estado_id ");
sql.append(" left join estado ae on ae.estado_id = a.estado_id "); sql.append(" left join estado ae on ae.estado_id = a.estado_id ");
sql.append(" left join inscricao_estadual ie on e.empresa_id = ie.empresa_id "); sql.append(" left join inscricao_estadual ie on e.empresa_id = ie.empresa_id ");
sql.append(" and ie.estado_id = coalesce(ae.estado_id, eos.estado_id) and ie.activo = 1 "); sql.append(" and ie.estado_id = (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) and ie.activo = 1 ");
sql.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id "); sql.append(" left join ciudad cie on cie.ciudad_id = ie.ciudad_id ");
sql.append(" left join estado eie on eie.estado_id = cie.estado_id "); sql.append(" left join estado eie on eie.estado_id = cie.estado_id ");
sql.append(" left join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id "); sql.append(" left join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id ");
sql.append(" and ei.estado_id = coalesce(ae.estado_id, eos.estado_id) and ei.activo = 1 "); sql.append(" and ei.estado_id = (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) and ei.activo = 1 ");
sql.append("where ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); sql.append("where ((b.tipoventa_id = 3 and b.indstatusboleto in ('V', 'C') and b.indreimpresion = 0) ");
sql.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); sql.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) ");
sql.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) "); sql.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) ");
sql.append(" and b.indcancelacion = 0 ");
sql.append(" and b.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and b.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') "); sql.append(" and b.feccreacion >= to_date(:DATE_INICIO,'DD/MM/YYYY HH24:MI:SS') and b.feccreacion <= to_date(:DATE_FIM,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and b.empresacorrida_id = ? "); sql.append(" and b.empresacorrida_id = ? ");
sql.append(isEstadoTodos(estadoId) ? "" : " and coalesce(ae.estado_id, eos.estado_id) = ? "); sql.append(isEstadoTodos(estadoId) ? "" : " and (case when s.aliasorigen_id is null then eo.estado_id else eos.estado_id end) = ? ");
sql.append("ORDER BY dataEmissao, coo, modeloImpressora "); sql.append("ORDER BY dataEmissao, coo, modeloImpressora ");
List<ImportacionManualFiscalVO> listManuais = new ArrayList<ImportacionManualFiscalVO>(); List<ImportacionManualFiscalVO> listManuais = new ArrayList<ImportacionManualFiscalVO>();