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

FIXES BUG #6702 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49346 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-10-22 21:53:22 +00:00
parent 818594daaf
commit d913b41188
3 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,16 +93,16 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" SELECT e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
sql.append(" f.fecfechamento AS dtmotivo, ");
sql.append(" SUM(( NVL(fd.valor_pago,0) - f.total )) AS saldo, ");
sql.append(" SUM(f.total) AS vrfechamento , ");
sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrdeposito ");
sql.append(" f.fecfechamento AS dtmotivo, ");
sql.append(" ( sum(NVL(fd.valor_pago,0)) - f.total ) AS saldo, ");
sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , ");
sql.append(" f.total AS vrdeposito ");
sql.append(" FROM fechamento_cntcorrente f ");
sql.append(" INNER JOIN punto_venta p ");
sql.append(" ON p.puntoventa_id = f.puntoventa_id ");
sql.append(" INNER JOIN empresa e ");
sql.append(" ON e.empresa_id = f.empresa_id ");
sql.append(" INNER JOIN fechamento_cct_deposito fd ");
sql.append(" LEFT JOIN fechamento_cct_deposito fd ");
sql.append(" ON fd.fechamentocntcorrente_id = f.fechamentocntcorrente_id ");
sql.append(" AND fd.activo = 1 ");
sql.append(" WHERE f.fecfechamento BETWEEN ? AND ? ");
@ -117,11 +117,12 @@ public class RelatorioDepositos extends Relatorio {
}
sql.append(" GROUP BY e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
sql.append(" f.fecfechamento ");
sql.append(" f.fecfechamento, ");
sql.append(" f.total ");
sql.append(" ORDER BY e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
sql.append(" f.fecfechamento ");
sql.append(" f.fecfechamento, ");
sql.append(" f.total ");
return sql.toString();
}

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

Binary file not shown.

43
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml
View File

@ -17,6 +17,15 @@
<field name="nombempresa" class="java.lang.String"/>
<field name="vrdeposito" class="java.math.BigDecimal"/>
<field name="vrfechamento" class="java.math.BigDecimal"/>
<variable name="TOTAL_DEPOSITOS" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable>
<variable name="TOTAL_FECHAMENTO" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{vrfechamento}]]></variableExpression>
</variable>
<variable name="TOTAL_SALDO" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{saldo}]]></variableExpression>
</variable>
<group name="empresa">
<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
<groupHeader>
@ -191,6 +200,40 @@
</line>
</band>
</detail>
<summary>
<band height="78">
<staticText>
<reportElement uuid="f37360c3-0284-4460-901a-ee80127a5cc7" x="180" y="12" width="100" height="20"/>
<textElement textAlignment="Right"/>
<text><![CDATA[Total Depósitos]]></text>
</staticText>
<textField pattern="¤ #,##0.00">
<reportElement uuid="9bf82cd6-9ee1-4a57-8dd9-3d7cb57662ed" x="301" y="12" width="178" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{TOTAL_DEPOSITOS}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="f003fc17-ec50-48b2-9d50-f6378794e77f" x="181" y="32" width="100" height="20"/>
<textElement textAlignment="Right"/>
<text><![CDATA[Total Fechamento]]></text>
</staticText>
<textField pattern="¤ #,##0.00">
<reportElement uuid="5e0a6f93-0fcb-4b00-b37c-5868cae8997c" x="301" y="32" width="178" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{TOTAL_FECHAMENTO}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="b619d1d0-fd58-40b8-9af2-7fb2397fcef5" x="181" y="52" width="100" height="20"/>
<textElement textAlignment="Right"/>
<text><![CDATA[Total Pendente]]></text>
</staticText>
<textField pattern="¤ #,##0.00">
<reportElement uuid="03efbc40-1a95-4c93-aa0a-7be1bdda7734" x="301" y="52" width="178" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$V{TOTAL_SALDO}]]></textFieldExpression>
</textField>
</band>
</summary>
<noData>
<band height="20">
<textField>