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@57880 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-07-14 13:19:57 +00:00
parent d532378f80
commit 4388b4fa13
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,14 +98,12 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") .append("JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ") .append(" AND BE.INDSTATUSBOLETO = 'E' ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ") .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append(" AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append(" AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append(" AND B.EMPRESACORRIDA_ID = :empresaId ") .append(" AND B.EMPRESACORRIDA_ID = :empresaId ")
.append("AND B.INDSTATUSBOLETO = 'V' ")
.append(" AND B.MOTIVOCANCELACION_ID = 16 ") .append(" AND B.MOTIVOCANCELACION_ID = 16 ")
.append("AND BE.INDSTATUSBOLETO = 'E' ") .append(" AND B.INDSTATUSBOLETO = 'V' ")
.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') = TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ")
.append("GROUP BY 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA', ") .append("GROUP BY 'VENDIDO E ENTREGUE MESMA COMPETÊNCIA', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') ");
@ -123,14 +121,13 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
.append(" COUNT(B.BOLETO_ID) AS QTDE ") .append(" COUNT(B.BOLETO_ID) AS QTDE ")
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append(" JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ") .append(" JOIN BOLETO BE ON B.BOLETO_ID = BE.BOLETOORIGINAL_ID ")
.append("JOIN FISCAL_R4 R4 ON BE.BOLETO_ID = R4.BOLETO_ID ")
.append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append(" AND BE.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("AND BE.EMPRESACORRIDA_ID = :empresaId ") .append("WHERE B.TIPOVENTA_ID IN (5,12,18) ")
.append(" AND B.EMPRESACORRIDA_ID = :empresaId ")
.append(" AND B.INDSTATUSBOLETO = 'V' ") .append(" AND B.INDSTATUSBOLETO = 'V' ")
.append("AND B.MOTIVOCANCELACION_ID = 16 ") .append("AND B.MOTIVOCANCELACION_ID = 16 ")
.append(" AND B.FECHORVENTA < :dataInicial ")
.append(" AND BE.INDSTATUSBOLETO = 'E' ") .append(" AND BE.INDSTATUSBOLETO = 'E' ")
.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') < TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY') ")
.append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ") .append("GROUP BY 'VENDIDO EM COMPETÊNCIA ANTERIOR', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ") .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY'), ")
.append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') "); .append(" TO_CHAR(BE.FECHORVENTA,'MM/YYYY') ");
@ -152,11 +149,10 @@ public class RelatorioAnaliticoVoucher extends Relatorio {
.append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ") .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal ")
.append("AND B.EMPRESACORRIDA_ID = :empresaId ") .append("AND B.EMPRESACORRIDA_ID = :empresaId ")
.append("AND B.INDSTATUSBOLETO = 'V' ") .append("AND B.INDSTATUSBOLETO = 'V' ")
.append("AND (B.MOTIVOCANCELACION_ID IS NULL OR ") .append("AND (BE.BOLETO_ID IS NULL ")
.append(" (B.MOTIVOCANCELACION_ID = 16 ") .append(" OR (BE.INDSTATUSBOLETO = 'E' ")
.append(" AND BE.INDSTATUSBOLETO = 'E' ") .append(" AND B.MOTIVOCANCELACION_ID = 16 ")
.append("AND TO_DATE(TO_CHAR(B.FECHORVENTA,'MM/YYYY'),'MM/YYYY') <> TO_DATE(TO_CHAR(BE.FECHORVENTA,'MM/YYYY'),'MM/YYYY')) ") .append(" AND BE.FECHORVENTA > :dataFinal )) ")
.append(" ) ")
.append("GROUP BY 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA', ") .append("GROUP BY 'VENDIDO E NÃO ENTREGUE NA COMPETÊNCIA', ")
.append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') "); .append(" TO_CHAR(B.FECHORVENTA,'MM/YYYY') ");