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

fixes bug#13207 

dev:julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@88701 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-01-10 02:10:43 +00:00
parent 8b8d4a4b2e
commit cfa7a7b6f6
3 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import com.rjconsultores.ventaboletos.utilerias.DateUtil;
import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEBase;
import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo;
import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo.TipoComp;
import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil;
import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.DetalhadoFiscal;
import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.FiscalRdi;
import com.rjconsultores.ventaboletos.utilerias.fiscal.vo.RdiValidacion;
@ -377,10 +378,9 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
boolean isEstadual = det.isInterEstadual();
String tipoViagem = isEstadual ? "IE" : "IM";
ExportacaoBPEVo exportacaoBPEVo = new ExportacaoBPEVo();
TBPe tbpe = null;
if (StringUtils.isNotBlank(xml))
tbpe = exportacaoBPEVo.convertXmlToBpe(xml);
tbpe = BPeUtil.convertXmlToBpe(xml);
String vBC = null;
String pICMS = null;
@ -488,7 +488,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
TBPe tbpe = null;
if (StringUtils.isNotBlank(xml))
tbpe = new ExportacaoBPEVo().convertXmlToBpe(xml);
tbpe = BPeUtil.convertXmlToBpe(xml);
DetalhadoFiscal df = new DetalhadoFiscal();
df.setXml(xml);

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

@ -1,25 +1,18 @@
package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe;
import java.io.StringReader;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal;
import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml.BPeUtil;
import br.inf.portalfiscal.bpe.TBPe;
public class ExportacaoBPEVo {
private static Logger log = Logger.getLogger(ExportacaoBPEVo.class);
static String VAZIO = "";
static final BigDecimal ZERO = BigDecimal.ZERO;
@ -81,7 +74,7 @@ public class ExportacaoBPEVo {
String xml = StringUtils.isNotBlank(registro.getXmlAnterior()) ? registro.getXmlAnterior() : registro.getXml();
if (StringUtils.isNotBlank(xml))
tbpe = convertXmlToBpe(xml);
tbpe = BPeUtil.convertXmlToBpe(xml);
String municipioOrigem = StringUtils.substring((StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getCMunIni() : registro.getMunicipioOrigem()), 2);
String municipioDestino = StringUtils.substring((StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getCMunFim() : registro.getMunicipioDestino()), 2);
@ -211,18 +204,4 @@ public class ExportacaoBPEVo {
this.getListaRegistroBaseBPE().add(registro);
}
public TBPe convertXmlToBpe(String xml) {
TBPe objeto = null;
if (xml != null) {
try {
JAXBContext jaxbContext = JAXBContext.newInstance(TBPe.class);
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
StringReader reader = new StringReader(xml);
objeto = (TBPe) unmarshaller.unmarshal(reader);
} catch (JAXBException e) {
log.info("Nao encontrou o xml bpe");
}
}
return objeto;
}
}

34
src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java 100644
View File

@ -0,0 +1,34 @@
package com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.xml;
import java.io.StringReader;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.utilerias.exportacao.bpe.ExportacaoBPEVo;
import br.inf.portalfiscal.bpe.TBPe;
public class BPeUtil {
private static Logger log = Logger.getLogger(ExportacaoBPEVo.class);
public static TBPe convertXmlToBpe(String xml) {
TBPe objeto = null;
if (xml != null) {
try {
JAXBContext jaxbContext = JAXBContext.newInstance(TBPe.class);
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
StringReader reader = new StringReader(xml);
objeto = (TBPe) unmarshaller.unmarshal(reader);
} catch (JAXBException e) {
log.info("Nao encontrou o xml bpe");
}
}
return objeto;
}
}