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

bug #7500 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@57189 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-06-22 14:28:02 +00:00
parent 302b52fa74
commit f27184d716
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,7 +451,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append("SELECT r4.numserie20 as numImpressora, "); sql.append("SELECT r4.numserie20 as numImpressora, ");
sql.append(" r4.coo as coo, "); sql.append(" r4.coo as coo, ");
sql.append(" r4.imptotalliquido as valorTotal, "); sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datainicialemissao as dataEmissao, "); sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.boleto_id as boletoId, "); sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.marca_id as empresaId, "); sql.append(" b.marca_id as empresaId, ");
@ -498,7 +498,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" AND r4.indcancelamento = 'N' "); sql.append(" AND r4.indcancelamento = 'N' ");
sql.append(" GROUP BY r4.numserie20, "); sql.append(" GROUP BY r4.numserie20, ");
sql.append(" r4.coo, "); sql.append(" r4.coo, ");
sql.append(" r4.datainicialemissao, "); sql.append(" r4.datamov, ");
sql.append(" r4.cpfcnpjcliente, "); sql.append(" r4.cpfcnpjcliente, ");
sql.append(" r4.imptotalliquido, "); sql.append(" r4.imptotalliquido, ");
sql.append(" b.boleto_id, "); sql.append(" b.boleto_id, ");
@ -525,7 +525,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" b.importeseguro, "); sql.append(" b.importeseguro, ");
sql.append(" cs.descclase, "); sql.append(" cs.descclase, ");
sql.append(" fi.numcnpj "); sql.append(" fi.numcnpj ");
sql.append(" ORDER BY r4.datainicialemissao, "); sql.append(" ORDER BY r4.datamov, ");
sql.append(" r4.numserie20, "); sql.append(" r4.numserie20, ");
sql.append(" r4.coo, "); sql.append(" r4.coo, ");
sql.append(" r5.numitem "); sql.append(" r5.numitem ");
@ -539,7 +539,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append("SELECT r4.numserie20 as numImpressora, "); sql.append("SELECT r4.numserie20 as numImpressora, ");
sql.append(" r4.coo as coo, "); sql.append(" r4.coo as coo, ");
sql.append(" r4.imptotalliquido as valorTotal, "); sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datainicialemissao as dataEmissao, "); sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.boleto_id as boletoId, "); sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.marca_id as empresaId, "); sql.append(" b.marca_id as empresaId, ");
@ -588,7 +588,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" AND r3.totparcial = 'Can-T') IS NULL) ) "); sql.append(" AND r3.totparcial = 'Can-T') IS NULL) ) ");
sql.append(" GROUP BY r4.numserie20, "); sql.append(" GROUP BY r4.numserie20, ");
sql.append(" r4.coo, "); sql.append(" r4.coo, ");
sql.append(" r4.datainicialemissao, "); sql.append(" r4.datamov, ");
sql.append(" r4.cpfcnpjcliente, "); sql.append(" r4.cpfcnpjcliente, ");
sql.append(" r4.imptotalliquido, "); sql.append(" r4.imptotalliquido, ");
sql.append(" b.boleto_id, "); sql.append(" b.boleto_id, ");
@ -615,7 +615,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" fi.numcnpj, "); sql.append(" fi.numcnpj, ");
sql.append(" ei.icms, "); sql.append(" ei.icms, ");
sql.append(" r4.indcancelamento "); sql.append(" r4.indcancelamento ");
sql.append(" ORDER BY r4.datainicialemissao, "); sql.append(" ORDER BY r4.datamov, ");
sql.append(" r4.numserie20, "); sql.append(" r4.numserie20, ");
sql.append(" r4.coo, "); sql.append(" r4.coo, ");
sql.append(" r5.numitem "); sql.append(" r5.numitem ");
@ -628,7 +628,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" SELECT r4.numserie20 as numImpressora, "); sql.append(" SELECT r4.numserie20 as numImpressora, ");
sql.append(" r4.coo as coo, "); sql.append(" r4.coo as coo, ");
sql.append(" r4.imptotalliquido as valorTotal, "); sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datainicialemissao as dataEmissao, "); sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" fi.numcnpj as cnpjImpressora, "); sql.append(" fi.numcnpj as cnpjImpressora, ");
sql.append(" fi.numserie as numpdv, "); sql.append(" fi.numserie as numpdv, ");
@ -649,11 +649,11 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" WHERE r4.datamov BETWEEN ? AND ? "); sql.append(" WHERE r4.datamov BETWEEN ? AND ? ");
sql.append(" AND b.marca_id = ? "); sql.append(" AND b.marca_id = ? ");
sql.append(" AND r5.impdesconto <> 0 "); sql.append(" AND r5.impdesconto <> 0 ");
sql.append(" GROUP BY r4.numserie20, r4.coo, r4.datainicialemissao, r4.cpfcnpjcliente, "); sql.append(" GROUP BY r4.numserie20, r4.coo, r4.datamov, r4.cpfcnpjcliente, ");
sql.append(" r4.imptotalliquido, fi.numcnpj, fi.numserie, r5.impdesconto, "); sql.append(" r4.imptotalliquido, fi.numcnpj, fi.numserie, r5.impdesconto, ");
sql.append(" r5.totparcial, r5.imptotalliquido, r5.tipopassagem, "); sql.append(" r5.totparcial, r5.imptotalliquido, r5.tipopassagem, ");
sql.append(" r5.numitem, r5.codproduto, fi.modelo, r4.usuario_id "); sql.append(" r5.numitem, r5.codproduto, fi.modelo, r4.usuario_id ");
sql.append(" ORDER BY r4.datainicialemissao, r4.numserie20, r4.coo, r5.numitem "); sql.append(" ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem ");
return sql.toString(); return sql.toString();
} }
@ -663,7 +663,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append("SELECT r4.numserie20 as numImpressora, "); sql.append("SELECT r4.numserie20 as numImpressora, ");
sql.append(" r4.coo as coo, "); sql.append(" r4.coo as coo, ");
sql.append(" r4.imptotalliquido as valorTotal, "); sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datainicialemissao as dataEmissao, "); sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.boleto_id as boletoId, "); sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.marca_id as empresaId, "); sql.append(" b.marca_id as empresaId, ");
@ -693,7 +693,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" AND r4.indcancelamento = 'S' "); sql.append(" AND r4.indcancelamento = 'S' ");
sql.append(" AND (SELECT r3.numserie20 FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20"); sql.append(" AND (SELECT r3.numserie20 FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20");
sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T')) IS NOT NULL "); sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T')) IS NOT NULL ");
sql.append("GROUP BY r4.numserie20, r4.coo, r4.datainicialemissao, "); sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, ");
sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, ");
sql.append(" b.boleto_id, b.marca_id, fi.numcnpj, "); sql.append(" b.boleto_id, b.marca_id, fi.numcnpj, ");
sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, ");
@ -701,7 +701,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, ");
sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, ");
sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento ");
sql.append("ORDER BY r4.datainicialemissao, r4.numserie20, r4.coo, r5.numitem "); sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem ");
return sql.toString(); return sql.toString();
} }
@ -711,7 +711,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append("SELECT r4.numserie20 as numImpressora, "); sql.append("SELECT r4.numserie20 as numImpressora, ");
sql.append(" r4.coo as coo, "); sql.append(" r4.coo as coo, ");
sql.append(" r4.imptotalliquido as valorTotal, "); sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datainicialemissao as dataEmissao, "); sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.boleto_id as boletoId, "); sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.marca_id as empresaId, "); sql.append(" b.marca_id as empresaId, ");
@ -740,7 +740,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" AND b.marca_id = ? "); sql.append(" AND b.marca_id = ? ");
sql.append(" AND r5.imptotalliquido = 1 "); sql.append(" AND r5.imptotalliquido = 1 ");
sql.append(" AND b.preciopagado = 0 "); sql.append(" AND b.preciopagado = 0 ");
sql.append("GROUP BY r4.numserie20, r4.coo, r4.datainicialemissao, "); sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, ");
sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, ");
sql.append(" b.boleto_id, b.marca_id, fi.numcnpj, "); sql.append(" b.boleto_id, b.marca_id, fi.numcnpj, ");
sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, ");
@ -748,7 +748,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, ");
sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, ");
sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento ");
sql.append("ORDER BY r4.datainicialemissao, r4.numserie20, r4.coo, r5.numitem "); sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem ");
return sql.toString(); return sql.toString();
} }
@ -758,7 +758,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append("SELECT r4.numserie20 as numImpressora, "); sql.append("SELECT r4.numserie20 as numImpressora, ");
sql.append(" r4.coo as coo, "); sql.append(" r4.coo as coo, ");
sql.append(" r4.imptotalliquido as valorTotal, "); sql.append(" r4.imptotalliquido as valorTotal, ");
sql.append(" r4.datainicialemissao as dataEmissao, "); sql.append(" r4.datamov as dataEmissao, ");
sql.append(" r4.cpfcnpjcliente as cnpjCliente, "); sql.append(" r4.cpfcnpjcliente as cnpjCliente, ");
sql.append(" b.boleto_id as boletoId, "); sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.marca_id as empresaId, "); sql.append(" b.marca_id as empresaId, ");
@ -788,7 +788,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" AND r4.indcancelamento = 'S' "); sql.append(" AND r4.indcancelamento = 'S' ");
sql.append(" AND (SELECT MAX(r3.numserie20) FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20"); sql.append(" AND (SELECT MAX(r3.numserie20) FROM fiscal_r3 r3 where r3.numserie20 = r4.numserie20");
sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T', 'DT')) IS NULL "); sql.append(" AND r3.datamov = r4.datamov AND r3.totparcial IN ('Can-T', 'DT')) IS NULL ");
sql.append("GROUP BY r4.numserie20, r4.coo, r4.datainicialemissao, "); sql.append("GROUP BY r4.numserie20, r4.coo, r4.datamov, ");
sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, "); sql.append(" r4.cpfcnpjcliente, r4.imptotalliquido, ");
sql.append(" b.boleto_id, b.marca_id, fi.numcnpj, "); sql.append(" b.boleto_id, b.marca_id, fi.numcnpj, ");
sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, "); sql.append(" fi.numserie, r5.impdesconto, r5.totparcial, ");
@ -796,7 +796,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, "); sql.append(" r5.codproduto, fi.modelo, r4.usuario_id, ");
sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, "); sql.append(" b.preciopagado, b.importetaxaembarque, b.importepedagio, ");
sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento "); sql.append(" b.importeseguro, fi.numcnpj, r4.indcancelamento, r4.indcancelamento ");
sql.append("ORDER BY r4.datainicialemissao, r4.numserie20, r4.coo, r5.numitem "); sql.append("ORDER BY r4.datamov, r4.numserie20, r4.coo, r5.numitem ");
return sql.toString(); return sql.toString();
} }