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

fixes bug#14522 

dev: lucas taia
qua: xxx


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96181 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucassilverio 2019-07-29 14:46:22 +00:00
parent 879520f9d5
commit a0c9ccd554
3 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
View File

@ -150,58 +150,62 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" ( ");
sql.append(" ( ");
sql.append(" CASE ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.FECVENTADIGITA IS NULL ");
sql.append(" AND (c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN 'VENDA NORMAL' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.FECVENTADIGITA IS NOT NULL ");
sql.append(" AND (c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN 'VENDA TRANSITO' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.FECVENTADIGITA IS NULL ");
sql.append(" AND c.PORCCATEGORIA > 0 ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID not in (5,12,18,99)) ");
sql.append(" THEN cat.DESCCATEGORIA ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.FECVENTADIGITA IS NOT NULL ");
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0)");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (9,39)) ");
sql.append(" THEN 'VENDA ANTECIPADA' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.FECVENTADIGITA IS NULL ");
sql.append(" AND ( c.PORCCATEGORIA <> 100 OR c.PORCCATEGORIA IS NULL ) ");
sql.append(" AND (c.INDREMOTOINVERSO IS NULL OR c.INDREMOTOINVERSO =0) ");
sql.append(" AND (c.INDSTATUSBOLETO <> 'E' AND c.TIPOVENTA_ID in (99)) ");
sql.append(" THEN 'VENDA EMBARCADA' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (5)) ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 5) ");
sql.append(" THEN 'VENDA CENTRAL TELEFONICA' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND (c.INDSTATUSBOLETO = 'E' OR c.TIPOVENTA_ID in (18)) ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND (c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 18) ");
sql.append(" THEN 'VENDA PRE-PAGA' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 1");
sql.append(" AND (c.INDSTATUSBOLETO = 'E' AND c.TIPOVENTA_ID in (5,12,18)) ");
sql.append(" THEN 'IMPRESSAO POSTERIOR' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL ");
sql.append(" AND c.TIPOVENTA_ID = 12 ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.INDSTATUSBOLETO = 'V' AND c.TIPOVENTA_ID = 12 ");
sql.append(" THEN 'VENDA INTERNET' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.MOTIVOCANCELACION_ID = 31 ");
sql.append(" THEN 'ANULADO' ");
sql.append(" ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL ");
sql.append(" WHEN c.MOTIVOCANCELACION_ID IS NOT NULL AND c.indreimpresion = 0 ");
sql.append(" AND c.MOTIVOCANCELACION_ID <> 31 ");
sql.append(" THEN 'DEVOLVIDO' ");
sql.append(" END) ");
@ -219,7 +223,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" LEFT JOIN parada DES ON DES.parada_id = c.destino_id ");
sql.append(" where c.ACTIVO = 1 ");
sql.append(" AND c.tipoventa_id <> 6 ");
sql.append(" AND c.indreimpresion = 0 ");
//sql.append(" AND c.indreimpresion = 0 ");
sql.append(" AND c.feccorte BETWEEN :fecInicioVenda AND :fecFinalVenda ");
if (tramo != null && !tramo.equals("Todas") ) {

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

Binary file not shown.

48
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
View File

@ -345,7 +345,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$R{header.filtro.total.linha}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="7ac053bb-1883-4292-ad2c-020d22a4d35e"/>
<box>
<leftPen lineWidth="0.0"/>
@ -356,7 +356,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalLinhaPedagio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="338a967b-af06-4c03-809c-2c0d70a3b95f"/>
<box>
<leftPen lineWidth="0.0"/>
@ -367,7 +367,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalLinhaGeral}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="7322a004-1807-46d6-acd3-fabdf1b54df7"/>
<box>
<leftPen lineWidth="0.0"/>
@ -389,7 +389,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalLinhaQte}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="40c07af6-4165-4761-ac70-bc145d0f4399"/>
<box>
<leftPen lineWidth="0.0"/>
@ -400,7 +400,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalLinhaTarifa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="ab046c7d-7177-4973-a564-829ea3d808e3"/>
<box>
<leftPen lineWidth="0.0"/>
@ -411,7 +411,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalLinhaTaxaEmbarque}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="1eacb9ad-448a-4ffe-9ca5-dbd980e47d56"/>
<box>
<leftPen lineWidth="0.0"/>
@ -555,7 +555,7 @@ $F{seguro}]]></variableExpression>
</groupHeader>
<groupFooter>
<band height="20">
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="56a43e72-3b34-492f-814b-d4d91af9827a"/>
<box>
<leftPen lineWidth="0.0"/>
@ -566,7 +566,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalTrechoPedagio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="6a3f6820-eef8-4c4a-8fe8-99dffd4c0387"/>
<box>
<leftPen lineWidth="0.0"/>
@ -577,7 +577,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalTrechoSeguro}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="6824eef6-a2aa-4fa8-94b0-51b752ed991b"/>
<box>
<leftPen lineWidth="0.0"/>
@ -588,7 +588,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalTrechoTaxaEmbarque}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="701d1919-2074-4e36-9334-4b9867268fd7"/>
<box>
<leftPen lineWidth="0.0"/>
@ -599,7 +599,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalTrechoOutros}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="16f4cb28-d52a-4906-87fc-119866b0216e"/>
<box>
<leftPen lineWidth="0.0"/>
@ -621,7 +621,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalTrechoQte}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="30f159f7-6b91-4978-bb6f-f9bdee08c0b1"/>
<box>
<leftPen lineWidth="0.0"/>
@ -719,7 +719,7 @@ $F{seguro}]]></variableExpression>
</columnHeader>
<detail>
<band height="20" splitType="Prevent">
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="e91ddf3d-5ee2-42d3-b8d4-01c92a2f462a"/>
<box>
<leftPen lineWidth="0.0"/>
@ -730,7 +730,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="d9ec1d06-efc7-4a65-96a2-e88e89f4ca91"/>
<box>
<leftPen lineWidth="0.0"/>
@ -763,7 +763,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$F{qtde}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="1ae38af7-3815-4fc0-ba8c-a87f6a26914a"/>
<box>
<leftPen lineWidth="0.0"/>
@ -774,7 +774,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="bde0e80b-872a-4b26-b882-83efc01c25b7"/>
<box>
<leftPen lineWidth="0.0"/>
@ -785,7 +785,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="7e10a3dc-7e63-49cf-ab5a-87bd2e7aa213"/>
<box>
<leftPen lineWidth="0.0"/>
@ -796,7 +796,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$F{taxaembarque}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="e4dc6a7f-049d-45e1-9c6d-231303fb288c"/>
<box>
<leftPen lineWidth="0.0"/>
@ -811,7 +811,7 @@ $F{seguro}]]></variableExpression>
</detail>
<summary>
<band height="20">
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="5476b82a-2529-4b0f-baca-6f68e9a5f3bc"/>
<box>
<leftPen lineWidth="0.0"/>
@ -833,7 +833,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$R{header.filtro.total}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="45b3533b-d863-423d-b6a0-682d2336d6ca"/>
<box>
<leftPen lineWidth="0.0"/>
@ -855,7 +855,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalQte}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="892dea7f-0a9d-40ab-8f69-7e950fefd73b"/>
<box>
<leftPen lineWidth="0.0"/>
@ -866,7 +866,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalTaxaEmbarque}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="8dbbd30a-18f8-4c7d-bf8a-e526b28971fa"/>
<box>
<leftPen lineWidth="0.0"/>
@ -877,7 +877,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalTarifa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="e423dc37-408c-4d74-bcb2-cd0e199b37aa"/>
<box>
<leftPen lineWidth="0.0"/>
@ -888,7 +888,7 @@ $F{seguro}]]></variableExpression>
</textElement>
<textFieldExpression><![CDATA[$V{totalOutros}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="df545e3c-3cd3-40e2-a440-c3ae45c27a5d"/>
<box>
<leftPen lineWidth="0.0"/>