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

fixes bug #9608 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73173 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-08-27 13:25:05 +00:00
parent 92b660239f
commit dc6c73efa9
2 changed files with 156 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2381,7 +2381,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
StringBuilder sb = new StringBuilder();
sb.append(" select");
sb.append(" c.estado_id as codigoParticipantePar,");
sb.append(" eif.codestabelecimento as codigoEstabelecimentoPar,");
sb.append(" e.nombempresa as nomeParticipante,");
@ -2393,7 +2393,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" ie.complemento as complemento,");
sb.append(" ie.bairro as bairro,");
sb.append(" ie.cep as cep,");
sb.append(" cast(f.fechorfolio as date) as dataEmissaoRMD,");
sb.append(" eo.estado_id codigoParticipante,");
sb.append(" ei.codestabelecimento as codigoEstabelecimento,");
@ -2403,7 +2403,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" f.folio as numeroFormularioBilheteAIDF,");
sb.append(" (case when coalesce(f.indcancelacion, 0) = 1 then 'S' else 'N' end) as documentoCancelado,");
sb.append(" (case when co.estado_id = cd.estado_id then ei.codigocontabilmunicipal else ei.codigocontabilestadual end) as codigoContabil,");
sb.append(" b.feccreacion as dataEmissao,");
sb.append(" b.numfoliopreimpreso as numeroFormulario,");
sb.append(" r.acfiscal as numeroAIDFRMD,");
@ -2428,7 +2428,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" b.rmd_id,");
sb.append(" b.aidf_id,");
sb.append(" b.boleto_id");
sb.append(" from folio_consumo_rmd f");
sb.append(" join estado eof on eof.estado_id = f.estado_id");
sb.append(" join aidf r on r.aidf_id = f.rmd_id");
@ -2452,23 +2452,23 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS')");
sb.append(" and f.empresa_id = ?");
sb.append(" and eof.cveestado like ?");
try {
PreparedStatement ps = connection.prepareStatement(sb.toString());
ps.setString(1, DateUtil.getStringDate(inicio, DATE_FORMAT_DMY) + " 00:00:00");
ps.setString(2, DateUtil.getStringDate(fim, DATE_FORMAT_DMY) + " 23:59:59");
ps.setLong(3, Long.valueOf(empresaId));
ps.setString(4, cveestado);
ResultSet rs = ps.executeQuery();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
ExportacaoBPRBase registro = null;
while (rs.next()) {
registro = new ExportacaoBPRBase();
String ufDestino = rs.getString("ufDestino");
String ufOrigem = rs.getString("ufOrigem");
Integer municipioOrigem = rs.getInt("municipioOrigem");
@ -2508,7 +2508,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
registro.setNumeroFormularioBilheteAIDF(rs.getLong("numeroFormularioBilheteAIDF"));
registro.setDocumentoCancelado(rs.getString("documentoCancelado").equals("S") ? Boolean.TRUE : Boolean.FALSE);
registro.setCodigoContabil(rs.getString("codigoContabil"));
// BPS
registro.setDataEmissao(sdf.format(rs.getDate("dataEmissao")));
registro.setNumeroFormulario(rs.getLong("numeroFormulario"));
@ -2532,19 +2532,19 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
exportacaoRMD.getListaRegistroBPR().add(registro);
}
rs.close();
ps.close();
exportacaoRMD.gerarListas();
} catch (Exception e) {
log.error(e.getMessage(), e);
}
return exportacaoRMD;
}
@Override
public List<ExportacaoRMDTipoPAR> buscarRegistroRMDTipoPAR(Connection connection, Date inicio, Date fim, Integer empresaId, String cveestado) {
List<ExportacaoRMDTipoPAR> retorno = new ArrayList<ExportacaoRMDTipoPAR>();
@ -3300,9 +3300,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
}
if (boletoAgr == null)
boletoAgr = brp.getBoletoId().toString();
boletoAgr = brp.getCajaId().toString();
else
boletoAgr = boletoAgr + " ," + brp.getBoletoId();
boletoAgr = boletoAgr + " ," + brp.getCajaId();
cont++;
}
@ -3313,7 +3313,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
isCancela, isInativa, false, isECF, isBPR, null, null, null, null, null, null);
}
marcarRMDBoletos(connection, boletos, null, null);
marcarRMDCaja(connection, boletos, null, null);
}
private void inativarFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId,
@ -3447,7 +3447,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
insereConsulmoFolioRMD(connection, dataBilhete, empresaId, estadoId, aidf, rmdIterate.toString(), false, false, true, isECF, isBPR,
valorContabil, baseCalculo, aliquota, isentos, outros, icms);
marcarRMDBoletos(connection, boletos, aidf.getAidfId(), rmdIterate);
marcarRMDCaja(connection, boletos, aidf.getAidfId(), rmdIterate);
// limpa a lista de inseções do boleto
boletos = new ArrayList<String>();
@ -3472,9 +3472,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
}
if (boletoAgr == null)
boletoAgr = det.getBoletoId().toString();
boletoAgr = det.getCajaId().toString();
else
boletoAgr = boletoAgr + " ," + det.getBoletoId();
boletoAgr = boletoAgr + " ," + det.getCajaId();
contBolto++;
}
@ -3493,20 +3493,20 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
boletos.add(boletoAgr);
insereConsulmoFolioRMD(connection, dataBilhete, empresaId, estadoId, aidf, rmdIterate.toString(), false, false, true, isECF, isBPR,
valorContabil, baseCalculo, aliquota, isentos, outros, icms);
marcarRMDBoletos(connection, boletos, aidf.getAidfId(), rmdIterate);
marcarRMDCaja(connection, boletos, aidf.getAidfId(), rmdIterate);
}
}
private void marcarRMDBoletos(Connection connection, List<String> boletos, Long rmdId, Integer folio) {
private void marcarRMDCaja(Connection connection, List<String> boletos, Long rmdId, Integer folio) {
for (String bs : boletos) {
StringBuilder sb = new StringBuilder();
PreparedStatement pstmt = null;
try {
sb.append(" update boleto set rmd_id = ").append(rmdId).append(", ");
sb.append(" update caja set rmd_id = ").append(rmdId).append(", ");
sb.append(" foliormd = ").append(folio).append(", ");
sb.append(" fecmodif = SYSDATE, usuario_id = ").append(UsuarioLogado.getUsuarioLogado().getUsuarioId());
sb.append(" where boleto_id in ( ").append(bs).append(" ) ");
sb.append(" where caja_id in ( ").append(bs).append(" ) ");
pstmt = connection.prepareStatement(sb.toString());
pstmt.executeUpdate();
} catch (Exception e) {
@ -3674,30 +3674,24 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql = getSqlCancelarRMDTipoECF(isManual, isECF);
}
PreparedStatement ps = connection.prepareStatement(sql);
ps.setLong(1, Long.valueOf(empresaId));
if (isECF) {
ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL));
ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL));
} else {
ps.setTimestamp(2, new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime()));
ps.setTimestamp(3, new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime()));
}
ps.setString(4, cveestado);
NamedParameterStatement ps = new NamedParameterStatement(connection, sql);
ps.getStatement().setFetchSize(100);
ps.setInt("EMPRESA_ID", empresaId);
ps.setTimestamp("DATE_INICIO", new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime()));
ps.setTimestamp("DATE_FIM", new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime()));
ps.setString("CVEESTADO", cveestado);
if (isCancelamento) {
ps.setLong(5, rmdId);
ps.setLong(6, NumberUtils.toLong(folioInicial));
ps.setLong(7, NumberUtils.toLong(folioFinal));
ps.setLong("RMD_ID", rmdId);
ps.setLong("FOLIO_INICIAL", NumberUtils.toLong(folioInicial));
ps.setLong("FOLIO_FINAL", NumberUtils.toLong(folioFinal));
}
ResultSet rs = ps.executeQuery();
while (rs.next()) {
DetalhadoRMD brp = new DetalhadoRMD();
brp.setBoletoId(rs.getLong("boletoId"));
brp.setCajaId(rs.getLong("cajaId"));
brp.setNumoperacion(rs.getString("numoperacion"));
brp.setSerie(rs.getString("serieCompl"));
brp.setFolio(rs.getInt("folio"));
@ -3757,7 +3751,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
private String getSqlImpressaoRMDTipoBPR() {
StringBuilder sql = new StringBuilder();
sql.append("select ");
sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.caja_id as cajaId, ");
sql.append(" b.numoperacion as numoperacion, ");
sql.append(" b.numseriepreimpresa as serieCompl, ");
sql.append(" b.numfoliopreimpreso as folio, ");
@ -3795,7 +3789,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" coalesce(b.importepedagio, 0) as pedagio, ");
sql.append(" coalesce(b.importeseguro, 0) as seguro, ");
sql.append(" coalesce(b.importeoutros, 0) as outros ");
sql.append("from boleto b ");
sql.append("from caja b ");
sql.append(" join marca m on b.marca_id = m.marca_id ");
sql.append(" join empresa e on e.empresa_id = m.empresa_id ");
sql.append(" join punto_venta pv on pv.puntoventa_id = b.puntoventa_id ");
@ -3828,9 +3822,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" b.tipoventa_id = 3 ");
sql.append(" and b.rmd_id is null ");
sql.append(" and b.indstatusboleto = 'V' ");
sql.append(" and e.empresa_id = ? ");
sql.append(" and b.feccreacion between ? and ? ");
sql.append(" and coalesce(ae.cveestado, eo.cveestado) = ? ");
sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM ");
sql.append(" and coalesce(ae.cveestado, eo.cveestado) = :CVEESTADO ");
sql.append("order by estadoId, fechorVenta, nombPuntoVenta, numPuntoVenta ");
return sql.toString();
@ -3840,7 +3834,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
StringBuilder sql = new StringBuilder();
sql.append("select ");
sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.caja_id as cajaId, ");
sql.append(" b.numoperacion as numoperacion, ");
sql.append(" b.numseriepreimpresa as serieCompl, ");
sql.append(" b.numfoliopreimpreso as folio, ");
@ -3881,7 +3875,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" coalesce(b.importeseguro, 0) as seguro, ");
sql.append(" coalesce(b.importeoutros, 0) as outros, ");
sql.append(" r4.numserie20 as ecf, ");
sql.append(" r4.datamov as datamov, ");
sql.append(" to_char(b.feccreacion, 'YYYYMMDD') as datamov, ");
sql.append(" r4.coo as coo, ");
sql.append(" r4.contador as ccf, ");
sql.append(" r4.impsubtotal as totalFiscal, ");
@ -3889,7 +3883,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" epv.cveestado as estadoImpressora ");
sql.append("from fiscal_r4 r4 ");
sql.append(" join fiscal_r2 r2 on r4.numserie20 = r2.numserie20 and r4.datamov = r2.datamov ");
sql.append(" join boleto b on b.boleto_id = r4.boleto_id ");
sql.append(" join caja b on b.caja_id = r4.caja_id ");
sql.append(" join marca m on b.marca_id = m.marca_id ");
sql.append(" join empresa e on e.empresa_id = m.empresa_id ");
sql.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id ");
@ -3919,15 +3913,105 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" join estado eie on eie.estado_id = cie.estado_id ");
sql.append(" join empresa_imposto ei on ei.empresa_id = e.empresa_id ");
sql.append(" and ei.estado_id = coalesce(eos.estado_id, eo.estado_id) and ei.activo = 1 ");
sql.append(" left join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) ");
sql.append(" and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL ");
sql.append(" THEN eo.estado_id ELSE eos.estado_id END) ");
sql.append(" left join aidf a on a.aidf_id = b.aidf_id ");
sql.append("where ");
sql.append(" b.tipoventa_id <> 3 ");
sql.append(" and b.rmd_id is null ");
sql.append(" and e.empresa_id = ? ");
sql.append(" and r4.datamov between ? and ? ");
sql.append(" and coalesce(eos.cveestado, eo.cveestado) = ? ");
sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM ");
sql.append(" and coalesce(eos.cveestado, eo.cveestado) = :CVEESTADO ");
sql.append(" ");
sql.append(" union ");
sql.append(" ");
sql.append("select ");
sql.append(" b.caja_id as cajaId, ");
sql.append(" b.numoperacion as numoperacion, ");
sql.append(" b.numseriepreimpresa as serieCompl, ");
sql.append(" b.numfoliopreimpreso as folio, ");
sql.append(" a.acfiscal as numAidf, ");
sql.append(" a.serie as serieAidf, ");
sql.append(" a.subserie as subSerieAidf, ");
sql.append(" trunc(b.feccreacion) as fechorVenta, ");
sql.append(" e.nombempresa as empresa, ");
sql.append(" coalesce(ie.cnpj, e.cnpj) as cnpjEmpresa, ");
sql.append(" case when ie.logradouro is null ");
sql.append(" then (e.logradouro || ', ' || e.numero || ' - ' || e.bairro || ', ' || ce.nombciudad ");
sql.append(" || ' - ' || ee.cveestado || ', ' || e.cep ) ");
sql.append(" else (ie.logradouro || ', ' || ie.numero || ' - ' || ie.bairro || ', ' || cie.nombciudad ");
sql.append(" || ' - ' || eie.cveestado || ', ' || ie.cep ) end as enderecoEmpresa, ");
sql.append(" pv.nombpuntoventa as nombPuntoVenta, ");
sql.append(" pv.numpuntoventa as numPuntoVenta, ");
sql.append(" ie.numinscricaoestadual as ieEmpresa, ");
sql.append(" coalesce(eos.estado_id, eo.estado_id) as estadoId, ");
sql.append(" coalesce(ei.icms, eo.icms) as icmsInterestadual, ");
sql.append(" ei.icmsim as icmsIntermunicipal, ");
sql.append(" coalesce(eos.cveestado, eo.cveestado) as estadoOrigem, ");
sql.append(" coalesce(eds.cveestado, ed.cveestado) as estadoDestino, ");
sql.append(" coalesce(cos.codibge, co.codibge) as municipioOrigem, ");
sql.append(" case when((coalesce(eos.cveestado, eo.cveestado)) = ");
sql.append(" (coalesce(eds.cveestado, ed.cveestado))) ");
sql.append(" then 0 else 1 ");
sql.append(" end as isInterEstadual, ");
sql.append(" ei.porcredbaseicms as redBaseCalcIcms, ");
sql.append(" ei.porcredmunicipal as porcRedMunicipal, ");
sql.append(" ei.porcredestadual as porcRedEstadual, ");
sql.append(" ei.tributacaoimportacao as tributacaoImportacao, ");
sql.append(" case when (coalesce(pos.regionmetropolitana_id, po.regionmetropolitana_id, -1) = ");
sql.append(" coalesce(pds.regionmetropolitana_id, pd.regionmetropolitana_id, -2)) ");
sql.append(" then 1 else 0 end as isenta, ");
sql.append(" coalesce(b.preciopagado, 0) as tarifa, ");
sql.append(" coalesce(b.importetaxaembarque, 0) as taxaEmbarque, ");
sql.append(" coalesce(b.importepedagio, 0) as pedagio, ");
sql.append(" coalesce(b.importeseguro, 0) as seguro, ");
sql.append(" coalesce(b.importeoutros, 0) as outros, ");
sql.append(" case when r2.numserie20 is null then 'X' else imp.numserie20 end as ecf, ");
sql.append(" to_char(b.feccreacion, 'YYYYMMDD') as datamov, ");
sql.append(" case when r2.numserie20 is null then '000000' else r4.coo end as coo, ");
sql.append(" case when r2.numserie20 is null then '000000' else r4.contador end as ccf, ");
sql.append(" r4.impsubtotal as totalFiscal, ");
sql.append(" case when r2.numserie20 is null then '000000' else r2.coo end as cooredz, ");
sql.append(" epv.cveestado as estadoImpressora ");
sql.append("from caja b ");
sql.append(" left join fiscal_impressora imp on imp.numserie = b.serieimpfiscal ");
sql.append(" left join fiscal_r4 r4 on b.caja_id = r4.caja_id ");
sql.append(" left join fiscal_r2 r2 on r2.numserie20 = imp.numserie20 and r2.datamov = to_char(b.feccreacion, 'YYYYMMDD') ");
sql.append(" join marca m on b.marca_id = m.marca_id ");
sql.append(" join empresa e on e.empresa_id = m.empresa_id ");
sql.append(" join ciudad ce on ce.ciudad_id = e.ciudad_id ");
sql.append(" join estado ee on ee.estado_id = ce.estado_id ");
sql.append(" join punto_venta pv on pv.puntoventa_id = b.puntoventa_id ");
sql.append(" left join parada ppv on ppv.parada_id = pv.parada_id ");
sql.append(" left join ciudad cpv on cpv.ciudad_id = ppv.ciudad_id ");
sql.append(" left join estado epv on epv.estado_id = cpv.estado_id ");
sql.append(" join parada po on po.parada_id = b.origen_id ");
sql.append(" join ciudad co on co.ciudad_id = po.ciudad_id ");
sql.append(" join estado eo on eo.estado_id = co.estado_id ");
sql.append(" join parada pd on pd.parada_id = b.destino_id ");
sql.append(" join ciudad cd on cd.ciudad_id = pd.ciudad_id ");
sql.append(" join estado ed on ed.estado_id = cd.estado_id ");
sql.append(" left join alias_servico s on s.origen_id = b.origen_id ");
sql.append(" and s.destino_id = b.destino_id and (s.corrida_id = b.corrida_id or s.corrida_id is null) ");
sql.append(" and s.ruta_id = b.ruta_id ");
sql.append(" left join parada pos on pos.parada_id = s.aliasorigen_id ");
sql.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id ");
sql.append(" left join estado eos on eos.estado_id = cos.estado_id ");
sql.append(" left join parada pds on pds.parada_id = s.aliasdestino_id ");
sql.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id ");
sql.append(" left join estado eds on eds.estado_id = cds.estado_id ");
sql.append(" join inscricao_estadual ie on e.empresa_id = ie.empresa_id ");
sql.append(" and ie.estado_id = coalesce(eos.estado_id, eo.estado_id) and ie.activo = 1 ");
sql.append(" join ciudad cie on cie.ciudad_id = ie.ciudad_id ");
sql.append(" join estado eie on eie.estado_id = cie.estado_id ");
sql.append(" join empresa_imposto ei on ei.empresa_id = e.empresa_id ");
sql.append(" and ei.estado_id = coalesce(eos.estado_id, eo.estado_id) and ei.activo = 1 ");
sql.append(" left join aidf a on a.aidf_id = b.aidf_id ");
sql.append("where b.tipoventa_id <> 3 ");
sql.append(" and b.serieimpfiscal is not null and r4.caja_id is null");
sql.append(" and ((b.indreimpresion = 0 and b.motivocancelacion_id is null and b.numfoliosistema is not null) or (b.indstatusboleto = 'E' and b.indreimpresion = 1)) ");
sql.append(" and e.empresa_id = :EMPRESA_ID ");
sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM ");
sql.append(" and coalesce(eos.cveestado, eo.cveestado) = :CVEESTADO ");
sql.append(" ");
sql.append("order by estadoId, datamov, ecf, coo ");
return sql.toString();
@ -3937,7 +4021,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
StringBuilder sql = new StringBuilder();
sql.append("select ");
sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.caja_id as cajaId, ");
sql.append(" b.numoperacion as numoperacion, ");
sql.append(" b.numseriepreimpresa as serieCompl, ");
sql.append(" b.numfoliopreimpreso as folio, ");
@ -3979,9 +4063,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" coalesce(b.importeoutros, 0) as outros, ");
sql.append(" b.rmd_id as rmd_id, ");
sql.append(" b.foliormd as foliormd ");
sql.append("from boleto b ");
sql.append("from caja b ");
sql.append(isECF ? " join fiscal_r4 r4 on b.boleto_id = r4.boleto_id " : "");
sql.append(isECF ? " join fiscal_r4 r4 on b.caja_id = r4.caja_id " : "");
sql.append(isECF ? " join fiscal_r2 r2 on r4.numserie20 = r2.numserie20 and r4.datamov = r2.datamov " : "");
sql.append(" inner join marca m on b.marca_id = m.marca_id ");
@ -4010,17 +4094,12 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" join estado eie on eie.estado_id = cie.estado_id ");
sql.append(" left join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id ");
sql.append(" and ei.estado_id = coalesce(eos.estado_id, eo.estado_id) and ei.activo = 1 ");
sql.append(" left join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) ");
sql.append(" and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL ");
sql.append(" THEN eo.estado_id ELSE eos.estado_id END) ");
sql.append("where e.empresa_id = ? ");
sql.append(isECF ? " and r4.datamov between ? and ? " : "");
sql.append(isManual ? " and b.feccreacion between ? and ? " : "");
sql.append(" and coalesce(eos.cveestado, eo.cveestado) = ? ");
sql.append(" and b.rmd_id = ? ");
sql.append(" and b.foliormd between ? and ? ");
sql.append(" left join aidf a on a.aidf_id = b.aidf_id ");
sql.append("where e.empresa_id = :EMPRESA_ID ");
sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM ");
sql.append(" and coalesce(eos.cveestado, eo.cveestado) = :CVEESTADO ");
sql.append(" and b.rmd_id = :RMD_ID ");
sql.append(" and b.foliormd between :FOLIO_INICIAL and :FOLIO_FINAL ");
return sql.toString();
}
@ -4157,9 +4236,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
passagem = somarTotalBilhete(det, isReceitaTerceiros);
if (det.isInterEstadual()) {
aliquota = det.getIcmsInterestadual() != null ? det.getIcmsInterestadual() : det.getTributacaoImportacao();
aliquota = det.getTributacaoImportacao() != null ? det.getTributacaoImportacao() : det.getIcmsInterestadual();
} else {
aliquota = det.getIcmsIntermunicipal() != null ? det.getIcmsIntermunicipal() : det.getTributacaoImportacao();
aliquota = det.getTributacaoImportacao() != null ? det.getTributacaoImportacao() : det.getIcmsIntermunicipal();
}
if (det.isInterEstadual()) {

10
src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/DetalhadoRMD.java
View File

@ -5,7 +5,7 @@ import java.util.Date;
public class DetalhadoRMD {
private Long boletoId;
private Long cajaId;
private String numoperacion;
private String serie;
private Integer folio;
@ -46,12 +46,12 @@ public class DetalhadoRMD {
private Integer rmdId;
private String foliormd;
public Long getBoletoId() {
return boletoId;
public Long getCajaId() {
return cajaId;
}
public void setBoletoId(Long boletoId) {
this.boletoId = boletoId;
public void setCajaId(Long cajaId) {
this.cajaId = cajaId;
}
public String getNumoperacion() {