From d1c0fa1fd7302a28a53bb960dbf6a9356a0de2d2 Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 22 Apr 2016 12:57:38 +0000 Subject: [PATCH] fixes bug #7377 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55184 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDevolucaoBilhetes.java | 61 +++++++++--------- .../RelatorioDevolucaoBilhetes.jasper | Bin 51826 -> 51834 bytes .../RelatorioDevolucaoBilhetes.jrxml | 8 +-- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 7a2384cf1..8f99e7e75 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -121,57 +121,56 @@ public class RelatorioDevolucaoBilhetes extends Relatorio { private String getSql(Integer empresaId, String puntoVentas, String estados) { StringBuilder sql = new StringBuilder(); - sql.append("SELECT COALESCE(AIDF.ACFISCAL,SUBSTR(ML2.NUMSERIE20, -6, 7)) AS AIDF, "); - sql.append(" COALESCE(CAJ.NUMFOLIOSISTEMA, CAJ.NUMOPERACION) AS NUMFOLIOSISTEMA, "); - sql.append(" CASE WHEN ML2.NUMSERIE20 IS NULL THEN CAJ.NUMSERIEPREIMPRESA ELSE NULL END AS SERIE_SUBSERIE, "); - sql.append(" CAJ.NUMFOLIOPREIMPRESO AS FOLIO, "); - sql.append(" CAJ.PRECIOPAGADO AS PRECIOPAGADO, "); - sql.append(" CAJ.PRECIOBASE AS PRECIOBASE, "); + sql.append("SELECT COALESCE(AIDF.ACFISCAL,SUBSTR(R4.NUMSERIE20, -6, 7)) AS AIDF, "); + sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, "); + sql.append(" CASE WHEN R4.NUMSERIE20 IS NULL THEN B.NUMSERIEPREIMPRESA ELSE NULL END AS SERIE_SUBSERIE, "); + sql.append(" B.NUMFOLIOPREIMPRESO AS FOLIO, "); + sql.append(" B.PRECIOPAGADO AS PRECIOPAGADO, "); + sql.append(" B.PRECIOBASE AS PRECIOBASE, "); sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, "); sql.append(" E.EMPRESA_ID AS EMPRESA_ID, "); sql.append(" EST.ESTADO_ID AS ESTADO_ID, "); sql.append(" EST.NOMBESTADO AS ESTADO, "); sql.append(" EST.CVEESTADO AS UF, "); sql.append(" EST.ICMS AS ICMS, "); - sql.append(" TO_CHAR(CAJ.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, "); + sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, "); sql.append(" CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END IS_ESTADUAL, "); sql.append(" EI.PORCREDMUNICIPAL AS PORC_MUNICIPAL, "); sql.append(" EI.PORCREDESTADUAL AS PORC_ESTADUAL "); - sql.append("FROM CAJA CAJ "); - sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = CAJ.MARCA_ID "); - sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = CAJ.PUNTOVENTA_ID "); - sql.append("INNER JOIN PARADA ORIGEM ON (CAJ.ORIGEN_ID = ORIGEM.PARADA_ID ) "); - sql.append("INNER JOIN PARADA DESTINO ON (CAJ.DESTINO_ID = DESTINO.PARADA_ID ) "); + sql.append("FROM BOLETO B "); + sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = B.MARCA_ID "); + sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = B.PUNTOVENTA_ID "); + sql.append("INNER JOIN PARADA ORIGEM ON (B.ORIGEN_ID = ORIGEM.PARADA_ID ) "); + sql.append("INNER JOIN PARADA DESTINO ON (B.DESTINO_ID = DESTINO.PARADA_ID ) "); sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORIGEM.CIUDAD_ID ) "); sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DESTINO.CIUDAD_ID ) "); sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); - sql.append("LEFT JOIN BOLETO B ON (B.NUMASIENTO = CAJ.NUMASIENTO "); - sql.append(" AND B.FECCORRIDA = CAJ.FECCORRIDA "); - sql.append(" AND B.CORRIDA_ID = CAJ.CORRIDA_ID) "); - sql.append("LEFT JOIN FISCAL_ML2 ML2 ON ML2.BOLETO_ID = B.BOLETO_ID "); - sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID AND EI.EMPRESA_ID = CAJ.MARCA_ID "); - sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = CAJ.NUMSERIEPREIMPRESA OR "); - sql.append(" AIDF.SERIE = SUBSTR(CAJ.NUMSERIEPREIMPRESA,1,INSTR(CAJ.NUMSERIEPREIMPRESA,'-',1)-1)) "); - sql.append(" AND (CAJ.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) "); - sql.append("WHERE CAJ.MOTIVOCANCELACION_ID IN (32) "); - sql.append("AND CAJ.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') "); - sql.append("AND CAJ.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') "); + sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID "); + sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID AND EI.EMPRESA_ID = B.MARCA_ID "); + sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = B.NUMSERIEPREIMPRESA OR "); + sql.append(" AIDF.SERIE = SUBSTR(B.NUMSERIEPREIMPRESA,1,INSTR(B.NUMSERIEPREIMPRESA,'-',1)-1)) "); + sql.append(" AND (B.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) "); + sql.append("WHERE B.MOTIVOCANCELACION_ID = 32 "); + sql.append("AND B.INDSTATUSBOLETO = 'C' "); + sql.append("AND B.INDCANCELACION = 1 "); + sql.append("AND B.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') "); + sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') "); sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") "); sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") "); - sql.append(empresaId == null ? "" : "AND CAJ.MARCA_ID IN (" + empresaId + ") "); - sql.append("GROUP BY COALESCE(AIDF.ACFISCAL,SUBSTR(ML2.NUMSERIE20, -6, 7)), "); - sql.append(" COALESCE(CAJ.NUMFOLIOSISTEMA, CAJ.NUMOPERACION), "); - sql.append(" CASE WHEN ML2.NUMSERIE20 IS NULL THEN CAJ.NUMSERIEPREIMPRESA ELSE NULL END, "); - sql.append(" CAJ.NUMFOLIOPREIMPRESO, "); - sql.append(" CAJ.PRECIOPAGADO, "); - sql.append(" CAJ.PRECIOBASE, "); + sql.append(empresaId == null ? "" : "AND B.MARCA_ID IN (" + empresaId + ") "); + sql.append("GROUP BY COALESCE(AIDF.ACFISCAL,SUBSTR(R4.NUMSERIE20, -6, 7)), "); + sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION), "); + sql.append(" CASE WHEN R4.NUMSERIE20 IS NULL THEN B.NUMSERIEPREIMPRESA ELSE NULL END, "); + sql.append(" B.NUMFOLIOPREIMPRESO, "); + sql.append(" B.PRECIOPAGADO, "); + sql.append(" B.PRECIOBASE, "); sql.append(" E.NOMBEMPRESA, "); sql.append(" E.EMPRESA_ID, "); sql.append(" EST.ESTADO_ID, "); sql.append(" EST.NOMBESTADO, "); sql.append(" EST.CVEESTADO, "); sql.append(" EST.ICMS, "); - sql.append(" TO_CHAR(CAJ.FECHORVENTA, 'DD/MM/YYYY'), "); + sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY'), "); sql.append(" (CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END), "); sql.append(" EI.PORCREDMUNICIPAL, "); sql.append(" EI.PORCREDESTADUAL "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper index bcdeb8187357dd4be4211d0fc73afbb9e6e36c0e..b17db772c5c92e1f735f55b07ab6988fb54baf20 100644 GIT binary patch delta 2198 zcmZ{kT}YEr7{||PZe|yGF%>5-_|Xa@4L8$mnck!oMJ}4WB@9HP53Gxc15@%V5vMah zI^tCqMR!3{+Er%JjfHkEU3DWybkzre6iDYh&)Ikn@0k}55B?s`|976V?bnjy?~-G+ zwYP-U^^pug(lN845Q_Ccc= z=Ksrsaz55C_zglf&c*m&7K9OW=K{CvfIUmPU3fHmKVYOshFhrFBTj@8)kGoHL|K6n zg#e;t%cE$NjSe@n$~Rn<=ARm0+u8IuISA|T>S)EIvM;dBmCD)NOcUK0Ze&I-iZ1TRco!PMY zPe?=A(?}!LNLzs-jR2(O49`=g_bk%8k0LqbF3*L{0xsu-;Zz$zyJ`^nrM zJX-8Rk#oAFT>bnI-)3t55-oyFe(5wy^7LzLU5J>5FoojLm?G7fT7hDU08HhK&D3LA zIo9}LF=Cz&a!{%@a!56DR-nis0695hldI0iJ)X!Rc7a9A(?SeNKqH1!BW4AP z7y=NJGd8h6Ml52a+m~L^(ng=ZA>7_mu5f z$Dpeu*cjIC*v>{YoA;nDVo1a$?L_%q$W7K?D9`vK1zfy1$^z)_1h83j&8jx#7) zam)GV_9~*4MFuWhztn&DC;OGVLFoCF6q>{d7xPAgm% zusU1eqZ4T7is^OFfB1iuQoB@Xog3pSFXoQ3?f9>2rKt?Qg*KPi^Ec ze$*=bs6apSPLZE1EPj=yXLmArxp2GQC3}tiLI+2!LWf#~4i%_l-YL?Ng+-^)(pwsREkS>?Kj`cCd-Y~rcWR7j e^$;#~XWAbB^zXE8L^L0Goo?9mXcOFcTmBD=){Alg diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml index 2688eb939..7c9ee7c4f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml @@ -1,8 +1,8 @@ - - + +