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

fixes bug #7401 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55741 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-05-09 13:44:56 +00:00
parent e9b86597d2
commit 57a7fc6592
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -146,7 +146,9 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DESTINO.CIUDAD_ID ) "); sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DESTINO.CIUDAD_ID ) ");
sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID "); sql.append("LEFT JOIN FISCAL_R4 R4 ON R4.BOLETO_ID = B.BOLETOORIGINAL_ID ");
sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID AND EI.EMPRESA_ID = B.MARCA_ID "); sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID ");
sql.append(" AND EI.EMPRESA_ID = B.MARCA_ID ");
sql.append(" AND EI.ACTIVO = 1 ");
sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = B.NUMSERIEPREIMPRESA OR "); sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = B.NUMSERIEPREIMPRESA OR ");
sql.append(" AIDF.SERIE = SUBSTR(B.NUMSERIEPREIMPRESA,1,INSTR(B.NUMSERIEPREIMPRESA,'-',1)-1)) "); sql.append(" AIDF.SERIE = SUBSTR(B.NUMSERIEPREIMPRESA,1,INSTR(B.NUMSERIEPREIMPRESA,'-',1)-1)) ");
sql.append(" AND (B.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) "); sql.append(" AND (B.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) ");

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

Binary file not shown.

10
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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="RelatorioDevolucaoBilhetes" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2"> <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="RelatorioDevolucaoBilhetes" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="1.5"/> <property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="91"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="90"/>
<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">
<box> <box>
@ -59,8 +59,8 @@
<variable name="valorIcms_1" class="java.math.BigDecimal" resetType="Group" resetGroup="data_group" calculation="Sum"> <variable name="valorIcms_1" class="java.math.BigDecimal" resetType="Group" resetGroup="data_group" calculation="Sum">
<variableExpression><![CDATA[$F{valorIcms}]]></variableExpression> <variableExpression><![CDATA[$F{valorIcms}]]></variableExpression>
</variable> </variable>
<variable name="folio_1" class="java.lang.Integer" calculation="Count"> <variable name="qtdeBilhetes" class="java.lang.Integer" calculation="Count">
<variableExpression><![CDATA[$F{folio}]]></variableExpression> <variableExpression><![CDATA[$F{numFolioSistema}]]></variableExpression>
</variable> </variable>
<variable name="precioPagado_total" class="java.math.BigDecimal" calculation="Sum"> <variable name="precioPagado_total" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{precioPagado}]]></variableExpression> <variableExpression><![CDATA[$F{precioPagado}]]></variableExpression>
@ -421,7 +421,7 @@
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="9"/> <font size="9"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{folio_1}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{qtdeBilhetes}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true"> <textField isStretchWithOverflow="true">
<reportElement stretchType="RelativeToTallestObject" x="140" y="1" width="96" height="14" uuid="fba1bd88-a15f-4d9f-93fb-9abbfaa5429e"/> <reportElement stretchType="RelativeToTallestObject" x="140" y="1" width="96" height="14" uuid="fba1bd88-a15f-4d9f-93fb-9abbfaa5429e"/>