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

fixes bug #7377 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55184 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-04-22 12:57:38 +00:00
parent cfbbb6ac01
commit d1c0fa1fd7
3 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,57 +121,56 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
private String getSql(Integer empresaId, String puntoVentas, String estados) {
StringBuilder sql = new StringBuilder();
sql.append("SELECT COALESCE(AIDF.ACFISCAL,SUBSTR(ML2.NUMSERIE20, -6, 7)) AS AIDF, ");
sql.append(" COALESCE(CAJ.NUMFOLIOSISTEMA, CAJ.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
sql.append(" CASE WHEN ML2.NUMSERIE20 IS NULL THEN CAJ.NUMSERIEPREIMPRESA ELSE NULL END AS SERIE_SUBSERIE, ");
sql.append(" CAJ.NUMFOLIOPREIMPRESO AS FOLIO, ");
sql.append(" CAJ.PRECIOPAGADO AS PRECIOPAGADO, ");
sql.append(" CAJ.PRECIOBASE AS PRECIOBASE, ");
sql.append("SELECT COALESCE(AIDF.ACFISCAL,SUBSTR(R4.NUMSERIE20, -6, 7)) AS AIDF, ");
sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION) AS NUMFOLIOSISTEMA, ");
sql.append(" CASE WHEN R4.NUMSERIE20 IS NULL THEN B.NUMSERIEPREIMPRESA ELSE NULL END AS SERIE_SUBSERIE, ");
sql.append(" B.NUMFOLIOPREIMPRESO AS FOLIO, ");
sql.append(" B.PRECIOPAGADO AS PRECIOPAGADO, ");
sql.append(" B.PRECIOBASE AS PRECIOBASE, ");
sql.append(" E.NOMBEMPRESA AS NOMB_EMPRESA, ");
sql.append(" E.EMPRESA_ID AS EMPRESA_ID, ");
sql.append(" EST.ESTADO_ID AS ESTADO_ID, ");
sql.append(" EST.NOMBESTADO AS ESTADO, ");
sql.append(" EST.CVEESTADO AS UF, ");
sql.append(" EST.ICMS AS ICMS, ");
sql.append(" TO_CHAR(CAJ.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, ");
sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY') AS FECHOR_VENTA, ");
sql.append(" CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END IS_ESTADUAL, ");
sql.append(" EI.PORCREDMUNICIPAL AS PORC_MUNICIPAL, ");
sql.append(" EI.PORCREDESTADUAL AS PORC_ESTADUAL ");
sql.append("FROM CAJA CAJ ");
sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = CAJ.MARCA_ID ");
sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = CAJ.PUNTOVENTA_ID ");
sql.append("INNER JOIN PARADA ORIGEM ON (CAJ.ORIGEN_ID = ORIGEM.PARADA_ID ) ");
sql.append("INNER JOIN PARADA DESTINO ON (CAJ.DESTINO_ID = DESTINO.PARADA_ID ) ");
sql.append("FROM BOLETO B ");
sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = B.MARCA_ID ");
sql.append("INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = B.PUNTOVENTA_ID ");
sql.append("INNER JOIN PARADA ORIGEM ON (B.ORIGEN_ID = ORIGEM.PARADA_ID ) ");
sql.append("INNER JOIN PARADA DESTINO ON (B.DESTINO_ID = DESTINO.PARADA_ID ) ");
sql.append("INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORIGEM.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("LEFT JOIN BOLETO B ON (B.NUMASIENTO = CAJ.NUMASIENTO ");
sql.append(" AND B.FECCORRIDA = CAJ.FECCORRIDA ");
sql.append(" AND B.CORRIDA_ID = CAJ.CORRIDA_ID) ");
sql.append("LEFT JOIN FISCAL_ML2 ML2 ON ML2.BOLETO_ID = B.BOLETO_ID ");
sql.append("LEFT JOIN EMPRESA_IMPOSTO EI ON EST.ESTADO_ID = EI.ESTADO_ID AND EI.EMPRESA_ID = CAJ.MARCA_ID ");
sql.append("LEFT JOIN AIDF AIDF ON ((AIDF.SERIE = CAJ.NUMSERIEPREIMPRESA OR ");
sql.append(" AIDF.SERIE = SUBSTR(CAJ.NUMSERIEPREIMPRESA,1,INSTR(CAJ.NUMSERIEPREIMPRESA,'-',1)-1)) ");
sql.append(" AND (CAJ.NUMFOLIOPREIMPRESO BETWEEN AIDF.FORMINICIAL AND AIDF.FORMFINAL)) ");
sql.append("WHERE CAJ.MOTIVOCANCELACION_ID IN (32) ");
sql.append("AND CAJ.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') ");
sql.append("AND CAJ.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
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 AIDF AIDF ON ((AIDF.SERIE = B.NUMSERIEPREIMPRESA OR ");
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("WHERE B.MOTIVOCANCELACION_ID = 32 ");
sql.append("AND B.INDSTATUSBOLETO = 'C' ");
sql.append("AND B.INDCANCELACION = 1 ");
sql.append("AND B.FECHORVENTA BETWEEN TO_DATE(:DATA_INICIO,'DD/MM/YYYY HH24:MI:SS') AND TO_DATE(:DATA_FINAL,'DD/MM/YYYY HH24:MI:SS') ");
sql.append("AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
sql.append(estados == null ? "" : "AND EST.ESTADO_ID IN (" + estados + ") ");
sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") ");
sql.append(empresaId == null ? "" : "AND CAJ.MARCA_ID IN (" + empresaId + ") ");
sql.append("GROUP BY COALESCE(AIDF.ACFISCAL,SUBSTR(ML2.NUMSERIE20, -6, 7)), ");
sql.append(" COALESCE(CAJ.NUMFOLIOSISTEMA, CAJ.NUMOPERACION), ");
sql.append(" CASE WHEN ML2.NUMSERIE20 IS NULL THEN CAJ.NUMSERIEPREIMPRESA ELSE NULL END, ");
sql.append(" CAJ.NUMFOLIOPREIMPRESO, ");
sql.append(" CAJ.PRECIOPAGADO, ");
sql.append(" CAJ.PRECIOBASE, ");
sql.append(empresaId == null ? "" : "AND B.MARCA_ID IN (" + empresaId + ") ");
sql.append("GROUP BY COALESCE(AIDF.ACFISCAL,SUBSTR(R4.NUMSERIE20, -6, 7)), ");
sql.append(" COALESCE(B.NUMFOLIOSISTEMA, B.NUMOPERACION), ");
sql.append(" CASE WHEN R4.NUMSERIE20 IS NULL THEN B.NUMSERIEPREIMPRESA ELSE NULL END, ");
sql.append(" B.NUMFOLIOPREIMPRESO, ");
sql.append(" B.PRECIOPAGADO, ");
sql.append(" B.PRECIOBASE, ");
sql.append(" E.NOMBEMPRESA, ");
sql.append(" E.EMPRESA_ID, ");
sql.append(" EST.ESTADO_ID, ");
sql.append(" EST.NOMBESTADO, ");
sql.append(" EST.CVEESTADO, ");
sql.append(" EST.ICMS, ");
sql.append(" TO_CHAR(CAJ.FECHORVENTA, 'DD/MM/YYYY'), ");
sql.append(" TO_CHAR(B.FECHORVENTA, 'DD/MM/YYYY'), ");
sql.append(" (CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 1 ELSE 0 END), ");
sql.append(" EI.PORCREDMUNICIPAL, ");
sql.append(" EI.PORCREDESTADUAL ");

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

Binary file not shown.

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

@ -1,8 +1,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">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="141"/>
<property name="ireport.y" value="90"/>
<property name="ireport.x" value="91"/>
<property name="ireport.y" value="0"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table">
<box>
@ -222,7 +222,7 @@
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement mode="Transparent" x="45" y="30" width="51" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="f64c2e3c-d936-4072-a0b1-d914f408bbbb"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
@ -238,7 +238,7 @@
</textField>
<textField>
<reportElement mode="Transparent" x="96" y="30" width="28" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="98d664b7-8e13-408c-bf89-70bf11c87a60"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
</textElement>