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

bug #6592 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@47866 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-09-15 13:31:04 +00:00
parent d3a5933ec2
commit b4d75a7e0e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
View File

@ -397,7 +397,7 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append(" R.INDSENTIDOIDA AS SENTIDO, "); sql.append(" R.INDSENTIDOIDA AS SENTIDO, ");
sql.append(" DA.CANTASIENTOS AS LOT, "); sql.append(" DA.CANTASIENTOS AS LOT, ");
sql.append(" NVL(CS.DESCCLASE, '') AS CLA, "); sql.append(" NVL(CS.DESCCLASE, '') AS CLA, ");
sql.append(" NVL(TF.PRECIOORIGINAL, 0) AS TARIFA, "); sql.append(" MAX(NVL(TF.PRECIOORIGINAL, 0)) AS TARIFA, ");
sql.append(" ORIGEM.CVEPARADA AS ORIGEM, "); sql.append(" ORIGEM.CVEPARADA AS ORIGEM, ");
sql.append(" DESTINO.CVEPARADA AS DESTINO, "); sql.append(" DESTINO.CVEPARADA AS DESTINO, ");
sql.append(" EXTENSAO AS EXTENSAO, "); sql.append(" EXTENSAO AS EXTENSAO, ");
@ -521,9 +521,8 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append("AND C.ACTIVO <> 0 AND ORIGEM.ACTIVO = 1 AND DESTINO.ACTIVO = 1 "); sql.append("AND C.ACTIVO <> 0 AND ORIGEM.ACTIVO = 1 AND DESTINO.ACTIVO = 1 ");
sql.append("AND R.ACTIVO = 1 AND RO.ACTIVO = 1 AND DA.ACTIVO = 1 AND CS.ACTIVO = 1 "); sql.append("AND R.ACTIVO = 1 AND RO.ACTIVO = 1 AND DA.ACTIVO = 1 AND CS.ACTIVO = 1 ");
sql.append("AND VTF.FECMODIF = (SELECT MAX(FECMODIF) FROM VIGENCIA_TARIFA WHERE TF.VIGENCIATARIFA_ID = VIGENCIATARIFA_ID AND C.FECCORRIDA BETWEEN FECINICIOVIGENCIA AND FECFINVIGENCIA) ");
sql.append("GROUP BY R.RUTA_ID, NVL(GR.DESCGRUPO, 'Não Definido'), TO_CHAR(C.FECHORSALIDA, 'HH24:MI'), C.CORRIDA_ID, R.INDSENTIDOIDA, "); sql.append("GROUP BY R.RUTA_ID, NVL(GR.DESCGRUPO, 'Não Definido'), TO_CHAR(C.FECHORSALIDA, 'HH24:MI'), C.CORRIDA_ID, R.INDSENTIDOIDA, ");
sql.append(" TF.PRECIOORIGINAL, DA.CANTASIENTOS, CS.DESCCLASE, EXTENSAO, ORD, EXTRA, ABSOL, "); sql.append(" DA.CANTASIENTOS, CS.DESCCLASE, EXTENSAO, ORD, EXTRA, ABSOL, ");
sql.append(" CO.ESTADO_ID, CD.ESTADO_ID, ORIGEM.CVEPARADA, DESTINO.CVEPARADA, CJ.PRECIOPAGADO, "); sql.append(" CO.ESTADO_ID, CD.ESTADO_ID, ORIGEM.CVEPARADA, DESTINO.CVEPARADA, CJ.PRECIOPAGADO, ");
sql.append(" CJ.IMPORTESEGURO, CJ.IMPORTETAXAEMBARQUE, CJ.IMPORTEPEDAGIO, CJ.EQUIVALENTE, CJ.KM_REAL "); sql.append(" CJ.IMPORTESEGURO, CJ.IMPORTETAXAEMBARQUE, CJ.IMPORTEPEDAGIO, CJ.EQUIVALENTE, CJ.KM_REAL ");
sql.append("ORDER BY NVL(GR.DESCGRUPO, 'Não Definido'), C.CORRIDA_ID ) "); sql.append("ORDER BY NVL(GR.DESCGRUPO, 'Não Definido'), C.CORRIDA_ID ) ");