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

fixes bug#20985 

qua:debora
dev:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104869 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2020-12-28 19:31:10 +00:00
parent 610b734e6f
commit d9537951b9
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java
View File

@ -21,6 +21,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioResumoVendaOrgaoConcedenteBean; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioResumoVendaOrgaoConcedenteBean;
import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.MoneyHelper;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
@ -54,9 +55,8 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio {
sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(3) THEN CAJA.IMPORTE END), 0) AS ANTT,"); sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(3) THEN CAJA.IMPORTE END), 0) AS ANTT,");
sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27) THEN CAJA.IMPORTE END), 0) AS AGERBA, "); sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27) THEN CAJA.IMPORTE END), 0) AS AGERBA, ");
sb.append(" COALESCE(SUM(CASE WHEN CAJA.FORMAPAGO IN(2) THEN CAJA.IMPORTE END), 0) AS CARTAO,"); sb.append(" COALESCE(SUM(CASE WHEN CAJA.FORMAPAGO IN(2) THEN CAJA.IMPORTE END), 0) AS CARTAO,");
sb.append(" COALESCE(SUM(CASE WHEN CAJA.FORMAPAGO IN(1, 3) THEN CAJA.IMPORTE END), 0) AS AVISTA,"); sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27, 3) THEN CAJA.IMPORTE END), 0) AS VALORBASECALCULO, ");
sb.append(" COALESCE(SUM(CAJA.IMPORTE - (CAJA.IMPORTE * COALESCE(CAJA.porcredbaseicms / 100,0))) , 0) AS VALORBASECALCULO, "); sb.append(" COALESCE(SUM(CASE WHEN CAJA.INDTRIBTARIFA IN(1) THEN CAJA.IMPORTE END), 0) AS ISENTO, ");
sb.append(" SUM(CAJA.IMPORTE) AS ISENTO, ");
sb.append(" CAJA.NOMECLASSE AS NOMECLASSE, "); sb.append(" CAJA.NOMECLASSE AS NOMECLASSE, ");
sb.append(" CAJA.NOMEESTADO AS NOMEESTADO "); sb.append(" CAJA.NOMEESTADO AS NOMEESTADO ");
sb.append("FROM "); sb.append("FROM ");
@ -67,20 +67,19 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio {
sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,"); sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,");
sb.append(" EI.porcredbaseicms,"); sb.append(" EI.porcredbaseicms,");
sb.append(" EST.NOMBESTADO AS NOMEESTADO, "); sb.append(" EST.NOMBESTADO AS NOMEESTADO, ");
sb.append(" CS.DESCCLASE AS NOMECLASSE "); sb.append(" CS.DESCCLASE AS NOMECLASSE, ");
sb.append(" R.INDTRIBTARIFA AS INDTRIBTARIFA ");
sb.append(" "); sb.append(" ");
sb.append(" FROM CAJA C"); sb.append(" FROM CAJA C");
sb.append(" INNER JOIN CAJA_FORMAPAGO CFP ON (C.CAJA_ID = CFP.CAJA_ID AND CFP.ACTIVO = 1)"); sb.append(" INNER JOIN CAJA_FORMAPAGO CFP ON (C.CAJA_ID = CFP.CAJA_ID AND CFP.ACTIVO = 1)");
sb.append(" INNER JOIN FORMA_PAGO FP ON (FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID)"); sb.append(" INNER JOIN FORMA_PAGO FP ON (FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID)");
sb.append(" INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID"); sb.append(" INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID and pv.activo = 1");
sb.append(" INNER JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID");
sb.append(" INNER JOIN RUTA R ON (C.RUTA_ID = R.RUTA_ID)"); sb.append(" INNER JOIN RUTA R ON (C.RUTA_ID = R.RUTA_ID)");
sb.append(" INNER JOIN ORGAO_CONCEDENTE OC ON (R.ORGAOCONCEDENTE_ID = OC.ORGAOCONCEDENTE_ID)"); sb.append(" INNER JOIN ORGAO_CONCEDENTE OC ON (R.ORGAOCONCEDENTE_ID = OC.ORGAOCONCEDENTE_ID)");
sb.append(" INNER JOIN empresa_imposto ei on ei.empresa_id = c.empresacorrida_id");
sb.append(" ");
sb.append(" INNER JOIN PARADA ORI ON C.ORIGEN_ID = ORI.PARADA_ID"); sb.append(" INNER JOIN PARADA ORI ON C.ORIGEN_ID = ORI.PARADA_ID");
sb.append(" INNER JOIN CIUDAD CO ON CO.CIUDAD_ID = ORI.CIUDAD_ID"); sb.append(" INNER JOIN CIUDAD CO ON CO.CIUDAD_ID = ORI.CIUDAD_ID");
sb.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID "); sb.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID and EST.activo = 1");
sb.append(" INNER JOIN empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = EST.ESTADO_ID and ei.activo = 1");
sb.append(" INNER JOIN CLASE_SERVICIO CS ON (C.CLASESERVICIO_ID = CS.CLASESERVICIO_ID ) "); sb.append(" INNER JOIN CLASE_SERVICIO CS ON (C.CLASESERVICIO_ID = CS.CLASESERVICIO_ID ) ");
sb.append(" WHERE C.ACTIVO = 1"); sb.append(" WHERE C.ACTIVO = 1");
sb.append(" and C.FECHORVENTA >= :DATA_INICIAL "); sb.append(" and C.FECHORVENTA >= :DATA_INICIAL ");
@ -95,7 +94,7 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio {
sb.append(" and EST.estado_id in (" + parametros.get("ESTADOS_ID").toString() + ")"); sb.append(" and EST.estado_id in (" + parametros.get("ESTADOS_ID").toString() + ")");
} }
if (parametros.get("EMPRESA_ID") != null && !parametros.get("EMPRESA_ID").equals("-1")) { if (parametros.get("EMPRESA_ID") != null && !parametros.get("EMPRESA_ID").equals("-1")) {
sb.append(" and M.EMPRESA_ID IN (" + parametros.get("EMPRESA_ID").toString() + ")"); sb.append(" and C.EMPRESACORRIDA_ID IN (" + parametros.get("EMPRESA_ID").toString() + ")");
} }
if (parametros.get("CLASESERVICIO_ID") != null && !parametros.get("CLASESERVICIO_ID").toString().equals("-1")) { if (parametros.get("CLASESERVICIO_ID") != null && !parametros.get("CLASESERVICIO_ID").toString().equals("-1")) {
sb.append(" AND C.CLASESERVICIO_ID = " + parametros.get("CLASESERVICIO_ID").toString() + " "); sb.append(" AND C.CLASESERVICIO_ID = " + parametros.get("CLASESERVICIO_ID").toString() + " ");
@ -118,15 +117,18 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio {
df.setMaximumFractionDigits(2); df.setMaximumFractionDigits(2);
df.setRoundingMode(RoundingMode.DOWN); df.setRoundingMode(RoundingMode.DOWN);
BigDecimal aVISTA = BigDecimal.ZERO;
while (rset.next()) { while (rset.next()) {
RelatorioResumoVendaOrgaoConcedenteBean bean = new RelatorioResumoVendaOrgaoConcedenteBean(); RelatorioResumoVendaOrgaoConcedenteBean bean = new RelatorioResumoVendaOrgaoConcedenteBean();
aVISTA = BigDecimal.ZERO;
bean.setAgencia(StringUtils.defaultString(rset.getString("PONTOVENTA"))); bean.setAgencia(StringUtils.defaultString(rset.getString("PONTOVENTA")));
bean.setANTT(getValor("ANTT", rset)); bean.setANTT(getValor("ANTT", rset));
bean.setAGERBA(getValor("AGERBA", rset)); bean.setAGERBA(getValor("AGERBA", rset));
bean.setCartao(getValor("CARTAO", rset)); bean.setCartao(getValor("CARTAO", rset));
bean.setAVista(getValor("AVISTA", rset)); aVISTA = MoneyHelper.somar(bean.getANTT(), bean.getAGERBA()).subtract(bean.getCartao());
bean.setAVista(aVISTA);
bean.setIsento(getValor("ISENTO", rset)); bean.setIsento(getValor("ISENTO", rset));
bean.setValorBaseCalculo(getValor("VALORBASECALCULO", rset)); bean.setValorBaseCalculo(getValor("VALORBASECALCULO", rset));
bean.setNomeEstado(StringUtils.defaultString(rset.getString("NOMEESTADO"))); bean.setNomeEstado(StringUtils.defaultString(rset.getString("NOMEESTADO")));

2
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoVendaOrgaoConcedente_pt_BR.properties
View File

@ -21,6 +21,6 @@ label.avista=
label.isento=Isento label.isento=Isento
label.valorBaseCalculo=Valor Base Cálculo label.valorBaseCalculo=Valor Base Cálculo
label.total=Total label.total=Total
label.nomeEstado=Estado: label.nomeEstado=Estado
label.nomeClasse=Classe label.nomeClasse=Classe
label.totalGeral=Total Geral label.totalGeral=Total Geral

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

Binary file not shown.

6
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml
View File

@ -74,7 +74,7 @@
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="0" y="1" width="603" height="22" forecolor="#000000" backcolor="#FFFFFF" uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc"/> <reportElement mode="Transparent" x="0" y="1" width="603" height="22" forecolor="#000000" backcolor="#FFFFFF" uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="24" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="30" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.titulo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.titulo}]]></textFieldExpression>
@ -235,7 +235,7 @@
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="117" y="1" width="72" height="14" isPrintWhenDetailOverflows="true" uuid="f8fe80df-0d02-4f10-b11e-970245f8fb54"/> <reportElement stretchType="RelativeToTallestObject" x="117" y="1" width="72" height="14" isPrintWhenDetailOverflows="true" uuid="f8fe80df-0d02-4f10-b11e-970245f8fb54"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/> <font size="6" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.ANTT}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.ANTT}]]></textFieldExpression>
@ -307,7 +307,7 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nomeEstado}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomeEstado}]]></textFieldExpression>
</textField> </textField>
<textField> <textField pattern="#,##0.00;-#,##0.00">
<reportElement x="496" y="5" width="107" height="14" uuid="5e0d5e33-3f2c-4351-9a24-e0ae438b07a6"/> <reportElement x="496" y="5" width="107" height="14" uuid="5e0d5e33-3f2c-4351-9a24-e0ae438b07a6"/>
<textFieldExpression><![CDATA[$F{isento}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{isento}]]></textFieldExpression>
</textField> </textField>