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

fixes bug#11035 

dev: julio
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@83374 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-07-13 20:38:55 +00:00
parent a54463fb9d
commit bf8910ff4f
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,13 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
sql.append(" and bpe.tipoamb = 1 "); sql.append(" and bpe.tipoamb = 1 ");
sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) ");
sql.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 "); sql.append(" and ((case when coalesce(r.indtribtarifa,0) = 1 then c.preciopagado else 0 end) + (case when coalesce(r.indtribtaxaembarque,0) = 1 then c.importetaxaembarque else 0 end) + (case when coalesce(r.indtribpedagio,0) = 1 then c.importepedagio else 0 end)) > 0 ");
sql.append(" and c.feccreacion >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
// sql.append(" and c.feccreacion >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and c.feccreacion <= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and (case when (case when s.aliasorigen_id is null then ei.indtribviagem else eis.indtribviagem end) = 1 then ");
sql.append(" c.fechorviaje else c.feccreacion end) >= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and (case when (case when s.aliasorigen_id is null then ei.indtribviagem else eis.indtribviagem end) = 1 then ");
sql.append(" c.fechorviaje else c.feccreacion end) <= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
sql.append(" and c.empresacorrida_id = ? "); sql.append(" and c.empresacorrida_id = ? ");
sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = ?) "); sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) = ?) ");
sql.append(" order by dhrecbto, numfoliosistema "); sql.append(" order by dhrecbto, numfoliosistema ");
@ -123,8 +129,6 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
ResultSet rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
// ExportacaoBPEBase registro = null;
while (rs.next()) { while (rs.next()) {
BigDecimal valortributado = BigDecimal.ZERO; BigDecimal valortributado = BigDecimal.ZERO;
BigDecimal valortotal = BigDecimal.ZERO; BigDecimal valortotal = BigDecimal.ZERO;

3
src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java
View File

@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -130,7 +131,7 @@ public class ExportacaoBpe {
String tipoBPe = tipoBPE.getTipoBPe(); String tipoBPe = tipoBPE.getTipoBPe();
String chaveEletRef = VAZIO; String chaveEletRef = VAZIO;
// String chaveEletRef = tipoBPE.getChaveEletronicaReferencia(); // String chaveEletRef = tipoBPE.getChaveEletronicaReferencia();
String codigoContabil = VAZIO; String codigoContabil = StringUtils.isBlank(tipoBPE.getCodigoContabil()) ? VAZIO : tipoBPE.getCodigoContabil();
String codigoPrevidenciaria = tipoBPE.getIndContribuicaoPrevidenciaria(); String codigoPrevidenciaria = tipoBPE.getIndContribuicaoPrevidenciaria();
String codigoComplementar = VAZIO; String codigoComplementar = VAZIO;
String observacao = VAZIO; String observacao = VAZIO;

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

@ -58,8 +58,8 @@ public class ExportacaoBPEVo {
String indContribuicaoPrevidenciaria = "00000060"; String indContribuicaoPrevidenciaria = "00000060";
boolean isInterEstadual = registro.getEstadoOrigem().equals(registro.getEstadoDestino()); boolean isInterMunicipal = registro.getEstadoOrigem().equals(registro.getEstadoDestino());
String codigoContabil = isInterEstadual ? registro.getCodigoContabilEstadual() : registro.getCodigocontabilMunicipal(); String codigoContabil = isInterMunicipal ? registro.getCodigocontabilMunicipal() : registro.getCodigoContabilEstadual();
boolean isCancelamento = (registro.getCodstatus() == null ? false : (registro.getCodstatus().equals(StatusBpe.EVENTOS))); boolean isCancelamento = (registro.getCodstatus() == null ? false : (registro.getCodstatus().equals(StatusBpe.EVENTOS)));
String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "2"); String tpDoc = isCancelamento ? "1" : (StringUtils.isBlank(registro.getChbpeSub()) ? "0" : "2");
@ -100,7 +100,7 @@ public class ExportacaoBPEVo {
String tpBpe = (StringUtils.isBlank(registro.getChbpeSub()) ? "1" : "2"); String tpBpe = (StringUtils.isBlank(registro.getChbpeSub()) ? "1" : "2");
// String tpBpe = tbpe.getInfBPe().getIde().getTpBPe(); // String tpBpe = tbpe.getInfBPe().getIde().getTpBPe();
String chbpeSub = tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe(); String chbpeSub = tbpe.getInfBPe().getInfBPeSub() == null ? "" : tbpe.getInfBPe().getInfBPeSub().getChBPe();
ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(), ExportacaoBPETipoBPE tipoBPE = new ExportacaoBPETipoBPE(registro.getCodEstabelecimento(), registro.getChbpe(), registro.getNumSerieBpe(),
registro.getNumBpe(), registro.getDhrecbto(), tpDoc, registro.getDhEmisao(), valorBruto, registro.getNumBpe(), registro.getDhrecbto(), tpDoc, registro.getDhEmisao(), valorBruto,
registro.getvDesconto(), estadoOrigem, municipioOrigem, estadoDestino, municipioDestino, registro.getvDesconto(), estadoOrigem, municipioOrigem, estadoDestino, municipioDestino,
@ -109,8 +109,8 @@ public class ExportacaoBPEVo {
registro.getListaRegistroBPE().add(tipoBPE); registro.getListaRegistroBPE().add(tipoBPE);
String cfop = isInterEstadual ? "5357" : "6357"; String cfop = isInterMunicipal ? "5357" : "6357";
String cstb = isInterEstadual ? (registro.getRedBaseCalcEstadual() == null || registro.getRedBaseCalcEstadual().equals(ZERO)) ? "00" : "20" String cstb = isInterMunicipal ? (registro.getRedBaseCalcEstadual() == null || registro.getRedBaseCalcEstadual().equals(ZERO)) ? "00" : "20"
: (registro.getRedBaseCalcMunicipal() == null || registro.getRedBaseCalcMunicipal().equals(ZERO)) ? "00" : "20"; : (registro.getRedBaseCalcMunicipal() == null || registro.getRedBaseCalcMunicipal().equals(ZERO)) ? "00" : "20";
String csosnb = ""; String csosnb = "";