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

fixes bug #7629 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@57881 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-07-14 13:27:52 +00:00
parent 4388b4fa13
commit f7b73a86a2
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java
View File

@ -88,8 +88,8 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
/* VENDIDO E IMPRESSO NA MESMA COMPETENCIA */
sQuery.append("SELECT 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA' AS SITUACAO, ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append(" TO_CHAR(BE.FECCREACION,'MM/YYYY') AS COMPETENCIA_ENTREGA, ")
.append(" TO_CHAR(B.FECCREACION,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append(" SUM(B.PRECIOPAGADO) AS TARIFA, ")
.append(" SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ")
.append(" SUM(B.IMPORTESEGURO) AS SEGURO, ")
@ -97,23 +97,23 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
.append(" COUNT(B.BOLETO_ID) AS QTDE ")
.append("FROM BOLETO B ")
.append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append(" AND BE.FECCREACION BETWEEN :dataInicial AND :dataFinal ")
.append(" AND BE.INDSTATUSBOLETO = 'E' ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append(" AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append(" AND B.FECCREACION BETWEEN :dataInicial AND :dataFinal ")
.append(" AND B.EMPRESACORRIDA_ID = :empresaId ")
.append(" AND B.MOTIVOCANCELACION_ID = 16 ")
.append(" AND B.INDSTATUSBOLETO = 'V' ")
.append("GROUP BY 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') ");
.append(" TO_CHAR(B.FECCREACION,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECCREACION,'MM/YYYY') ");
sQuery.append("UNION ");
/* VENDIDO EM COMPETÊNCIA ANTERIOR */
sQuery.append("SELECT 'VENDIDO EM COMPETÊNCIA ANTERIOR' AS SITUACAO, ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_ENTREGA, ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append(" TO_CHAR(BE.FECCREACION,'MM/YYYY') AS COMPETENCIA_ENTREGA, ")
.append(" TO_CHAR(B.FECCREACION,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append(" SUM(B.PRECIOPAGADO) AS TARIFA, ")
.append(" SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ")
.append(" SUM(B.IMPORTESEGURO) AS SEGURO, ")
@ -121,23 +121,23 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
.append(" COUNT(B.BOLETO_ID) AS QTDE ")
.append("FROM BOLETO B ")
.append(" JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append(" AND BE.FECCREACION BETWEEN :dataInicial AND :dataFinal ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append(" AND B.EMPRESACORRIDA_ID = :empresaId ")
.append(" AND B.INDSTATUSBOLETO = 'V' ")
.append("AND B.MOTIVOCANCELACION_ID = 16 ")
.append(" AND B.FECHORVENTA < :dataInicial ")
.append(" AND B.FECCREACION < :dataInicial ")
.append(" AND BE.INDSTATUSBOLETO = 'E' ")
.append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') ");
.append(" TO_CHAR(B.FECCREACION,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECCREACION,'MM/YYYY') ");
sQuery.append("UNION ");
/* VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA */
sQuery.append("SELECT 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA' AS SITUACAO, ")
.append("'' AS COMPETENCIA_ENTREGA, ")
.append("TO_CHAR(B.FECHORVENTA,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append("TO_CHAR(B.FECCREACION,'MM/YYYY') AS COMPETENCIA_VENDA, ")
.append("SUM(B.PRECIOPAGADO) AS TARIFA, ")
.append("SUM(B.IMPORTEPEDAGIO) AS PEDAGIO, ")
.append("SUM(B.IMPORTESEGURO) AS SEGURO, ")
@ -146,15 +146,15 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
.append("FROM BOLETO B ")
.append("LEFT JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("AND B.FECCREACION BETWEEN :dataInicial AND :dataFinal ")
.append("AND B.EMPRESACORRIDA_ID = :empresaId ")
.append("AND B.INDSTATUSBOLETO = 'V' ")
.append("AND (BE.BOLETO_ID IS NULL ")
.append(" OR (BE.INDSTATUSBOLETO = 'E' ")
.append(" AND B.MOTIVOCANCELACION_ID = 16 ")
.append(" AND BE.FECHORVENTA > :dataFinal )) ")
.append(" AND BE.FECCREACION > :dataFinal )) ")
.append("GROUP BY 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') ");
.append(" TO_CHAR(B.FECCREACION,'MM/YYYY') ");
sQuery.append("ORDER BY SITUACAO, COMPETENCIA_ENTREGA, COMPETENCIA_VENDA");