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

fix bug #0009476 -corrigindo label do relatorio 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72548 d1611594-4594-4d17-8e1d-87c2c4800839
master
bruno.neves 2017-08-11 13:48:03 +00:00
parent 8481a19242
commit cafe5cd771
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasBilheteiroSintetico.java
View File

@ -35,7 +35,7 @@ public class RelatorioVendasBilheteiroSintetico extends Relatorio {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("select "); sql.append("select ");
sql.append(" pv.NUMPUNTOVENTA, us.cveusuario , us.NOMBUSUARIO, "); sql.append(" pv.NUMPUNTOVENTA, us.cveusuario , us.NOMBUSUARIO, tpv.DESCTIPO,");
sql.append(" sum (case when ca.motivocancelacion_id is null then 1 else 0 end) qtdVendas, "); sql.append(" sum (case when ca.motivocancelacion_id is null then 1 else 0 end) qtdVendas, ");
sql.append(" sum (case when ca.motivocancelacion_id is null then "); sql.append(" sum (case when ca.motivocancelacion_id is null then ");
sql.append(" (coalesce(ca.preciopagado,0) "); sql.append(" (coalesce(ca.preciopagado,0) ");
@ -52,6 +52,7 @@ public class RelatorioVendasBilheteiroSintetico extends Relatorio {
sql.append(" caja ca "); sql.append(" caja ca ");
sql.append(" inner join usuario us on us.usuario_id = ca.usuario_id "); sql.append(" inner join usuario us on us.usuario_id = ca.usuario_id ");
sql.append(" inner join punto_venta pv on pv.puntoventa_id = ca.puntoventa_id "); sql.append(" inner join punto_venta pv on pv.puntoventa_id = ca.puntoventa_id ");
sql.append(" INNER JOIN TIPO_PTOVTA tpv ON tpv.TIPOPTOVTA_ID = pv.TIPOPTOVTA_ID ");
sql.append("where "); sql.append("where ");
sql.append(" ca.indreimpresion = 0 "); sql.append(" ca.indreimpresion = 0 ");
sql.append(" and ca.feccorte >= :DATA_INICIAL "); sql.append(" and ca.feccorte >= :DATA_INICIAL ");
@ -66,7 +67,7 @@ public class RelatorioVendasBilheteiroSintetico extends Relatorio {
if(parametros.get("TIPOPUNTOVENTA_ID") != null && !parametros.get("TIPOPUNTOVENTA_ID").toString().equals("-1") ){ if(parametros.get("TIPOPUNTOVENTA_ID") != null && !parametros.get("TIPOPUNTOVENTA_ID").toString().equals("-1") ){
sql.append(" and pv.TIPOPTOVTA_ID = :TIPOPUNTOVENTA_ID "); sql.append(" and pv.TIPOPTOVTA_ID = :TIPOPUNTOVENTA_ID ");
} }
sql.append(" group by pv.NUMPUNTOVENTA, us.cveusuario, us.NOMBUSUARIO "); sql.append(" group by pv.NUMPUNTOVENTA, us.cveusuario, us.NOMBUSUARIO , tpv.DESCTIPO ");
sql.append(" order by pv.NUMPUNTOVENTA, us.NOMBUSUARIO "); sql.append(" order by pv.NUMPUNTOVENTA, us.NOMBUSUARIO ");
@ -94,6 +95,7 @@ public class RelatorioVendasBilheteiroSintetico extends Relatorio {
dataResult.put("VLRVENDAS", rset.getBigDecimal("VLRVENDAS")); dataResult.put("VLRVENDAS", rset.getBigDecimal("VLRVENDAS"));
dataResult.put("QTDCANCELADOS", rset.getInt("QTDCANCELADOS")); dataResult.put("QTDCANCELADOS", rset.getInt("QTDCANCELADOS"));
dataResult.put("VLRCANCELADOS", rset.getBigDecimal("VLRCANCELADOS")); dataResult.put("VLRCANCELADOS", rset.getBigDecimal("VLRCANCELADOS"));
dataResult.put("DESCTIPO", rset.getString("DESCTIPO"));
this.dados.add(dataResult); this.dados.add(dataResult);
} }

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

Binary file not shown.

36
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBilheteiroSintetico.jrxml
View File

@ -2,7 +2,7 @@
<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="RelatorioVendasBilheteiro" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c"> <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="RelatorioVendasBilheteiro" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c">
<property name="ireport.zoom" value="1.5"/> <property name="ireport.zoom" value="1.5"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="pageHeader"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="165"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/> <style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table"> <style name="table">
@ -40,6 +40,7 @@
<field name="VLRVENDAS" class="java.math.BigDecimal"/> <field name="VLRVENDAS" class="java.math.BigDecimal"/>
<field name="QTDCANCELADOS" class="java.lang.Integer"/> <field name="QTDCANCELADOS" class="java.lang.Integer"/>
<field name="VLRCANCELADOS" class="java.math.BigDecimal"/> <field name="VLRCANCELADOS" class="java.math.BigDecimal"/>
<field name="DESCTIPO" class="java.lang.String"/>
<variable name="vlrVendaTotal" class="java.math.BigDecimal" calculation="Sum"> <variable name="vlrVendaTotal" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{VLRVENDAS}]]></variableExpression> <variableExpression><![CDATA[$F{VLRVENDAS}]]></variableExpression>
</variable> </variable>
@ -162,14 +163,14 @@
<columnHeader> <columnHeader>
<band height="13" splitType="Stretch"> <band height="13" splitType="Stretch">
<staticText> <staticText>
<reportElement x="166" y="0" width="96" height="11" uuid="9fc7e58e-8625-41c4-a8ee-6454f6382d46"/> <reportElement x="122" y="0" width="68" height="11" uuid="9fc7e58e-8625-41c4-a8ee-6454f6382d46"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Bilheteiro]]></text> <text><![CDATA[Bilheteiro]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="0" y="0" width="68" height="11" uuid="3766fa33-6281-4576-a9d1-3b984e1976d3"/> <reportElement x="0" y="0" width="58" height="11" uuid="3766fa33-6281-4576-a9d1-3b984e1976d3"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
@ -199,7 +200,7 @@
<text><![CDATA[VLR.Cancelados]]></text> <text><![CDATA[VLR.Cancelados]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement x="68" y="0" width="97" height="11" uuid="8a5e97db-9b05-4fa5-9663-7795869b6b90"/> <reportElement x="58" y="0" width="64" height="11" uuid="8a5e97db-9b05-4fa5-9663-7795869b6b90"/>
<textElement textAlignment="Left" verticalAlignment="Middle"> <textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/> <font size="7" isBold="true"/>
</textElement> </textElement>
@ -216,20 +217,27 @@
<line> <line>
<reportElement x="0" y="11" width="555" height="1" uuid="8ef1fe89-c398-4c2d-a263-68d3c0dc91ab"/> <reportElement x="0" y="11" width="555" height="1" uuid="8ef1fe89-c398-4c2d-a263-68d3c0dc91ab"/>
</line> </line>
<staticText>
<reportElement x="193" y="0" width="69" height="11" uuid="e6e0b0a7-cca5-4d73-ac88-b893f47b8b40"/>
<textElement textAlignment="Left" verticalAlignment="Middle">
<font size="7" isBold="true"/>
</textElement>
<text><![CDATA[Canal Venda]]></text>
</staticText>
</band> </band>
</columnHeader> </columnHeader>
<detail> <detail>
<band height="15" splitType="Stretch"> <band height="15" splitType="Stretch">
<textField> <textField>
<reportElement x="0" y="0" width="68" height="15" uuid="01ee8c0d-6a68-45ea-a4e1-165a48cc89d4"/> <reportElement x="0" y="0" width="58" height="15" uuid="01ee8c0d-6a68-45ea-a4e1-165a48cc89d4"/>
<textFieldExpression><![CDATA[$F{NUMPUNTOVENTA}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{NUMPUNTOVENTA}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="68" y="0" width="97" height="15" uuid="152742f7-1799-4416-a180-3f55ebd20eb0"/> <reportElement x="58" y="0" width="64" height="15" uuid="152742f7-1799-4416-a180-3f55ebd20eb0"/>
<textFieldExpression><![CDATA[$F{CVEUSUARIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{CVEUSUARIO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="166" y="0" width="96" height="15" uuid="7456c2e1-eb6f-48ba-8097-3ebc40c96bcd"/> <reportElement x="122" y="0" width="68" height="15" uuid="7456c2e1-eb6f-48ba-8097-3ebc40c96bcd"/>
<textFieldExpression><![CDATA[$F{NOMBUSUARIO}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{NOMBUSUARIO}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
@ -240,23 +248,27 @@
<reportElement x="402" y="0" width="73" height="15" uuid="cb0241c1-c8ed-446d-accf-36af4a4ab540"/> <reportElement x="402" y="0" width="73" height="15" uuid="cb0241c1-c8ed-446d-accf-36af4a4ab540"/>
<textFieldExpression><![CDATA[$F{QTDCANCELADOS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{QTDCANCELADOS}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00"> <textField pattern=" #,##0.00">
<reportElement x="475" y="0" width="80" height="15" uuid="de74b2a9-67c4-415c-abca-fa3549d9b0a7"/> <reportElement x="475" y="0" width="80" height="15" uuid="de74b2a9-67c4-415c-abca-fa3549d9b0a7"/>
<textFieldExpression><![CDATA[$F{VLRCANCELADOS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{VLRCANCELADOS}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00"> <textField pattern=" #,##0.00">
<reportElement x="326" y="0" width="76" height="15" uuid="da9cc79b-499f-4b9f-b1fd-7de995071fea"/> <reportElement x="326" y="0" width="76" height="15" uuid="da9cc79b-499f-4b9f-b1fd-7de995071fea"/>
<textFieldExpression><![CDATA[$F{VLRVENDAS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{VLRVENDAS}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement x="190" y="0" width="72" height="15" uuid="49206373-b1d1-4c3e-8475-705c707b8286"/>
<textFieldExpression><![CDATA[$F{DESCTIPO}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<lastPageFooter> <lastPageFooter>
<band height="22"> <band height="22">
<textField pattern="¤ #,##0.00"> <textField pattern=" #,##0.00">
<reportElement x="326" y="0" width="76" height="20" uuid="4fe96ddc-d868-49b8-8da6-819532f96884"/> <reportElement x="326" y="0" width="76" height="20" uuid="4fe96ddc-d868-49b8-8da6-819532f96884"/>
<textFieldExpression><![CDATA[$V{vlrVendaTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vlrVendaTotal}]]></textFieldExpression>
</textField> </textField>
<textField> <textField pattern=" #,##0.00">
<reportElement x="475" y="0" width="80" height="20" uuid="04a540b3-e38f-47ca-85fe-3501dbc6c6a3"/> <reportElement x="475" y="0" width="80" height="20" uuid="04a540b3-e38f-47ca-85fe-3501dbc6c6a3"/>
<textFieldExpression><![CDATA[$V{vlrCanceladosTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vlrCanceladosTotal}]]></textFieldExpression>
</textField> </textField>
@ -269,7 +281,7 @@
<textFieldExpression><![CDATA[$V{qtdVendasTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{qtdVendasTotal}]]></textFieldExpression>
</textField> </textField>
<staticText> <staticText>
<reportElement x="166" y="0" width="96" height="20" uuid="4b21c6f2-7b3a-4ff4-b3d3-714ece376255"/> <reportElement x="190" y="0" width="72" height="20" uuid="4b21c6f2-7b3a-4ff4-b3d3-714ece376255"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<text><![CDATA[Totais:]]></text> <text><![CDATA[Totais:]]></text>
</staticText> </staticText>