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

Merge pull request 'fixes bug#AL-3292' (!330) from AL-3292 into master 

Reviewed-on: adm/VentaBoletosAdm#330
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.34.11
Gleison da Cruz 2023-11-27 12:17:32 +00:00
parent d68fcc2fdf 23f7303183
commit 09b794597a
7 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.34.10</version>
<version>1.34.11</version>
<packaging>war</packaging>
<properties>

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
View File

@ -118,6 +118,7 @@ public class RelatorioDepositos extends Relatorio {
pendente = pendente.subtract(deposito.getVrdeposito());
deposito.setVrpendente(pendente);
deposito.setDataDepositoFechamento(rs.getDate("fecha_deposito"));
lsDadosRelatorio.add(deposito);
}
@ -162,7 +163,8 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" tmp.vlrBoletoDeposito, ");
sql.append(" tmp.puntoventaId, ");
sql.append(" tmp.empresaId ");
sql.append(" tmp.empresaId, ");
sql.append(" tmp.fecha_deposito ");
sql.append(" FROM ");
sql.append(" ( SELECT DISTINCT e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
@ -177,7 +179,7 @@ public class RelatorioDepositos extends Relatorio {
if (! filtrarPendentes){
sql.append(" fdp.NUMDEPOSITO as numdeposito, ");
}
sql.append(" fdp.fecha_deposito, ");
sql.append(" f.FECHAMENTOCNTCORRENTE_ID as fechamentocntcorrenteId ");
sql.append(" FROM fechamento_cntcorrente f ");
sql.append(" INNER JOIN punto_venta p ");
@ -212,7 +214,7 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" e.empresa_id, ");
sql.append(" f.fecfechamento, ");
sql.append(" f.FECHAMENTOCNTCORRENTE_ID, ");
sql.append(" fdp.fecha_deposito, ");
if (!filtrarPendentes){
sql.append(" fdp.NUMDEPOSITO, ");
}

3
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_es .properties
View File

@ -18,4 +18,5 @@ header.vrdeposito=Vr. Dep
header.vrfechamento=Vr. Fechamento
header.usuario=Usuário
header.numdeposito=Num. Depósito
header.numeroAgencia=Número
header.numeroAgencia=Número
header.dtDeposito=Data Depósito

1
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties
View File

@ -19,3 +19,4 @@ header.vrfechamento=Fechamento
header.usuario=Usuário
header.numdeposito=Num. Depósito
header.numeroAgencia=Número
header.dtDeposito=Data Depósito

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

Binary file not shown.

53
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.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="RelatorioDepositos" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="65274c35-4f3f-4196-bd84-f042e9ac12ea">
<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="RelatorioDepositos" pageWidth="662" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="622" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="65274c35-4f3f-4196-bd84-f042e9ac12ea">
<property name="ireport.zoom" value="1.3310000000000006"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="6"/>
<property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@ -29,6 +29,7 @@
<field name="nomeInstFinanceira" class="java.lang.String"/>
<field name="codigoInstFinanceira" class="java.lang.String"/>
<field name="vrpendente" class="java.math.BigDecimal"/>
<field name="dataDepositoFechamento" class="java.util.Date"/>
<variable name="TOTAL_DEPOSITOS" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable>
@ -66,7 +67,7 @@
<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement uuid="863371bf-b179-4c59-8df4-90975b3dc14e" x="65" y="0" width="213" height="20"/>
<reportElement uuid="863371bf-b179-4c59-8df4-90975b3dc14e" x="65" y="0" width="455" height="20"/>
<textElement textAlignment="Left">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -179,10 +180,24 @@
<textFieldExpression><![CDATA[$R{header.numeroAgencia}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="92047ae9-a84e-40cc-89d4-9a1df33b267e" x="0" y="0" width="555" height="20"/>
<reportElement uuid="92047ae9-a84e-40cc-89d4-9a1df33b267e" x="0" y="0" width="622" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{nomeInstFinanceira} != null ? $F{nomeInstFinanceira} : "Não Consta Nenhum Depósito"]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="8c3ca77d-8401-4c08-a3b7-dbcdba671284" stretchType="RelativeToTallestObject" mode="Opaque" x="555" y="20" width="67" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.dtDeposito}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
<groupFooter>
@ -241,7 +256,7 @@
<textFieldExpression><![CDATA[$R{header.data}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="d4cd880a-3ec0-44e6-bc35-95bc997e1d7b" x="397" y="0" width="56" height="20"/>
<reportElement uuid="d4cd880a-3ec0-44e6-bc35-95bc997e1d7b" x="464" y="0" width="56" height="20"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -249,7 +264,7 @@
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
<reportElement uuid="aac9665b-dfc2-4c3d-b5e2-8186b328f888" x="529" y="20" width="26" height="20"/>
<reportElement uuid="aac9665b-dfc2-4c3d-b5e2-8186b328f888" x="596" y="20" width="26" height="20"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -257,7 +272,7 @@
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="649ab97a-99cf-4189-9d4d-d18b4b24f3ed" x="453" y="20" width="52" height="20"/>
<reportElement uuid="649ab97a-99cf-4189-9d4d-d18b4b24f3ed" x="520" y="20" width="52" height="20"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -265,7 +280,7 @@
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="7ec249cf-a04d-46e0-969e-6602f0aa0dcb" x="65" y="20" width="388" height="20"/>
<reportElement uuid="7ec249cf-a04d-46e0-969e-6602f0aa0dcb" x="65" y="20" width="455" height="20"/>
<textElement>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -273,7 +288,7 @@
<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="7fcb08d6-b3f7-48c2-bb2c-76d34ef4a072" x="0" y="0" width="397" height="20"/>
<reportElement uuid="7fcb08d6-b3f7-48c2-bb2c-76d34ef4a072" x="0" y="0" width="464" height="20"/>
<textElement>
<font size="14" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -281,7 +296,7 @@
<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement uuid="d70f1f3d-9075-406d-aa62-16f09a0cb84f" x="453" y="0" width="102" height="20"/>
<reportElement uuid="d70f1f3d-9075-406d-aa62-16f09a0cb84f" x="520" y="0" width="102" height="20"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -289,7 +304,7 @@
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="fd3d30ce-562a-4dcd-a842-9e9aca3ae3c6" x="505" y="20" width="24" height="20"/>
<reportElement uuid="fd3d30ce-562a-4dcd-a842-9e9aca3ae3c6" x="572" y="20" width="24" height="20"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -398,6 +413,20 @@
</textElement>
<textFieldExpression><![CDATA[$F{numpuntoventa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement uuid="b3429372-6df2-4f62-b1a2-d533c78ef293" stretchType="RelativeToTallestObject" x="555" y="0" width="67" height="17"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{dataDepositoFechamento}]]></textFieldExpression>
</textField>
</band>
</detail>
<summary>
@ -449,7 +478,7 @@
<noData>
<band height="20">
<textField>
<reportElement uuid="670b2fb1-0952-49f5-8458-aa0e25fd839b" x="0" y="0" width="555" height="20"/>
<reportElement uuid="670b2fb1-0952-49f5-8458-aa0e25fd839b" x="0" y="0" width="622" height="20"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>

9
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java
View File

@ -19,6 +19,7 @@ public class RelatorioDepositoBean implements Comparable {
private Long fechamentocntcorrenteId;
private Integer puntoventaId;
private Integer empresaId;
private Date dataDepositoFechamento;
public String getCodigoInstFinanceira() {
return codigoInstFinanceira;
@ -138,5 +139,13 @@ public class RelatorioDepositoBean implements Comparable {
public void setEmpresaId(Integer empresaId) {
this.empresaId = empresaId;
}
public Date getDataDepositoFechamento() {
return dataDepositoFechamento;
}
public void setDataDepositoFechamento(Date dataDepositoFechamento) {
this.dataDepositoFechamento = dataDepositoFechamento;
}
}