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

fixes bug#15350 

dev:
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96896 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2019-08-22 19:56:45 +00:00
parent 4a34a60c78
commit d32bc339c9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
View File

@ -82,6 +82,7 @@ public class RelatorioBPe extends Relatorio {
sql.append(" COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, "); sql.append(" COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, ");
sql.append(" CASE bpe.CODSTAT "); sql.append(" CASE bpe.CODSTAT ");
sql.append(" WHEN '100' THEN (CASE WHEN bpe.TIPOSUBSTITUICAO IS NULL THEN 'Autorizado' ELSE 'Substituído' END ) "); sql.append(" WHEN '100' THEN (CASE WHEN bpe.TIPOSUBSTITUICAO IS NULL THEN 'Autorizado' ELSE 'Substituído' END ) ");
sql.append(" WHEN '102' THEN (CASE WHEN bpe.TIPOSUBSTITUICAO IS NOT NULL THEN 'Substituído' END) ");
sql.append(" WHEN '135' THEN (CASE bpe.TIPOEVENTO WHEN '110111' THEN 'Cancelado' WHEN '110115' THEN 'Não embarcado' ELSE NULL END) "); sql.append(" WHEN '135' THEN (CASE bpe.TIPOEVENTO WHEN '110111' THEN 'Cancelado' WHEN '110115' THEN 'Não embarcado' ELSE NULL END) ");
sql.append(" WHEN '150' THEN 'Aut.Conting.' "); sql.append(" WHEN '150' THEN 'Aut.Conting.' ");
sql.append(" ELSE 'Rejeitado' END as status, "); sql.append(" ELSE 'Rejeitado' END as status, ");
@ -110,7 +111,7 @@ public class RelatorioBPe extends Relatorio {
} else if (status != null && status.equals("C")) { } else if (status != null && status.equals("C")) {
sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' "); sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' ");
} else if (status != null && status.equals("S")) { } else if (status != null && status.equals("S")) {
sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NOT NULL "); sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpe.TIPOSUBSTITUICAO IS NOT NULL ");
} else if (status != null && status.equals("NE")) { } else if (status != null && status.equals("NE")) {
sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' "); sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' ");
} else if (status != null && status.equals("R")) { } else if (status != null && status.equals("R")) {