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

bug#11600 

dev: julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@84264 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-08-15 12:51:00 +00:00
parent 88cdba3644
commit 03f45f5dd5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
View File

@ -105,7 +105,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and (case when ei.indtribviagem = 1 then c.fechorviaje else c.feccreacion end) <= to_date(?,'DD/MM/YYYY HH24:MI:SS')");
sql.append(" and ep.empresa_id = ? ");
sql.append(" and e.cveestado = ? ");
sql.append("order by to_number(c.num_bpe), dhrecbto ");
sql.append("order by to_number(c.numfoliosistema), to_number(c.num_bpe), dhrecbto ");
try {
PreparedStatement ps = connection.prepareStatement(sql.toString());

5
src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/ExportacaoBPEVo.java
View File

@ -81,11 +81,12 @@ public class ExportacaoBPEVo {
String codigoContabil = isInterMunicipal ? registro.getCodigocontabilMunicipal() : registro.getCodigoContabilEstadual();
String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "0");
String numBpe = StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getNBP() : registro.getNumBpe();
if (isCancelamento) {
ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(),
registro.getNumBpe(), registro.getDhrecbto(), tpDoc, VAZIO, null, null,
numBpe, registro.getDhrecbto(), tpDoc, VAZIO, null, null,
VAZIO, VAZIO, VAZIO, VAZIO, VAZIO, null, VAZIO, VAZIO, VAZIO,
VAZIO, registro.getRetorno(), VAZIO);
@ -124,7 +125,7 @@ public class ExportacaoBPEVo {
String tpBpe = StringUtils.isBlank(xml) ? "" : (StringUtils.isBlank(tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe()) ? "1" : "2");
ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(),
registro.getNumBpe(), registro.getDhrecbto(), tpDoc, registro.getDhEmisao(), valorBruto,
numBpe, registro.getDhrecbto(), tpDoc, registro.getDhEmisao(), valorBruto,
desconto, estadoOrigem, municipioOrigem, estadoDestino, municipioDestino,
cstCofins, receitaTriCofins, tpBpe, chbpeSub, codigoContabil,
indContribuicaoPrevidenciaria, registro.getRetorno(), cstPis);