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

Fixes Bug #9940 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75116 d1611594-4594-4d17-8e1d-87c2c4800839
master
alexandre.lima 2017-10-18 11:33:15 +00:00
parent 0ed7d58f4e
commit 9cf2fc90e5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
View File

@ -80,14 +80,15 @@ public class RelatorioBilhetesVendidos extends Relatorio {
} }
if (parametros.get("STATUS") != null) { if (parametros.get("STATUS") != null) {
if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) { if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) {
sql.append(" AND ((b.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1) OR (b.INDSTATUSBOLETO = 'V' AND B.INDCANCELACION = 0)) "); sql.append(" AND ((b.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 and b.BOLETOORIGINAL_ID is not null AND B.MOTIVOCANCELACION_ID IS NOT NULL) OR (b.INDSTATUSBOLETO = 'V' AND B.INDCANCELACION = 0 and b.BOLETOORIGINAL_ID is null AND B.MOTIVOCANCELACION_ID IS NULL)) ");
} else if (parametros.get("STATUS").toString().contains("C")) { } else if (parametros.get("STATUS").toString().contains("C")) {
sql.append(" AND b.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 "); sql.append(" AND b.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 and b.BOLETOORIGINAL_ID is not null AND B.MOTIVOCANCELACION_ID IS NOT NULL");
} else if (parametros.get("STATUS").toString().contains("V")) { } else if (parametros.get("STATUS").toString().contains("V")) {
sql.append(" AND b.INDSTATUSBOLETO = 'V' AND B.INDCANCELACION = 0 "); sql.append(" AND b.INDSTATUSBOLETO = 'V' AND B.INDCANCELACION = 0 and b.BOLETOORIGINAL_ID is null AND B.MOTIVOCANCELACION_ID IS NULL");
} }
} }
sql.append(" and B.BOLETOORIGINAL_ID is null "); sql.append(" and B.BOLETOORIGINAL_ID is null ");
sql.append(" and B.ACTIVO = 1 ");
sql.append(" order by u.CVEUSUARIO, "); sql.append(" order by u.CVEUSUARIO, ");
sql.append(" u.NOMBUSUARIO, "); sql.append(" u.NOMBUSUARIO, ");
sql.append(" pv.NUMPUNTOVENTA, "); sql.append(" pv.NUMPUNTOVENTA, ");