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

bug #7629 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@57492 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-07-01 18:36:29 +00:00
parent ad564df787
commit 473b948dfb
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,6 +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(" to_char(be.fechorventa,'yyyymmdd') as dataCancelamento, ");
sql.append(" r4.datamov 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, ");
@ -482,6 +483,7 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador "); 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 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 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 clase_servicio cs ON cs.claseservicio_id = b.claseservicio_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 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(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id ");
@ -492,12 +494,21 @@ public class FiscalHibernateDAO implements FiscalDAO {
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, b.destino_id) = d.parada_id ");
sql.append(" INNER JOIN ciudad cd ON d.ciudad_id = cd.ciudad_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(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id ");
sql.append(" WHERE r4.datamov BETWEEN ? AND ? ");
sql.append(" AND b.marca_id = ? "); // sql.append(" WHERE r4.datamov BETWEEN ? AND ? ");
sql.append(" AND b.motivocancelacion_id in (31, 32, 10) "); // sql.append(" AND b.marca_id = ? ");
// sql.append(" AND b.motivocancelacion_id in (31, 32, 10) ");
// sql.append(" AND r4.indcancelamento = 'N' ");
sql.append(" WHERE be.fechorventa BETWEEN ? AND ? ");
sql.append(" AND be.marca_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(" 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(" to_char(be.fechorventa,'yyyymmdd'), ");
sql.append(" r4.datamov, "); sql.append(" r4.datamov, ");
sql.append(" r4.cpfcnpjcliente, "); sql.append(" r4.cpfcnpjcliente, ");
sql.append(" r4.imptotalliquido, "); sql.append(" r4.imptotalliquido, ");
@ -529,7 +540,6 @@ public class FiscalHibernateDAO implements FiscalDAO {
sql.append(" r4.numserie20, "); sql.append(" r4.numserie20, ");
sql.append(" r4.coo, "); sql.append(" r4.coo, ");
sql.append(" r5.numitem "); sql.append(" r5.numitem ");
return sql.toString(); return sql.toString();
} }
@ -804,30 +814,35 @@ public class FiscalHibernateDAO implements FiscalDAO {
public List<ImportacionFiscalVO> buscaDatosFiscaisECF(Date inicio, Date fim, Integer empresaId, boolean isNormal, boolean isCancelados, boolean isPendencias, Connection connection) throws SQLException { public List<ImportacionFiscalVO> buscaDatosFiscaisECF(Date inicio, Date fim, Integer empresaId, boolean isNormal, boolean isCancelados, boolean isPendencias, Connection connection) throws SQLException {
if (isNormal) { if (isNormal) {
return montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECF()); return montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECF(), false);
} else if (isCancelados) { } else if (isCancelados) {
return montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFCancelados()); return montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFCancelados(), true);
} else if (isPendencias) { } else if (isPendencias) {
List<ImportacionFiscalVO> list = new ArrayList<ImportacionFiscalVO>(); List<ImportacionFiscalVO> list = new ArrayList<ImportacionFiscalVO>();
list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasCancelado())); list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasCancelado(), false));
list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasDesconto())); list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasDesconto(), false));
list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasInconsistente())); list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasInconsistente(), false));
list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasGratuidade())); list.addAll(montarItensECF(inicio, fim, empresaId, connection, sqlFiscaisECFPendenciasGratuidade(), false));
return list; return list;
} }
return null; return null;
} }
private List<ImportacionFiscalVO> montarItensECF(Date inicio, Date fim, Integer empresaId, Connection connection, String sql) throws SQLException { private List<ImportacionFiscalVO> montarItensECF(Date inicio, Date fim, Integer empresaId, Connection connection, String sql, boolean isDate) throws SQLException {
PreparedStatement stmt = connection.prepareStatement(sql); PreparedStatement stmt = connection.prepareStatement(sql);
stmt.setFetchSize(100); stmt.setFetchSize(100);
stmt.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); if (isDate) {
stmt.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); stmt.setTimestamp(1, new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime()));
stmt.setTimestamp(2, new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime()));
} else {
stmt.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL));
stmt.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL));
}
stmt.setInt(3, empresaId); stmt.setInt(3, empresaId);
List<ImportacionFiscalVO> list = new ArrayList<ImportacionFiscalVO>(); List<ImportacionFiscalVO> list = new ArrayList<ImportacionFiscalVO>();