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

fixes bug#6913 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50937 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2015-12-05 17:13:25 +00:00
parent 6bc21fafb4
commit ae6a7b074a
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java
View File

@ -136,11 +136,8 @@ public class RelatorioAgenciaFechamento extends Relatorio {
agenciaFechamento.setReceita(receita != null ? receita : BigDecimal.ZERO);
agenciaFechamento.setDespesa(despesa != null ? despesa : BigDecimal.ZERO);
vendido = vendido.add(receita != null ? receita : BigDecimal.ZERO);
vendido = vendido.subtract(despesa != null ? despesa : BigDecimal.ZERO);
total = total.add(receita != null ? receita : BigDecimal.ZERO);
total = total.subtract(despesa != null ? despesa : BigDecimal.ZERO);
total = total.subtract(despesa != null ? despesa : BigDecimal.ZERO);
agenciaFechamento.setVendido(vendido != null ? vendido : BigDecimal.ZERO);
agenciaFechamento.setTotal(total.abs());
@ -177,29 +174,46 @@ public class RelatorioAgenciaFechamento extends Relatorio {
private String carregarDadosTotaisdeVenda(String puntoVenta) {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT ");
sql.append(" pv.PUNTOVENTA_ID AS codigo, ");
sql.append(" pv.nombpuntoventa AS descricao, ");
sql.append(" COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN cfp.IMPORTE ELSE NULL END),0) AS qtdevendido, ");
sql.append(" 0 AS qtdedigitado, ");
sql.append(" COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID = 31 THEN 1 ELSE NULL END),0) AS qtdeAnulado, ");
sql.append(" COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID = 32 THEN 1 ELSE NULL END),0) AS qtdeDevolvido, ");
sql.append(" COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN cfp.IMPORTE ELSE NULL END),0) AS vendido, ");
sql.append(" 0 AS digitado, ");
sql.append(" COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID = 31 THEN cfp.IMPORTE ELSE NULL END),0) AS anulado, ");
sql.append(" COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID = 32 THEN cfp.IMPORTE ELSE NULL END),0) AS devolvido ");
sql.append(" FROM CAJA c ");
sql.append(" INNER JOIN CAJA_FORMAPAGO cfp ON c.CAJA_ID = cfp.CAJA_ID AND cfp.activo = 1 ");
sql.append(" INNER JOIN PUNTO_VENTA pv ON c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
sql.append(" WHERE c.TURNO_ID IS NOT NULL ");
sql.append(" AND c.FECCORTE BETWEEN :de AND :ate ");
sql.append(" SELECT ");
sql.append(" pv.PUNTOVENTA_ID AS codigo, ");
sql.append(" pv.nombpuntoventa AS descricao, ");
sql.append(" ");
sql.append(" COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL and (c.INDREMOTOINVERSO is null or c.INDREMOTOINVERSO =0) THEN c.caja_id ELSE NULL END),0) AS qtdevendido, ");
sql.append(" ");
sql.append(" COALESCE(COUNT(CASE WHEN c.INDREMOTOINVERSO = 1 THEN 1 ELSE NULL END),0) AS qtdedigitado, ");
sql.append(" ");
sql.append(" COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID = 31 THEN 1 ELSE NULL END),0) AS qtdeAnulado, ");
sql.append(" COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID is not null and c.MOTIVOCANCELACION_ID <> 31 THEN 1 ELSE NULL END),0) AS qtdeDevolvido, ");
sql.append(" ");
sql.append(" COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL and (c.INDREMOTOINVERSO is null or c.INDREMOTOINVERSO =0) THEN ( ");
sql.append(" coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0) ");
sql.append(" +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS vendido, ");
sql.append(" ");
sql.append(" COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL and c.INDREMOTOINVERSO = 1 THEN ( ");
sql.append(" coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0) ");
sql.append(" +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS digitado, ");
sql.append(" ");
sql.append(" COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID = 31 THEN ( ");
sql.append(" coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0) ");
sql.append(" +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS anulado, ");
sql.append(" ");
sql.append(" COALESCE(SUM(CASE WHEN c.MOTIVOCANCELACION_ID is not null and c.MOTIVOCANCELACION_ID <> 31 THEN ( ");
sql.append(" coalesce(c.IMPORTEOUTROS,0) + coalesce(c.IMPORTEPEDAGIO,0) + coalesce(c.IMPORTESEGURO,0) ");
sql.append(" +coalesce(IMPORTETAXAEMBARQUE ,0)+coalesce(c.preciopagado,0)) ELSE NULL END),0) AS devolvido ");
sql.append(" ");
sql.append(" ");
sql.append(" FROM CAJA c ");
sql.append(" INNER JOIN PUNTO_VENTA pv ON c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
sql.append(" inner join marca m on m.marca_id = c.marca_id ");
sql.append(" WHERE c.TURNO_ID IS NOT NULL ");
sql.append(" AND c.FECCORTE BETWEEN :de AND :ate ");
if (puntoVenta != null && !puntoVenta.equals("-1")) {
sql.append(" AND c.PUNTOVENTA_ID =:puntoVentaId ");
}
sql.append(" AND c.TIPOVENTA_ID <> 6 ");
sql.append(" AND ((c.EMPRESACORRIDA_ID IS NULL ) OR (c.EMPRESACORRIDA_ID IS NOT NULL AND c.EMPRESACORRIDA_ID = :empresaId )) ");
sql.append(" GROUP BY pv.PUNTOVENTA_ID , pv.nombpuntoventa ");
sql.append(" ORDER BY pv.PUNTOVENTA_ID , pv.nombpuntoventa ");
sql.append(" AND c.TIPOVENTA_ID <> 6 ");
sql.append(" AND m.empresa_id = :empresaId ");
sql.append(" GROUP BY pv.PUNTOVENTA_ID , pv.nombpuntoventa ");
sql.append(" ORDER BY pv.PUNTOVENTA_ID , pv.nombpuntoventa ");
return sql.toString();

2
src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java
View File

@ -78,7 +78,7 @@ public class RenderRelatorioJasper {
}
}
} catch (Exception e) {
log.error(e.getMessage());
log.error(e.getMessage(),e);
}
}