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

fixes bug#17871 

dev:
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@99996 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2020-01-31 18:57:41 +00:00
parent 428e96b2f2
commit 59ebbf9079
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
View File

@ -247,9 +247,9 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append(" EM.EMPRESA_ID, "); sql.append(" EM.EMPRESA_ID, ");
sql.append(" CJ.PUNTOVENTA_ID, "); sql.append(" CJ.PUNTOVENTA_ID, ");
sql.append(" PV.NOMBPUNTOVENTA, "); sql.append(" PV.NOMBPUNTOVENTA, ");
sql.append(" SUM(CASE WHEN (CJ.IMPORTETAXAEMBARQUE>0 and cj.motivocancelacion_id is null ) THEN 1 WHEN (CJ.IMPORTETAXAEMBARQUE>0 and cj.motivocancelacion_id is not null ) then 0 ELSE 0 END) EMBARQUE_VENDIDOS, "); sql.append(" SUM(CASE WHEN (CJ.IMPORTETAXAEMBARQUE>0 and cj.motivocancelacion_id is null ) THEN 1 WHEN (CJ.IMPORTETAXAEMBARQUE>0 and cj.motivocancelacion_id is not null ) then -1 ELSE 0 END) EMBARQUE_VENDIDOS, ");
sql.append(" SUM(CASE WHEN (CJ.IMPORTEPEDAGIO>0 and cj.motivocancelacion_id is null) THEN 1 WHEN (CJ.IMPORTEPEDAGIO>0 and cj.motivocancelacion_id is not null) THEN 0 ELSE 0 END) PEDAGIO_VENDIDOS, "); sql.append(" SUM(CASE WHEN (CJ.IMPORTEPEDAGIO>0 and cj.motivocancelacion_id is null) THEN 1 WHEN (CJ.IMPORTEPEDAGIO>0 and cj.motivocancelacion_id is not null) THEN -1 ELSE 0 END) PEDAGIO_VENDIDOS, ");
sql.append(" SUM(CASE WHEN (CJ.IMPORTESEGURO>0 and cj.motivocancelacion_id is null) THEN 1 WHEN (CJ.IMPORTESEGURO>0 and cj.motivocancelacion_id is not null) THEN 0 ELSE 0 END) SEGURO_VENDIDOS, "); sql.append(" SUM(CASE WHEN (CJ.IMPORTESEGURO>0 and cj.motivocancelacion_id is null) THEN 1 WHEN (CJ.IMPORTESEGURO>0 and cj.motivocancelacion_id is not null) THEN -1 ELSE 0 END) SEGURO_VENDIDOS, ");
sql.append(" CO.ESTADO_ID ORIGEM_ESTADO_ID, "); sql.append(" CO.ESTADO_ID ORIGEM_ESTADO_ID, ");
sql.append(" CD.ESTADO_ID DESTINO_ESTADO_ID, "); sql.append(" CD.ESTADO_ID DESTINO_ESTADO_ID, ");
sql.append(" CASE "); sql.append(" CASE ");
@ -258,9 +258,9 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append(" ELSE "); sql.append(" ELSE ");
sql.append(" 'N' "); sql.append(" 'N' ");
sql.append(" END INTERESTADUAL, "); sql.append(" END INTERESTADUAL, ");
sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else 0 end) * CJ.IMPORTETAXAEMBARQUE) TOTAL_EMBARQUE, "); sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTETAXAEMBARQUE) TOTAL_EMBARQUE, ");
sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else 0 end) * CJ.IMPORTEPEDAGIO) TOTAL_PEDAGIO, "); sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTEPEDAGIO) TOTAL_PEDAGIO, ");
sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else 0 end) * CJ.IMPORTESEGURO) TOTAL_SEGURO, "); sql.append(" SUM( (case when cj.motivocancelacion_id is null then 1 else -1 end) * CJ.IMPORTESEGURO) TOTAL_SEGURO, ");
sql.append(" EST.ICMS AS ICMS "); sql.append(" EST.ICMS AS ICMS ");
sql.append("FROM CAJA CJ "); sql.append("FROM CAJA CJ ");