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

fixes bug#24265 

dev: Fabio
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111666 d1611594-4594-4d17-8e1d-87c2c4800839
master
celio 2022-04-04 19:16:18 +00:00
parent d6ad31be2e
commit 44a178dd45
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,7 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append(" SUM( (case when sx.status >0 then 1 else 0.0 end )) QTD_SEGUROOPCIONALVENDIDOS, ");
sql.append(" SUM( (case when sx.status >0 then sx.valor else 0.0 end )) TOTAL_SEG_VENDIDO ");
sql.append("FROM CAJA CJ ");
sql.append("FROM BOLETO CJ ");
sql.append("INNER JOIN PUNTO_VENTA PV ON CJ.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ");
sql.append("INNER JOIN EMPRESA EM ON CJ.EMPRESACORRIDA_ID = EM.EMPRESA_ID ");
sql.append("INNER JOIN PARADA PO ON CJ.ORIGEN_ID = PO.PARADA_ID ");
@ -290,9 +290,10 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append("INNER JOIN CIUDAD CD ON PD.CIUDAD_ID = CD.CIUDAD_ID ");
sql.append("LEFT JOIN CORRIDA CR ON (CJ.CORRIDA_ID = CR.CORRIDA_ID AND CJ.FECCORRIDA = CR.FECCORRIDA) ");
sql.append("LEFT JOIN RUTA RT ON RT.RUTA_ID = CJ.RUTA_ID ");
sql.append("LEFT JOIN SEGPOLV SX ON SX.BOLETO_ID =CJ.TRANSACAO_ID ");
sql.append("LEFT JOIN SEGPOLV SX ON SX.BOLETO_ID = CJ.BOLETO_ID ");
sql.append("LEFT JOIN TAXPOLV TX ON TX.BOLETO_ID = CJ.BOLETO_ID ");
sql.append("WHERE (CJ.IMPORTETAXAEMBARQUE>0 OR CJ.IMPORTEPEDAGIO>0 OR CJ.IMPORTESEGURO>0 OR SX.VALOR>0) ");
sql.append("WHERE (CJ.IMPORTETAXAEMBARQUE>0 OR CJ.IMPORTEPEDAGIO>0 OR CJ.IMPORTESEGURO>0 OR SX.VALOR>0 OR TX.VALORTAXA > 0) ");
sql.append("AND CJ.INDSTATUSOPERACION = 'F' ");
sql.append("AND CJ.INDREIMPRESION = 0 ");
sql.append("AND DECODE(:TIPO_DATA, 1, CJ.FECHORVENTA, 2, CJ.FECCORRIDA) BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
@ -316,7 +317,8 @@ public class RelatorioTaxasLinha extends Relatorio {
sql.append(" EM.EMPRESA_ID, ");
sql.append(" CJ.PUNTOVENTA_ID, ");
sql.append(" PV.NOMBPUNTOVENTA, ");
sql.append(" EST.ICMS ");
sql.append(" EST.ICMS, ");
sql.append(" CJ.BOLETO_ID ");
sql.append(" ORDER BY EM.NOMBEMPRESA,PV.NOMBPUNTOVENTA ,PO.DESCPARADA, PD.DESCPARADA ");
return sql.toString();