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

fixed bug#12518 

qua:Junia
dev:Thiago

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@87566 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2018-11-30 17:40:23 +00:00
parent 74d1294cab
commit 68d8f853ed
5 changed files with 87 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java
View File

@ -16,10 +16,6 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
/**
* @author Thiago
*
*/
public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
public RelatorioFormaPagamentoAgencia(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);
@ -61,11 +57,11 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
sql.append(" select to_char(c.fechorventa, 'dd/MM/yyyy') as data, ");
sql.append(" pv.NOMBPUNTOVENTA as agencia, ");
sql.append(" fp.DESCPAGO as forma_pagamento, ");
sql.append(" sum(nvl(c.PRECIOPAGADO,0)) as tarifa, ");
sql.append(" SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * NVL(cfp.IMPORTE,0)) AS tarifa,");
sql.append(" sum(nvl(c.IMPORTEPEDAGIO,0)) as pedagio, ");
sql.append(" sum(nvl(c.IMPORTESEGURO,0)) as seguro, ");
sql.append(" sum(nvl(c.IMPORTETAXAEMBARQUE,0)) as taxa, ");
sql.append(" sum((nvl(c.PRECIOPAGADO,0) + nvl(c.IMPORTEPEDAGIO,0) + nvl(c.IMPORTESEGURO,0) + nvl(c.IMPORTETAXAEMBARQUE,0))) as total, ");
sql.append(" sum((CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * NVL(cfp.IMPORTE,0) + NVL(c.IMPORTEPEDAGIO,0) + NVL(c.IMPORTESEGURO,0) + NVL(c.IMPORTETAXAEMBARQUE,0))) AS total, ");
sql.append(" count(c.PRECIOPAGADO) as qtde ");
sql.append(" from caja c ");
sql.append(" join caja_formapago cfp on c.caja_id = cfp.caja_id ");
@ -73,7 +69,8 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
sql.append(" join punto_venta pv on pv.PUNTOVENTA_ID = c.PUNTOVENTA_ID ");
sql.append(" join marca m on m.MARCA_ID = c.MARCA_ID and m.activo = 1 ");
sql.append(where);
sql.append(" group by to_char(c.fechorventa, 'dd/MM/yyyy'), pv.NOMBPUNTOVENTA, fp.DESCPAGO, c.EMPRESAPUNTOVENTA_ID ");
sql.append(" AND c.INDREIMPRESION = 0 ");
sql.append(" group by to_char(c.fechorventa, 'dd/MM/yyyy'), pv.NOMBPUNTOVENTA, fp.DESCPAGO ");
sql.append(" order by data, agencia, forma_pagamento");
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());

14
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties 100644
View File

@ -0,0 +1,14 @@
TITULO = Relatório de Forma de Pagamento por Agência
PERIODO = PERÍODO
DATA = DATA
AGENCIA = AGÊNCIA
FORMA_PAG = FORMA DE PAG.
VALOR = VALOR
PEDAGIO = PEDÁGIO
SEGURO = SEGURO
TAXAS = TAXAS
TOTAL = TOTAL
QTDE = QTDE
msg.noData=Não foi possivel obter dados com os parâmetros informados.

13
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
View File

@ -1 +1,14 @@
TITULO = Relatório de Forma de Pagamento por Agência
PERIODO = PERÍODO
DATA = DATA
AGENCIA = AGÊNCIA
FORMA_PAG = FORMA DE PAG.
VALOR = VALOR
PEDAGIO = PEDÁGIO
SEGURO = SEGURO
TAXAS = TAXAS
TOTAL = TOTAL
QTDE = QTDE
msg.noData=Não foi possivel obter dados com os parâmetros informados.

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

Binary file not shown.

112
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml
View File

