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

fixes bug #9451 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76309 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2017-11-10 19:16:45 +00:00
parent d85f04fa88
commit fe848bfed7
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPTA.java
View File

@ -221,10 +221,10 @@ public class RelatorioVendasPTA extends Relatorio {
sql.append("INNER JOIN PARADA po ON (ORIGINAL.ORIGEN_ID = po.PARADA_ID) ");
sql.append("INNER JOIN PARADA pd ON (ORIGINAL.DESTINO_ID = pd.PARADA_ID) ");
sql.append("WHERE to_date(original.FECHORVENTA,'dd/MM/yy') BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append(" AND ORIGINAL.INDSTATUSBOLETO IN('C') ");
sql.append(" AND ORIGINAL.INDSTATUSBOLETO IN('C') AND ORIGINAL.MOTIVOCANCELACION_ID in ("+motivoCancelacion+") ");
sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49,81) ");
sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (ORIGINAL.PUNTOVENTA_ID in (" + agencia + ") ");
sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " OR utilizado.PUNTOVENTA_ID in (" + agencia + ")) ");
sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (utilizado.PUNTOVENTA_ID in (" + agencia + ")) AND ORIGINAL.MOTIVOCANCELACION_ID IN ( "+motivoCancelacion+") ");
sql.append("AND ORIGINAL.EMPRESACORRIDA_ID =" + empresa.getEmpresaId() + " ");
} else { // somente cancelados
@ -256,8 +256,7 @@ public class RelatorioVendasPTA extends Relatorio {
sql.append("WHERE to_date(original.FECHORVENTA,'dd/MM/yy') BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
sql.append(" AND ORIGINAL.INDSTATUSBOLETO IN('C') ");
sql.append(" AND ORIGINAL.TIPOVENTA_ID IN (5,12,18,41,49,81) ");
sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (ORIGINAL.PUNTOVENTA_ID in (" + agencia + ") ");
sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " OR utilizado.PUNTOVENTA_ID in (" + agencia + ")) AND ORIGINAL.MOTIVOCANCELACION_ID = "+motivoCancelacion+" ");
sql.append(agencia.equals("-1") || agencia.equals("TODAS") ? "" : " AND (utilizado.PUNTOVENTA_ID in (" + agencia + ")) AND ORIGINAL.MOTIVOCANCELACION_ID IN ("+motivoCancelacion+") ");
}
return sql.toString();

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jasper
View File

Binary file not shown.

8
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPTA.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Relatorio Vendas PTA" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="6d46a2d2-555e-4b7f-944f-b25c672e5feb">
<property name="ireport.zoom" value="2.9230756500000177"/>
<property name="ireport.x" value="165"/>
<property name="ireport.y" value="158"/>
<property name="ireport.zoom" value="0.8467108950806709"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="DATA_INICIAL" class="java.util.Date"/>
<parameter name="DATA_FINAL" class="java.util.Date"/>
<parameter name="codconvenio" class="java.lang.String"/>
@ -194,7 +194,7 @@
<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER} + " " + $R{cabecalho.de}+" "+$V{PAGE_NUMBER}]]></textFieldExpression>
<textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="594" y="4" width="99" height="15" uuid="d095c344-00e0-4532-8035-8b93ef192a56"/>