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

Exportação Fiscal : ECF e RMD (issue 8120) 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@72463 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2017-08-09 17:06:36 +00:00
parent b705fa8a9f
commit 719e11882f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -1412,7 +1412,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" left join alias_servico si on si.origen_id = bi.origen_id and si.destino_id = bi.destino_id and (si.corrida_id = bi.corrida_id or si.corrida_id is null) and si.ruta_id = bi.ruta_id");
sb.append(" left join parada posi on posi.parada_id = si.aliasorigen_id");
sb.append(" left join parada pdsi on pdsi.parada_id = si.aliasdestino_id");
sb.append(" where r5i.numserie20 = r4.numserie20 and r5i.datamov = r2.datamov and r5i.codproduto like '%-TA'");
sb.append(" where r5i.numserie20 = r4.numserie20 and r5i.datamov = r2.datamov and r5i.totparcial not like 'N1'");
sb.append(" and (nvl(case when si.aliasorigen_id is null then poi.regionmetropolitana_id else posi.regionmetropolitana_id end, -1) = nvl(case when si.aliasorigen_id is null then pdi.regionmetropolitana_id else pdsi.regionmetropolitana_id end, -2))");
sb.append(" ) as totalisenta,");
sb.append(" to_number(r2.vendabrutadiaria)/100 as vendabrutadiaria,");
@ -1591,7 +1591,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" b.numfoliosistema as numfoliosistema,");
sb.append(" 0 as caja_id");
sb.append(" from fiscal_r4 r4");
sb.append(" left join fiscal_r5 r5 on r5.numserie20 = r4.numserie20 and r5.coo = r4.coo and r5.codproduto like '%-TA'");
sb.append(" left join fiscal_r5 r5 on r5.numserie20 = r4.numserie20 and r5.coo = r4.coo and r5.totparcial not like 'N1'");
sb.append(" left join caja c on c.caja_id = r4.caja_id");
sb.append(" join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov");
sb.append(" join boleto b on b.boleto_id = r4.boleto_id");
@ -1676,12 +1676,12 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
ExportacaoECFTipoCCF registro = null;
while (rs.next()) {
BigDecimal valorTarifa = BigDecimal.ZERO;
BigDecimal valorTributado = BigDecimal.ZERO;
if (rs.getString("valortarifa") != null) {
valorTarifa = BigDecimal.valueOf(Double.valueOf(rs.getString("valortarifa")));
valorTributado = BigDecimal.valueOf(Double.valueOf(rs.getString("valortarifa")));
} else {
valorTarifa = rs.getBigDecimal("preciopagado");
valorTributado = rs.getBigDecimal("preciopagado");
log.info("Tarifa nao encontrada na R5. (ECF: " + rs.getString("ecf") + " / DATAMOV: " + rs.getString("datamov") + " / COO: " + rs.getString("coo") + ")");
}
@ -1690,7 +1690,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
registro.setEcf(rs.getString("ecf"));
registro.setDataEmissao(rs.getString("datamov"));
registro.setCoo(Integer.valueOf(rs.getString("coo")));
registro.setValorServico(valorTarifa);
registro.setValorServico(valorTributado);
registro.setDescontoGlobal(null);
registro.setCodigoParticipante(null);
registro.setSituacaoCOO(0); // 0 - Documento Regular; 2 - Documento Cancelado
@ -1720,7 +1720,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
registro.setCodigoSituacaoTribColunaB(rs.getInt("red_base_calc_icms") == 0 ? 0 : 20);
}
BigDecimal valorTotal = BigDecimal.valueOf(Double.valueOf(rs.getString("valortotal")));
// TODO: Mudança para o valor tributado (Email no dia 9 de agosto de 2017 08:28)
BigDecimal valorTotal = valorTributado; //BigDecimal.valueOf(Double.valueOf(rs.getString("valortotal")));
BigDecimal red_base_calc_icms = rs.getBigDecimal("red_base_calc_icms");
// BigDecimal porc_red_municipal = rs.getBigDecimal("porc_red_municipal");