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

fixes bug#13207 

dev:julio
qua:julio

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

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

@ -163,12 +163,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
String xml_bpe = rs.getNString("xml_bpe"); String xml_bpe = rs.getNString("xml_bpe");
String xml_bpe_2 = rs.getNString("xml_bpe_2"); String xml_bpe_2 = rs.getNString("xml_bpe_2");
String xml_bpe_3 = rs.getNString("xml_bpe_3"); String xml_bpe_3 = rs.getNString("xml_bpe_3");
String[] array = new String[3]; registro.setXml(StringUtils.join(new String[] { xml_bpe, xml_bpe_2, xml_bpe_3 }));
array[0] = xml_bpe;
array[1] = xml_bpe_2;
array[2] = xml_bpe_3;
String xmlBpe = StringUtils.join(array);
registro.setXml(xmlBpe);
if (exportacaoBPEVo.isBpeCanceladoENaoEmbarque(registro)) { if (exportacaoBPEVo.isBpeCanceladoENaoEmbarque(registro)) {
String xmlAnterior = buscarXmlBPE(connection, (StringUtils.isBlank(registro.getChbpeSub()) ? registro.getChbpe() : registro.getChbpeSub())); String xmlAnterior = buscarXmlBPE(connection, (StringUtils.isBlank(registro.getChbpeSub()) ? registro.getChbpe() : registro.getChbpeSub()));
@ -241,16 +236,10 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
ResultSet rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
while (rs.next()) { while (rs.next()) {
String xml_bpe = rs.getNString("xml_bpe"); String xml_bpe = rs.getNString("xml_bpe");
String xml_bpe_2 = rs.getNString("xml_bpe_2"); String xml_bpe_2 = rs.getNString("xml_bpe_2");
String xml_bpe_3 = rs.getNString("xml_bpe_3"); String xml_bpe_3 = rs.getNString("xml_bpe_3");
String[] array = new String[3]; xmlBpe = StringUtils.join(new String[] { xml_bpe, xml_bpe_2, xml_bpe_3 });
array[0] = xml_bpe;
array[1] = xml_bpe_2;
array[2] = xml_bpe_3;
xmlBpe = StringUtils.join(array);
} }
rs.close(); rs.close();
@ -495,11 +484,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
String xml_bpe = rs.getNString("xml_bpe"); String xml_bpe = rs.getNString("xml_bpe");
String xml_bpe_2 = rs.getNString("xml_bpe_2"); String xml_bpe_2 = rs.getNString("xml_bpe_2");
String xml_bpe_3 = rs.getNString("xml_bpe_3"); String xml_bpe_3 = rs.getNString("xml_bpe_3");
String[] array = new String[3]; String xml = StringUtils.join(new String[] { xml_bpe, xml_bpe_2, xml_bpe_3 });
array[0] = xml_bpe;
array[1] = xml_bpe_2;
array[2] = xml_bpe_3;
String xml = StringUtils.join(array);
TBPe tbpe = null; TBPe tbpe = null;
if (StringUtils.isNotBlank(xml)) if (StringUtils.isNotBlank(xml))
@ -513,13 +498,10 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
String estadoDestino = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFFim().value() : rs.getString("estadoDestino")); String estadoDestino = (StringUtils.isNotBlank(xml) ? tbpe.getInfBPe().getIde().getUFFim().value() : rs.getString("estadoDestino"));
boolean isInterEstadual = !estadoOrigem.equals(estadoDestino); boolean isInterEstadual = !estadoOrigem.equals(estadoDestino);
df.setEstadoOrigem(estadoOrigem); df.setEstadoOrigem(estadoOrigem);
df.setEstadoDestino(estadoDestino); df.setEstadoDestino(estadoDestino);
df.setMunicipioOrigem(municipioOrigem); df.setMunicipioOrigem(municipioOrigem);
df.setInterEstadual(isInterEstadual); df.setInterEstadual(isInterEstadual);
df.setCajaId(rs.getLong("cajaId")); df.setCajaId(rs.getLong("cajaId"));
df.setTipoReceita(rs.getString("tipoReceita")); df.setTipoReceita(rs.getString("tipoReceita"));
df.setNumoperacion(rs.getString("numoperacion")); df.setNumoperacion(rs.getString("numoperacion"));
@ -527,7 +509,6 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
df.setFechorVenta(rs.getDate("fechorVenta")); df.setFechorVenta(rs.getDate("fechorVenta"));
df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual"));
df.setIcmsIntermunicipal(rs.getBigDecimal("icmsIntermunicipal")); df.setIcmsIntermunicipal(rs.getBigDecimal("icmsIntermunicipal"));
df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual")); df.setIcmsInterestadual(rs.getBigDecimal("icmsInterestadual"));
df.setRedBaseCalcIcms(rs.getBigDecimal("redBaseCalcIcms")); df.setRedBaseCalcIcms(rs.getBigDecimal("redBaseCalcIcms"));
df.setPorcRedMunicipal(rs.getBigDecimal("porcRedMunicipal")); df.setPorcRedMunicipal(rs.getBigDecimal("porcRedMunicipal"));
@ -541,17 +522,13 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
df.setIndSeguroEstadual(rs.getBoolean("indseguroestadual")); df.setIndSeguroEstadual(rs.getBoolean("indseguroestadual"));
df.setIndTxembarqueEstadual(rs.getBoolean("indtxembarqueestadual")); df.setIndTxembarqueEstadual(rs.getBoolean("indtxembarqueestadual"));
df.setIndPedagioEstdual(rs.getBoolean("indpedagioestdual")); df.setIndPedagioEstdual(rs.getBoolean("indpedagioestdual"));
df.setIsenta(rs.getBoolean("isenta")); df.setIsenta(rs.getBoolean("isenta"));
df.setTarifa(rs.getBigDecimal("tarifa")); df.setTarifa(rs.getBigDecimal("tarifa"));
df.setTaxaEmbarque(rs.getBigDecimal("taxaEmbarque")); df.setTaxaEmbarque(rs.getBigDecimal("taxaEmbarque"));
df.setPedagio(rs.getBigDecimal("pedagio")); df.setPedagio(rs.getBigDecimal("pedagio"));
df.setSeguro(rs.getBigDecimal("seguro")); df.setSeguro(rs.getBigDecimal("seguro"));
df.setOutros(rs.getBigDecimal("outros")); df.setOutros(rs.getBigDecimal("outros"));
df.setDatamov(rs.getString("datamov")); df.setDatamov(rs.getString("datamov"));
list.add(df); list.add(df);
} }