fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#8885 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68293 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.calixto 2017-04-26 19:44:22 +00:00
parent ffbb902715
commit 6a15a9ff20
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
View File

@ -239,7 +239,7 @@ public class RelatorioVendasComissao extends Relatorio {
+ "WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0) " + "WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0) "
+ "OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) " + "OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) "
+ "OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) " + "OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) "
+ "AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID <> 99) " + "AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID NOT IN (32, 99)) "
+ "AND C.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) "; + "AND C.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) ";
if (StringUtils.isNotBlank(stringLsPuntoVentaId)) { if (StringUtils.isNotBlank(stringLsPuntoVentaId)) {
@ -251,7 +251,25 @@ public class RelatorioVendasComissao extends Relatorio {
} }
query += "GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION " query += "GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, C.PTOVTAVENTA_ID, PV1.NUMPUNTOVENTA, PV1.NOMBPUNTOVENTA, C.INDSTATUSBOLETO, C.MOTIVOCANCELACION_ID, C.INDREIMPRESION "
+ "ORDER BY PV.NUMPUNTOVENTA, PV1.NUMPUNTOVENTA, C.INDSTATUSBOLETO"; + "UNION "
+ "SELECT PV3.PUNTOVENTA_ID, PV3.NUMPUNTOVENTA, PV3.NOMBPUNTOVENTA, B.PTOVTAVENTA_ID, PV3.NUMPUNTOVENTA as NUMPTOVTAVENTA, PV3.NOMBPUNTOVENTA AS NOMBPTOVTAVENTA, B.INDSTATUSBOLETO, B.MOTIVOCANCELACION_ID, B.INDREIMPRESION, "
+ "COALESCE (B.PRECIOPAGADO,0) + COALESCE (B.IMPORTETAXAEMBARQUE,0) + COALESCE (B.IMPORTESEGURO,0) + COALESCE (B.IMPORTEPEDAGIO,0) + COALESCE (B.IMPORTEOUTROS,0) AS TOTAL, "
+ "COALESCE (B.IMPORTETAXAEMBARQUE,0) + COALESCE (B.IMPORTESEGURO,0) + COALESCE (B.IMPORTEPEDAGIO,0) + COALESCE (B.IMPORTEOUTROS,0) AS TOTAL_TAXAS "
+ "FROM BOLETO B "
+ "JOIN PUNTO_VENTA PV3 ON PV3.PUNTOVENTA_ID = B.PUNTOVENTA_ID "
+ "JOIN MARCA M2 ON M2.MARCA_ID = B.MARCA_ID "
+ "WHERE (B.MOTIVOCANCELACION_ID IN(32, 99)) "
+ "AND B.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) ";
if (StringUtils.isNotBlank(stringLsPuntoVentaId)) {
query += "AND B.PUNTOVENTA_ID IN(" + stringLsPuntoVentaId + ") ";
}
if(parametros.get("EMPRESA_ID")!= null){
query += "AND M2.EMPRESA_ID = :EMPRESA_ID ";
}
query += "ORDER BY NUMPUNTOVENTA, NUMPTOVTAVENTA, INDSTATUSBOLETO ";
return query; return query;