0013650: Chamado 66819 - Relatório de Requisição (Ordem de Serviço)

fixes bug#13650
dev:Julio
qua:Juliane

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@90888 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabricio.oliveira 2019-03-18 19:24:48 +00:00
parent 49fff70eec
commit 7c17910af3
1 changed files with 2 additions and 2 deletions

View File

@ -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();