From c7238d681d5e7a185d7e48ee12b8fb9b771a05cf Mon Sep 17 00:00:00 2001 From: valdir Date: Thu, 7 Nov 2019 11:51:45 +0000 Subject: [PATCH] =?UTF-8?q?0016715:=20Comporte=20-=20GLPI=2016307=20-=20Ve?= =?UTF-8?q?nda=20com=20ordem=20de=20servi=C3=A7o=20duplicando=20no=20relat?= =?UTF-8?q?=C3=B3rio=20requisi=C3=A7=C3=A3o.=20bug#16715=20dev:=20qua:juni?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@98654 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioVendasRequisicao.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java index 50a097553..191a91565 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java @@ -153,7 +153,9 @@ public class RelatorioVendasRequisicao extends Relatorio { protected String getSql() { StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT CDP.NUMDOCUMENTO AS REQUISICAO, SEC.CVESECRETARIA AS SECRETARIA_ID, SEC.DESCSECRETARIA, ORI.CVEPARADA AS ORIGEM_ID, ORI.DESCPARADA AS ORIGEM, DES.CVEPARADA AS DESTINO_ID, DES.DESCPARADA AS DESTINO, PV.PUNTOVENTA_ID AS PUNTOVENTA_ID, PV.NOMBPUNTOVENTA, E.NOMBEMPRESA, E.EMPRESA_ID, FP.DESCPAGO AS DESCPAGO, CFP.FORMAPAGO_ID, COUNT(*) AS QTDE, SUM(CFP.IMPORTE) AS IMPORTE ") + sQuery.append("SELECT CDP.NUMDOCUMENTO AS REQUISICAO, SEC.CVESECRETARIA AS SECRETARIA_ID, SEC.DESCSECRETARIA, ORI.CVEPARADA AS ORIGEM_ID, ORI.DESCPARADA AS ORIGEM, DES.CVEPARADA AS DESTINO_ID, DES.DESCPARADA AS DESTINO, PV.PUNTOVENTA_ID AS PUNTOVENTA_ID, PV.NOMBPUNTOVENTA, E.NOMBEMPRESA, E.EMPRESA_ID, FP.DESCPAGO AS DESCPAGO, CFP.FORMAPAGO_ID, ") + .append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN COUNT(*) ELSE COUNT(*) * -1 end AS qtde, ") + .append(" SUM( CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN cfp.importe ELSE cfp.importe * -1 end) AS importe ") .append("FROM CAJA C ") .append("JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ") .append("JOIN PARADA DES ON DES.PARADA_ID = C.DESTINO_ID ") @@ -184,12 +186,12 @@ public class RelatorioVendasRequisicao extends Relatorio { sQuery.append("AND SEC.SECRETARIA_ID = :SECRETARIA_ID "); } - sQuery.append("GROUP BY CDP.NUMDOCUMENTO, SEC.CVESECRETARIA, SEC.DESCSECRETARIA,PV.NOMBPUNTOVENTA, PV.NOMBPUNTOVENTA, E.NOMBEMPRESA, E.EMPRESA_ID, FP.DESCPAGO, CFP.FORMAPAGO_ID, ORI.DESCPARADA, DES.DESCPARADA, CFP.IMPORTE, ORI.CVEPARADA, DES.CVEPARADA, PV.PUNTOVENTA_ID "); + sQuery.append("GROUP BY CDP.NUMDOCUMENTO, SEC.CVESECRETARIA, SEC.DESCSECRETARIA,PV.NOMBPUNTOVENTA, PV.NOMBPUNTOVENTA, E.NOMBEMPRESA, E.EMPRESA_ID, FP.DESCPAGO, CFP.FORMAPAGO_ID, ORI.DESCPARADA, DES.DESCPARADA, CFP.IMPORTE, ORI.CVEPARADA, DES.CVEPARADA, PV.PUNTOVENTA_ID, C.MOTIVOCANCELACION_ID "); if (agruparCliente) { sQuery.append("ORDER BY SEC.DESCSECRETARIA, PV.NOMBPUNTOVENTA, FP.DESCPAGO"); } else { - sQuery.append("ORDER BY PV.NOMBPUNTOVENTA, SEC.DESCSECRETARIA, FP.DESCPAGO"); + sQuery.append("ORDER BY PV.NOMBPUNTOVENTA, SEC.DESCSECRETARIA, ori.cveparada, des.cveparada "); } return sQuery.toString();