fixed bug #7107 -Alteração de relatório para levar em consideração o campo de conta bancária e a data de lançamento( feccreacion).
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53219 d1611594-4594-4d17-8e1d-87c2c4800839master
thiago
parent
62bddf6dc0
commit
6bae1b0be1
|
|
@ -129,7 +129,7 @@ public class RelatorioDepositosDetalhado extends Relatorio {
|
|||
sQuery.append(" PV.NOMBPUNTOVENTA Ponto_de_venda, ");
|
||||
sQuery.append(" TO_CHAR(FD.FECHA_DEPOSITO,'dd/MM/yyyy') data_deposito, ");
|
||||
sQuery.append(" FD.NUMDEPOSITO Numero_deposito, ");
|
||||
sQuery.append(" TO_CHAR(FD.FECMODIF,'dd/MM/yyyy') DATA_LANCAMENTO_DEPOSITO, ");
|
||||
sQuery.append(" TO_CHAR(FD.FECCREACION,'dd/MM/yyyy') DATA_LANCAMENTO_DEPOSITO, ");
|
||||
sQuery.append(" if.NOME Banco, ");
|
||||
sQuery.append(" EC.NUMCONTA Conta, ");
|
||||
sQuery.append(" EC.NUMAGENCIA Agencia, ");
|
||||
|
|
@ -148,20 +148,13 @@ public class RelatorioDepositosDetalhado extends Relatorio {
|
|||
sQuery.append(" JOIN PUNTO_VENTA pv ");
|
||||
sQuery.append(" ON ");
|
||||
sQuery.append(" PV.PUNTOVENTA_ID = FC.PUNTOVENTA_ID ");
|
||||
sQuery.append(" JOIN EMPRESA_CONTABANCARIA ec ");
|
||||
sQuery.append(" ON ");
|
||||
sQuery.append(" fd.EMPRESACONTABANCARIA_ID = EC.EMPRESACONTABANCARIA_ID ");
|
||||
sQuery.append(" JOIN INSTI_FINANCEIRA IF ");
|
||||
sQuery.append(" ON ");
|
||||
sQuery.append(" if.INSTIFINANCEIRA_ID = FD.INSTIFINANCEIRA_ID ");
|
||||
sQuery.append(" LEFT JOIN EMPRESA_CONTABANCARIA ec ");
|
||||
sQuery.append(" ON ");
|
||||
sQuery.append(" EC.EMPRESA_ID = FC.EMPRESA_ID ");
|
||||
sQuery.append(" AND EC.INSTIFINANCEIRA_ID = if.INSTIFINANCEIRA_ID ");
|
||||
sQuery.append(" AND EC.ACTIVO = 1 ");
|
||||
sQuery.append(" LEFT JOIN PTOVTA_EMPRESA pve ");
|
||||
sQuery.append(" ON ");
|
||||
sQuery.append(" PVE.EMPRESA_ID = e.empresa_id ");
|
||||
sQuery.append(" AND PVE.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ");
|
||||
sQuery.append(" and EC.EMPRESACONTABANCARIA_ID = PVE.EMPRESACONTABANCARIA_ID ");
|
||||
sQuery.append(" AND PVE.activo = 1 ");
|
||||
sQuery.append(" EC.INSTIFINANCEIRA_ID = if.INSTIFINANCEIRA_ID ");
|
||||
sQuery.append(" ");
|
||||
sQuery.append(" WHERE ");
|
||||
sQuery.append(" FD.ACTIVO = 1 ");
|
||||
sQuery.append(" AND FCD.ACTIVO = 1 ");
|
||||
|
|
@ -174,22 +167,22 @@ public class RelatorioDepositosDetalhado extends Relatorio {
|
|||
if(parametros.get("INST_FINANCEIRA")!= null){
|
||||
sQuery.append(" and if.INSTIFINANCEIRA_ID =:INST_FINANCEIRA ");
|
||||
}
|
||||
sQuery.append(" and FD.FECMODIF between :fecInicio and :fecFinal");
|
||||
sQuery.append(" and FD.FECCREACION between :fecInicio and :fecFinal");
|
||||
sQuery.append(" GROUP BY ");
|
||||
sQuery.append(" E.NOMBEMPRESA, ");
|
||||
sQuery.append(" PV.NOMBPUNTOVENTA, ");
|
||||
sQuery.append(" FD.FECHA_DEPOSITO, ");
|
||||
sQuery.append(" FD.NUMDEPOSITO, ");
|
||||
sQuery.append(" FD.FECMODIF, ");
|
||||
sQuery.append(" FD.FECCREACION, ");
|
||||
sQuery.append(" if.NOME, ");
|
||||
sQuery.append(" EC.NUMCONTA, ");
|
||||
sQuery.append(" EC.NUMAGENCIA, ");
|
||||
sQuery.append(" FD.VALOR ");
|
||||
sQuery.append(" ORDER BY ");
|
||||
sQuery.append(" FD.FECHA_DEPOSITO, ");
|
||||
sQuery.append(" FD.FECMODIF, ");
|
||||
sQuery.append(" E.NOMBEMPRESA, ");
|
||||
sQuery.append(" PV.NOMBPUNTOVENTA, ");
|
||||
sQuery.append(" FD.FECCREACION, ");
|
||||
sQuery.append(" FD.FECHA_DEPOSITO, ");
|
||||
sQuery.append(" FD.NUMDEPOSITO, ");
|
||||
sQuery.append(" if.NOME, ");
|
||||
sQuery.append(" EC.NUMCONTA, ");
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?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="RelatorioVendasComissao" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
|
||||
<property name="ireport.zoom" value="1.0"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.x" value="131"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<parameter name="fecInicio" class="java.lang.String"/>
|
||||
<parameter name="fecFinal" class="java.lang.String"/>
|
||||
|
|
@ -89,27 +89,27 @@
|
|||
<band height="23" splitType="Stretch">
|
||||
<textField>
|
||||
<reportElement uuid="8a39b1b1-6ebd-4f33-adea-c28a9988eaae" x="287" y="0" width="80" height="20"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[$R{label.fechaDeposito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="2d666aaf-65a6-4c3f-acd3-e65483a78256" x="367" y="0" width="81" height="20"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.numDeposito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="a2ea7cea-d8ab-4c0e-bee0-4dafb3866c1f" x="448" y="0" width="80" height="20"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[$R{label.fechaLancamientoDeposito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="43d6ee75-8459-4b9e-8cbe-ca2819d3198a" x="597" y="0" width="63" height="20"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.numConta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="12a7a0b1-f60c-4819-972a-2ea87f1f07b3" x="528" y="0" width="69" height="20"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[$R{label.banco}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
|
|
@ -122,12 +122,12 @@
|
|||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="f1e309cf-c3e3-461e-86a3-bb8a3dd5eab0" x="660" y="0" width="62" height="20"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.numAgencia}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d778da2b-cbb2-45a0-b40f-5547eadc225a" x="722" y="1" width="80" height="20"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.valorDeposito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
|
|
@ -141,27 +141,27 @@
|
|||
<band height="22" splitType="Stretch">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="2e83e648-f95f-42ae-9069-862e6ad79b21" stretchType="RelativeToTallestObject" x="528" y="0" width="69" height="20" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[$F{banco}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="8cdbdd14-c9f1-45d8-bf41-a4066930f5a4" stretchType="RelativeToTallestObject" x="287" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[$F{fechaDeposito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="040c8de3-f836-40bc-96bd-761a7f5b46ef" stretchType="RelativeToTallestObject" x="597" y="0" width="63" height="20" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{numConta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="b18fae2e-6454-42b0-a68c-04cf790ddfd6" stretchType="RelativeToTallestObject" x="448" y="0" width="80" height="20" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[$F{fechaLancamientoDeposito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement uuid="09b0cd36-1946-406f-923a-172b8a4f1ac6" stretchType="RelativeToTallestObject" x="367" y="0" width="81" height="20" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{numDeposito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="5fc60f32-0c1e-43ba-8dec-cfc5d6c085fc" stretchType="RelativeToTallestObject" x="660" y="0" width="62" height="20" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{numAgencia}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
</textField>
|
||||
<staticText>
|
||||
<reportElement uuid="8028606d-ad70-4197-b011-d2ade8e44267" x="623" y="6" width="100" height="20"/>
|
||||
<textElement/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<text><![CDATA[Total]]></text>
|
||||
</staticText>
|
||||
</band>
|
||||
|
|
|
|||
Loading…
Reference in New Issue