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

Casos 4448 e 4456 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30530 d1611594-4594-4d17-8e1d-87c2c4800839
master
bruno 2013-09-03 16:20:56 +00:00
parent afd0738463
commit a755d2afe8
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
View File

@ -75,7 +75,7 @@ public class RelatorioTaxasLinha extends Relatorio {
try { try {
if (fieldName.equals("IMPORTETAXAEMBARQUE") && this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE") != null && !this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").equals(BigDecimal.ZERO)) { if (fieldName.equals("IMPORTETAXAEMBARQUE") && this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE") != null && !this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").equals(BigDecimal.ZERO)) {
valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), idEstado, puntoVentaId, indInterestadual, BigDecimal.ZERO, BigDecimal.ZERO, this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE"), BigDecimal.ZERO); valorIcms = CalculoImposto.getValorImpostoRelatorioReceitaDiaria(this.relatorio.getConexao(), idEstado, puntoVentaId, indInterestadual, BigDecimal.ZERO, BigDecimal.ZERO, this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE"), BigDecimal.ZERO);
return this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").subtract(valorIcms); return this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").subtract(valorIcms);
} }
else if (fieldName.equals("IMPORTEPEDAGIO") && this.resultSet.getBigDecimal("IMPORTEPEDAGIO") != null && !this.resultSet.getBigDecimal("IMPORTEPEDAGIO").equals(BigDecimal.ZERO)) { else if (fieldName.equals("IMPORTEPEDAGIO") && this.resultSet.getBigDecimal("IMPORTEPEDAGIO") != null && !this.resultSet.getBigDecimal("IMPORTEPEDAGIO").equals(BigDecimal.ZERO)) {

7
src/java/com/rjconsultores/ventaboletos/relatorios/negocio/CalculoImposto.java
View File

@ -138,9 +138,14 @@ public class CalculoImposto {
String estado = rs.getString("NOMBESTADO"); String estado = rs.getString("NOMBESTADO");
String empresa = rs.getString("NOMBEMPRESA"); String empresa = rs.getString("NOMBEMPRESA");
if (!isBuscouConfig) if (!isBuscouConfig) {
if (!rs.isClosed())
rs.close();
if (!stmt.isClosed())
stmt.close();
throw new ExceptionConfiguracao("Não foi possivel obter a configuração de imposto para o estado: " + estado + " empresa: " + empresa); throw new ExceptionConfiguracao("Não foi possivel obter a configuração de imposto para o estado: " + estado + " empresa: " + empresa);
} }
}
; ;
if (!rs.isClosed()) if (!rs.isClosed())

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

Binary file not shown.

26
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
View File

@ -1,7 +1,7 @@
<?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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" 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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="2.2"/> <property name="ireport.zoom" value="2.2"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="1210"/>
<property name="ireport.y" value="54"/> <property name="ireport.y" value="54"/>
<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">
@ -311,13 +311,13 @@
<variable name="PASSAGEIROS_EQUIVALENTE_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variable name="PASSAGEIROS_EQUIVALENTE_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum">
<variableExpression><![CDATA[$F{PASSAGEIROS_EQUIVALENTE}]]></variableExpression> <variableExpression><![CDATA[$F{PASSAGEIROS_EQUIVALENTE}]]></variableExpression>
</variable> </variable>
<variable name="PASSAGEIROS_MPA_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="PASSAGEIROS_MPA_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Average">
<variableExpression><![CDATA[$F{PASSAGEIROS_MPA}]]></variableExpression> <variableExpression><![CDATA[$F{PASSAGEIROS_MPA}]]></variableExpression>
</variable> </variable>
<variable name="PASSAGEIROS_MPA_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Sum"> <variable name="PASSAGEIROS_MPA_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Average">
<variableExpression><![CDATA[$F{PASSAGEIROS_MPA}]]></variableExpression> <variableExpression><![CDATA[$F{PASSAGEIROS_MPA}]]></variableExpression>
</variable> </variable>
<variable name="PASSAGEIROS_MPA_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variable name="PASSAGEIROS_MPA_3" class="java.math.BigDecimal" resetType="Column" calculation="Average">
<variableExpression><![CDATA[$F{PASSAGEIROS_MPA}]]></variableExpression> <variableExpression><![CDATA[$F{PASSAGEIROS_MPA}]]></variableExpression>
</variable> </variable>
<variable name="PASSAGEIROS_MPE_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="PASSAGEIROS_MPE_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
@ -329,31 +329,31 @@
<variable name="PASSAGEIROS_MPE_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variable name="PASSAGEIROS_MPE_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum">
<variableExpression><![CDATA[$F{PASSAGEIROS_MPE}]]></variableExpression> <variableExpression><![CDATA[$F{PASSAGEIROS_MPE}]]></variableExpression>
</variable> </variable>
<variable name="RECEITA_KM_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="RECEITA_KM_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Average">
<variableExpression><![CDATA[$F{RECEITA_KM}]]></variableExpression> <variableExpression><![CDATA[$F{RECEITA_KM}]]></variableExpression>
</variable> </variable>
<variable name="RECEITA_KM_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Sum"> <variable name="RECEITA_KM_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Average">
<variableExpression><![CDATA[$F{RECEITA_KM}]]></variableExpression> <variableExpression><![CDATA[$F{RECEITA_KM}]]></variableExpression>
</variable> </variable>
<variable name="RECEITA_KM_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variable name="RECEITA_KM_3" class="java.math.BigDecimal" resetType="Column" calculation="Average">
<variableExpression><![CDATA[$F{RECEITA_KM}]]></variableExpression> <variableExpression><![CDATA[$F{RECEITA_KM}]]></variableExpression>
</variable> </variable>
<variable name="EQ_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="EQ_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Average">
<variableExpression><![CDATA[$F{EQ}]]></variableExpression> <variableExpression><![CDATA[$F{EQ}]]></variableExpression>
</variable> </variable>
<variable name="EQ_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Sum"> <variable name="EQ_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Average">
<variableExpression><![CDATA[$F{EQ}]]></variableExpression> <variableExpression><![CDATA[$F{EQ}]]></variableExpression>
</variable> </variable>
<variable name="EQ_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variable name="EQ_3" class="java.math.BigDecimal" resetType="Column" calculation="Average">
<variableExpression><![CDATA[$F{EQ}]]></variableExpression> <variableExpression><![CDATA[$F{EQ}]]></variableExpression>
</variable> </variable>
<variable name="RECEITA_VIAGEM_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="RECEITA_VIAGEM_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Average">
<variableExpression><![CDATA[$F{RECEITA_VIAGEM}]]></variableExpression> <variableExpression><![CDATA[$F{RECEITA_VIAGEM}]]></variableExpression>
</variable> </variable>
<variable name="RECEITA_VIAGEM_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Sum"> <variable name="RECEITA_VIAGEM_2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupInterestaduak" calculation="Average">
<variableExpression><![CDATA[$F{RECEITA_VIAGEM}]]></variableExpression> <variableExpression><![CDATA[$F{RECEITA_VIAGEM}]]></variableExpression>
</variable> </variable>
<variable name="RECEITA_VIAGEM_3" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variable name="RECEITA_VIAGEM_3" class="java.math.BigDecimal" resetType="Column" calculation="Average">
<variableExpression><![CDATA[$F{RECEITA_VIAGEM}]]></variableExpression> <variableExpression><![CDATA[$F{RECEITA_VIAGEM}]]></variableExpression>
</variable> </variable>
<variable name="PAX_KM_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="PAX_KM_1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">