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

fixes bug #9305 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71111 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-07-07 12:48:39 +00:00
parent c6fa137f88
commit 39c0ca3912
1 changed files with 46 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -503,89 +503,67 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
}
private String sqlFiscaisECFCancelados(boolean isEstadoTodos) {
StringBuilder sql = new StringBuilder();
sql.append("SELECT r4.numserie20 as numImpressora, ");
sql.append(" r4.coo as coo, ");
sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.boleto_id as boletoId, ");
sql.append(" me.empresa_id as empresaId, ");
sql.append(" co.codibge as origenId, ");
sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" r4.boleto_id as boletoId, ");
sql.append(" me.empresa_id as empresaId, ");
sql.append(" co.codibge as origenId, ");
sql.append(" eo.cveestado as origenUf, ");
sql.append(" cd.codibge as destinoId, ");
sql.append(" ed.cveestado as destinoUf, ");
sql.append(" fi.numcnpj as cnpjImpressora, ");
sql.append(" fi.numcnpj as cnpjImpressora, ");
sql.append(" fi.numserie as numpdv, ");
sql.append(" r5.totparcial as repTributado, ");
sql.append(" r5.imptotalliquido as valorItem, ");
sql.append(" r5.tipopassagem as tipoPassagem, ");
sql.append(" r5.numitem as numItem, ");
sql.append(" r5.codproduto as codProduto, ");
sql.append(" fi.modelo as modeloImpressora, ");
sql.append(" r4.usuario_id as numCaixa, ");
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(" r5.totparcial as repTributado, ");
sql.append(" r5.imptotalliquido as valorItem, ");
sql.append(" r5.tipopassagem as tipoPassagem, ");
sql.append(" r5.numitem as numItem, ");
sql.append(" r5.codproduto as codProduto, ");
sql.append(" fi.modelo as modeloImpressora, ");
sql.append(" r4.usuario_id as numCaixa, ");
sql.append(" cajb.preciopagado as importetarifa, ");
sql.append(" cajb.importetaxaembarque as importetaxaembarque, ");
sql.append(" cajb.importepedagio as importepedagio, ");
sql.append(" cajb.importeseguro as importeseguro, ");
sql.append(" 'C' as status, ");
sql.append(" b.motivocancelacion_id as motivocancelacion, ");
sql.append(" cajb.motivocancelacion_id as motivocancelacion, ");
sql.append(" ee.impingreso as valorMulta, ");
sql.append(" cs.descclase as claseServicio, ");
sql.append(" cs.descclase as claseServicio, ");
sql.append(" translate(fi.numcnpj, ' / - . ', ' ') as cnpjEcf ");
sql.append(" FROM fiscal_r4 r4 ");
sql.append(" LEFT JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 AND r4.coo = r5.coo ");
sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador ");
sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 ");
sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id ");
sql.append(" INNER JOIN boleto be ON b.boleto_id = be.boletooriginal_id ");
sql.append(" INNER JOIN marca me ON me.marca_id = be.marca_id ");
sql.append(" INNER JOIN clase_servicio cs ON cs.claseservicio_id = b.claseservicio_id ");
sql.append(" LEFT JOIN evento_extra ee on ee.boleto_id = b.boleto_id and ee.tipoeventoextra_id in (42) ");
sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id ");
sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id and ase.activo = 1 and ase.corrida_id is null ");
sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id ");
sql.append(" FROM caja caj ");
sql.append(" INNER JOIN caja cajb on (((cajb.feccorrida = caj.feccorrida) or (cajb.feccorrida is null and caj.feccorrida is null)) ");
sql.append(" and ((cajb.numasiento = caj.numasiento) or (cajb.numasiento is null and caj.numasiento is null)) ");
sql.append(" and cajb.numfoliosistema = caj.numfoliosistema and cajb.origen_id = caj.origen_id and cajb.destino_id=caj.destino_id ");
sql.append(" and ((cajb.tipoventa_id not in (5,12,18,81,41) ");
sql.append(" and (cajb.indstatusboleto = 'V' or (cajb.indstatusboleto = 'T' and cajb.indreimpresion=0) )) ");
sql.append(" or (cajb.tipoventa_id in (5,12,18,81,41) and cajb.indstatusboleto = 'E')) ) ");
sql.append(" INNER JOIN fiscal_r4 r4 on r4.caja_id = cajb.caja_id ");
sql.append(" LEFT JOIN fiscal_r5 r5 ON r4.numserie20 = r5.numserie20 and r4.coo = r5.coo ");
sql.append(" and r4.datamov = r5.datamov and r4.contador = r5.contador ");
sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 ");
sql.append(" INNER JOIN marca me ON me.marca_id = cajb.marca_id ");
sql.append(" INNER JOIN clase_servicio cs ON cs.claseservicio_id = cajb.claseservicio_id ");
sql.append(" LEFT JOIN evento_extra ee on ee.boleto_id = r4.boleto_id and ee.tipoeventoextra_id in (42) ");
sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = cajb.origen_id ");
sql.append(" and ase.destino_id = caj.destino_id and ase.ruta_id = cajb.ruta_id and ase.activo = 1 and ase.corrida_id is null ");
sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, cajb.origen_id) = o.parada_id ");
sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id ");
sql.append(" INNER JOIN estado eo ON eo.estado_id = co.estado_id ");
sql.append(" INNER JOIN parada d ON coalesce(ase.aliasdestino_id, b.destino_id) = d.parada_id ");
sql.append(" INNER JOIN parada d ON coalesce(ase.aliasdestino_id, cajb.destino_id) = d.parada_id ");
sql.append(" INNER JOIN ciudad cd ON d.ciudad_id = cd.ciudad_id ");
sql.append(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id ");
sql.append(" WHERE be.fechorventa BETWEEN ? AND ? ");
sql.append(" AND me.empresa_id = ? ");
sql.append(" WHERE caj.fechorventa BETWEEN ? AND ? ");
sql.append(" and me.empresa_id = ? ");
sql.append(isEstadoTodos ? "" : " AND eo.estado_id = ? ");
sql.append(" AND b.motivocancelacion_id IN (31,32,10) ");
sql.append(" AND be.indstatusboleto = 'C' ");
sql.append(" AND r4.indcancelamento = 'N' ");
sql.append(" GROUP BY r4.numserie20, ");
sql.append(" r4.coo, ");
sql.append(" r4.datamov, ");
sql.append(" r4.cpfcnpjcliente, ");
sql.append(" r4.imptotalliquido, ");
sql.append(" b.boleto_id, ");
sql.append(" me.empresa_id, ");
sql.append(" co.codibge, ");
sql.append(" cd.codibge, ");
sql.append(" fi.numcnpj, ");
sql.append(" fi.numserie, ");
sql.append(" r5.impdesconto, ");
sql.append(" r5.totparcial, ");
sql.append(" r5.imptotalliquido, ");
sql.append(" r5.tipopassagem, ");
sql.append(" r5.numitem, ");
sql.append(" r5.codproduto, ");
sql.append(" fi.modelo, ");
sql.append(" r4.usuario_id, ");
sql.append(" eo.cveestado, ");
sql.append(" ed.cveestado, ");
sql.append(" b.motivocancelacion_id, ");
sql.append(" ee.impingreso, ");
sql.append(" b.preciopagado, ");
sql.append(" b.importetaxaembarque, ");
sql.append(" b.importepedagio, ");
sql.append(" b.importeseguro, ");
sql.append(" cs.descclase, ");
sql.append(" fi.numcnpj ");
sql.append(" and caj.motivocancelacion_id IN (31,32,10,37,99,36) ");
sql.append(" and caj.indcancelacion = 1 ");
sql.append(" and caj.indreimpresion = 0 ");
sql.append(" and caj.indstatusboleto = 'C' ");
sql.append(" and r4.indcancelamento = 'N' ");
sql.append(" ORDER BY r4.datamov, ");
sql.append(" r4.numserie20, ");
sql.append(" r4.coo, ");