From 7c17910af3d60bfc976d18b07ddfa703cad784f4 Mon Sep 17 00:00:00 2001 From: "fabricio.oliveira" Date: Mon, 18 Mar 2019 19:24:48 +0000 Subject: [PATCH] =?UTF-8?q?0013650:=20Chamado=2066819=20-=20Relat=C3=B3rio?= =?UTF-8?q?=20de=20Requisi=C3=A7=C3=A3o=20(Ordem=20de=20Servi=C3=A7o)=20fi?= =?UTF-8?q?xes=20bug#13650=20dev:Julio=20qua:Juliane?= 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@90888 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioVendasRequisicao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java index c7a4f6013..082934126 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java @@ -139,7 +139,7 @@ public class RelatorioVendasRequisicao extends Relatorio { protected String getSql() { StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT CDP.NUMDOCUMENTO AS REQUISICAO, SEC.SECRETARIA_ID 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, COUNT(*) AS QTDE, SUM(CFP.IMPORTE) 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 ") @@ -165,7 +165,7 @@ public class RelatorioVendasRequisicao extends Relatorio { sQuery.append("AND C.PUNTOVENTA_ID = :PUNTOVENTA_ID "); } - sQuery.append("GROUP BY CDP.NUMDOCUMENTO, SEC.SECRETARIA_ID, 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 ") .append("ORDER BY SEC.DESCSECRETARIA, PV.NOMBPUNTOVENTA, FP.DESCPAGO"); return sQuery.toString();