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

fixes bug 6555 correção na exibição do valor de venda na query de devolução OCD 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49507 d1611594-4594-4d17-8e1d-87c2c4800839
master
igor.rodrigo 2015-10-27 20:50:14 +00:00
parent d91c46f24d
commit c2a2b8394b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java
View File

@ -57,7 +57,7 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
@Override @Override
protected void processaParametros() throws Exception { protected void processaParametros() throws Exception {
} }
private String getSql() { private String getSql() {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,"); sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,");
@ -81,12 +81,12 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
} }
sql.append(" inner join ocd_param ocd on ocd.empresa_id = p.empresa_id "); sql.append(" inner join ocd_param ocd on ocd.empresa_id = p.empresa_id ");
sql.append(" and p.empresa_id = ptovta.empresa_id )"); sql.append(" and p.empresa_id = ptovta.empresa_id )");
sql.append(" union "); sql.append(" union ");
sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,"); sql.append(" select * from (select distinct c.caja_id, p.nombpuntoventa, ctj.numtarjeta, c.fechorventa, ptovta.numsitef,");
sql.append(" (coalesce(c.preciopagado,0) + coalesce(c.importeoutros,0)+ coalesce(c.importepedagio,0)+ coalesce(c.importeseguro,0) + coalesce(c.importetaxaembarque,0)) as valor_venda,"); sql.append(" (coalesce(c.preciopagado,0) + coalesce(c.importeoutros,0)+ coalesce(c.importepedagio,0)+ coalesce(c.importeseguro,0) + coalesce(c.importetaxaembarque,0)) as valor_venda,");
sql.append(" TO_CHAR(coalesce(cf.importe,0) - (coalesce(cf.importe,0)*(o.PENALIZACION/100)),'FM9999999.90') as valor_cancelar,"); sql.append(" TO_CHAR(coalesce(o.VALOR_TARJETA,0),'FM9999999.90') as valor_cancelar,");
sql.append(" 'OCD' as descmotivo, ctj.numautorizacion numautorizacion, ctj.nsu, c.numfoliosistema"); sql.append(" 'OCD' as descmotivo, ctj.numautorizacion numautorizacion, ctj.nsu, c.numfoliosistema");
sql.append(" from OCD o"); sql.append(" from OCD o");
sql.append(" inner join boleto b on o.BOLETO_ID = b.BOLETO_ID"); sql.append(" inner join boleto b on o.BOLETO_ID = b.BOLETO_ID");
@ -98,13 +98,16 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") ); sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") );
} }
sql.append(" inner join caja c on c.NUMOPERACION = b.NUMOPERACION"); sql.append(" inner join caja c on c.NUMOPERACION = b.NUMOPERACION");
sql.append(" inner join ptovta_empresa ptovta on b.puntoventa_id = ptovta.puntoventa_id ");
sql.append(" inner join marca m on m.marca_id = b.marca_id ");
sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id"); sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id");
sql.append(" and m.EMPRESA_ID = ptovta.EMPRESA_ID");
sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final "); sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final ");
if (parametros.get("NUMPUNTOVENTA") != null) { if (parametros.get("NUMPUNTOVENTA") != null) {
sql.append(" and p.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); sql.append(" and p.puntoventa_id IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
} }
sql.append(" order by c.fechorventa )"); sql.append(" order by c.fechorventa )");
return sql.toString(); return sql.toString();
} }