@ -39,21 +39,21 @@
<band splitType="Stretch"/>
</background>
<title>
<band height="68" splitType="Stretch">
<staticText>
<reportElement uuid="7f9cea32-d0e7-4c05-9efc-233cdd5137ab" x="1" y="39" width="65" height="20"/>
<textElement>
<band height="59" splitType="Stretch">
<textField>
<reportElement uuid="3152d9c0-592e-4136-b3d8-2a674e779468" x="1" y="39" width="65" height="20"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[PERÍODO:]]></text>
</staticText>
<staticText>
<reportElement uuid="367cee8b-2874-4078-b9c4-90285e81ec06" x="30" y="0" width="802" height="20"/>
<textElement textAlignment="Center">
<textFieldExpression><![CDATA[$R{PERIODO}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="50b8071e-9e65-49d2-bd12-b9354502caf3" x="30" y="0" width="802" height="20"/>
<textElement textAlignment="Center" markup="none">
<font size="14" isBold="true"/>
</textElement>
<text><![CDATA[Relatório de Forma de Pagamento por Agência]]></text>
</staticText>
<textFieldExpression><![CDATA[$R{TITULO}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="c45a1ecd-8b5e-4bd7-9139-56e0844cea7e" x="145" y="39" width="10" height="20"/>
<textElement>
@ -75,69 +75,69 @@
</title>
<columnHeader>
<band height="23">
<staticText>
<reportElement uuid="a355fd56-2041-4ca0-b9bd-c3ed0173f704" x="0" y="0" width="66" height="20"/>
<textElement>
<textField>
<reportElement uuid="333a50a8-5d67-42b5-b3c6-2d70ceabfe25" x="0" y="0" width="66" height="20"/>
<textElement markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[DATA]]></text>
</staticText>
<staticText>
<reportElement uuid="70c670fb-e9a0-49b8-8332-1eb625b27fc6" x="66" y="0" width="108" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{DATA}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4" x="66" y="0" width="108" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[AGÊNCIA]]></text>
</staticText>
<staticText>
<reportElement uuid="1fee5538-4ea6-478e-b565-0733f1433db8" x="174" y="0" width="115" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{AGENCIA}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="9457e696-5c75-4983-98c3-9dc4fc54e976" x="174" y="0" width="115" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[FORMA DE PAG.]]></text>
</staticText>
<staticText>
<reportElement uuid="73e6808f-fb41-4017-b857-2a1611fd8006" x="289" y="0" width="91" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{FORMA_PAG}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="ab54d7e9-29fd-42da-9721-07fe99bb8874" x="289" y="0" width="91" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[TARIFA]]></text>
</staticText>
<staticText>
<reportElement uuid="97055f24-9341-4ac3-8445-7f2d2ebc76e2" x="380" y="0" width="107" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{VALOR}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="fafe4849-b6d5-4a20-ab2c-bb3551337bbd" x="380" y="0" width="107" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[PEDÁGIO]]></text>
</staticText>
<staticText>
<reportElement uuid="d381d9e7-bb72-431f-af00-3584f9ca9f7b" x="487" y="0" width="107" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{PEDAGIO}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="52cf4306-6208-414e-8892-3085a69fa84a" x="487" y="0" width="107" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[SEGURO]]></text>
</staticText>
<staticText>
<reportElement uuid="aec51c2e-ed8d-47aa-ab7c-77a1f5fc365a" x="594" y="0" width="60" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{SEGURO}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="be9f28a6-e16c-49af-a1ae-a806a4a835d8" x="594" y="0" width="60" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[TAXAS]]></text>
</staticText>
<staticText>
<reportElement uuid="6aa29773-39b4-4f17-a08d-e296df7df1b9" x="655" y="0" width="85" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{TAXAS}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="218e15c9-18bd-4ec5-9ff1-36b5e016569e" x="655" y="0" width="85" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[TOTAL]]></text>
</staticText>
<staticText>
<reportElement uuid="5a09d3e0-7464-4a7e-8378-544ecfd8d01e" x="740" y="0" width="49" height="20"/>
<textElement textAlignment="Right">
<textFieldExpression><![CDATA[$R{TOTAL}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="478182fa-9c5c-4e61-8719-e4b056b80585" x="740" y="0" width="49" height="20"/>
<textElement textAlignment="Right" markup="none">
<font isBold="true"/>
</textElement>
<text><![CDATA[QTDE]]></text>
</staticText>
<textFieldExpression><![CDATA[$R{QTDE}]]></textFieldExpression>
</textField>
<line>
<reportElement uuid="33fdc3c8-28af-450b-9afb-bffbe50ff8b8" x="1" y="20" width="801" height="1"/>
</line>