From 4bdb99b391f16874a96919a66d0a8c6db1ff036a Mon Sep 17 00:00:00 2001 From: celio Date: Wed, 14 Apr 2021 18:18:39 +0000 Subject: [PATCH] fixes bug#12355 qua: dev: Valdevir git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106228 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioResumoVendaOrgaoConcedente.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java index 1e249745c..738c0b776 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java @@ -52,25 +52,28 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { sb.append("SELECT "); sb.append(" BOLETO.PONTOVENTA,"); - sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(3) THEN BOLETO.IMPORTE END), 0) AS ANTT,"); - sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27) THEN BOLETO.IMPORTE END), 0) AS AGERBA, "); - sb.append(" COALESCE(SUM(CASE WHEN BOLETO.FORMAPAGO IN(2,10) THEN BOLETO.IMPORTE END), 0) AS CARTAO,"); - sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27, 3) THEN BOLETO.IMPORTE END), 0) AS VALORBASECALCULO, "); - sb.append(" COALESCE(SUM(CASE WHEN BOLETO.INDTRIBTARIFA IN(1) THEN BOLETO.IMPORTE END), 0) AS ISENTO, "); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(3) THEN BOLETO.PRECIOBOLETO END),0) - SUM(BOLETO.CANCELANTT) AS ANTT,"); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27) THEN BOLETO.PRECIOBOLETO END ),0) - SUM(BOLETO.CANCELAGERBA) AS AGERBA, "); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.FORMAPAGO IN(2,3) THEN(BOLETO.IMPORTECCREDITO) END ),0) AS CARTAO,"); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27,3) THEN BOLETO.PRECIOBOLETO END),0) AS VALORBASECALCULO, "); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.INDTRIBTARIFA IN(1) THEN BOLETO.PRECIOBOLETO END),0) AS ISENTO, "); sb.append(" BOLETO.NOMEESTADO AS NOMEESTADO "); sb.append("FROM "); sb.append(" (SELECT PV.NOMBPUNTOVENTA AS PONTOVENTA,"); sb.append(" OC.DESCORGAO AS ORGAO,"); sb.append(" OC.ORGAOCONCEDENTE_ID AS ORGAOCONCEDENTEID,"); - sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN CFP.IMPORTE ELSE 0 END AS IMPORTE, "); + sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL AND FP.FORMAPAGO_ID IN (2,3) THEN CFP.IMPORTE ELSE 0 END AS IMPORTECCREDITO, "); + sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN C.PRECIOPAGADO ELSE 0 END AS PRECIOBOLETO, "); + sb.append(" CASE WHEN C.INDCANCELACION = 1 AND c.MOTIVOCANCELACION_ID NOT IN (32,34, 35, 36,37, 99) AND OC.ORGAOCONCEDENTE_ID = 3 THEN (C.PRECIOPAGADO) ELSE 0 END AS CANCELANTT, "); + sb.append(" CASE WHEN C.INDCANCELACION = 1 AND c.MOTIVOCANCELACION_ID NOT IN (32,34, 35, 36,37, 99) AND OC.ORGAOCONCEDENTE_ID = 27 THEN (C.PRECIOPAGADO) ELSE 0 END AS CANCELAGERBA, "); sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,"); - sb.append(" EI.porcredbaseicms,"); + sb.append(" EI.PORCREDBASEICMS,"); sb.append(" EST_PUNTOVENTA.NOMBESTADO AS NOMEESTADO, "); sb.append(" CS.DESCCLASE AS NOMECLASSE, "); sb.append(" R.INDTRIBTARIFA AS INDTRIBTARIFA "); sb.append(" "); - sb.append(" FROM BOLETO C"); - sb.append(" INNER JOIN BOLETO_FORMAPAGO CFP ON (C.BOLETO_ID = CFP.BOLETO_ID AND CFP.ACTIVO = 1)"); + sb.append(" FROM CAJA C"); + sb.append(" INNER JOIN BOLETO_FORMAPAGO CFP ON (C.TRANSACAO_ID = CFP.BOLETO_ID AND CFP.ACTIVO = 1)"); sb.append(" INNER JOIN FORMA_PAGO FP ON (FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID)"); sb.append(" INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID and pv.activo = 1"); sb.append(" INNER JOIN RUTA R ON (C.RUTA_ID = R.RUTA_ID)");