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

fixes bug #9950 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75057 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-10-17 18:00:56 +00:00
parent 1898ce362e
commit 6d4d722b8a
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoTransacao.java
View File

@ -90,29 +90,29 @@ public class RelatorioCancelamentoTransacao extends Relatorio {
.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
.append("WHERE OCD.FECINC BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI') ");
Constante constante = constanteService.buscarPorNomeConstante("PUNTO_VENTA_J3");
if(constante != null
&& constante.getActivo()
&& constante.getValorconstante() != null
&& !constante.getValorconstante().isEmpty()){
sql.append("AND (B.PTOVTAVENTA_ID = ")
.append(constante.getValorconstante())
.append(" OR B.PUNTOVENTA_ID = ")
.append(constante.getValorconstante())
.append(" OR OCD.INDPUNTOVENTAESTORNO = 1 ")
.append(") ");
}else{
sql.append("AND (B.PTOVTAVENTA_ID = 99999 ")
.append("OR B.PUNTOVENTA_ID = 99999) ");
if (parametros.get("PUNTOVENTA_ID") != null) {
sql.append(" AND ((B.PUNTOVENTA_ID = :puntoventaId AND (B.PTOVTAVENTA_ID IS NULL OR B.PUNTOVENTA_ID = B.PTOVTAVENTA_ID)) OR B.PTOVTAVENTA_ID = :puntoventaId) ");
} else {
Constante constante = constanteService.buscarPorNomeConstante("PUNTO_VENTA_J3");
if(constante != null
&& constante.getActivo()
&& constante.getValorconstante() != null
&& !constante.getValorconstante().isEmpty()){
sql.append("AND ((B.PTOVTAVENTA_ID = ")
.append(constante.getValorconstante())
.append(" AND (B.PTOVTAVENTA_ID IS NULL OR B.PUNTOVENTA_ID = B.PTOVTAVENTA_ID)) ")
.append(" OR B.PUNTOVENTA_ID = ")
.append(constante.getValorconstante())
.append(") ");
}else{
sql.append("AND OCD.INDPUNTOVENTAESTORNO = 1 ");
}
}
if (parametros.get("EMPRESA_ID") != null) {
sql.append(" AND E.EMPRESA_ID = :empresaId ");
}
if (parametros.get("PUNTOVENTA_ID") != null) {
sql.append(" AND B.PUNTOVENTA_ID = :puntoventaId");
}
return sql.toString();
}

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

Binary file not shown.

4
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCancelamentoTransacao.jrxml
View File

@ -131,7 +131,7 @@
<box>
<bottomPen lineWidth="1.0"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Top">
<textElement verticalAlignment="Top">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression>
@ -171,7 +171,7 @@
<box>
<bottomPen lineWidth="1.0"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<textElement verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoTransacaoController.java
View File

@ -114,7 +114,7 @@ public class RelatorioCancelamentoTransacaoController extends MyGenericForwardCo
parametros.put("PUNTOVENTA_ID", puntoventa.getPuntoventaId());
filtro.append(puntoventa.getNombpuntoventa() + ";");
} else {
filtro.append("Todas;");
filtro.append("J3;");
}
parametros.put("FILTROS", filtro.toString());