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

fixed bug #7908 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@61054 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-10-03 14:25:50 +00:00
parent f471fc5dc6
commit 3cb5935ff3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -674,7 +674,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("B.NOMBPASAJERO AS \"nombpasajero\", E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", ") .append("B.NOMBPASAJERO AS \"nombpasajero\", E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", ")
.append("B.FECCORRIDA AS \"feccorrida\", B.CORRIDA_ID \"corridaId\", B.BOLETOORIGINAL_ID AS \"boletoOriginalId\", ") .append("B.FECCORRIDA AS \"feccorrida\", B.CORRIDA_ID \"corridaId\", B.BOLETOORIGINAL_ID AS \"boletoOriginalId\", ")
.append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\", ") .append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\", ")
.append("tarifa.PRECIO AS \"valorBilhete\"") .append("NVL(tarifa.PRECIO,0) + NVL(tarifa.IMPORTEPEDAGIO,0) + NVL(tarifa.IMPORTETAXAEMBARQUE,0) + NVL(tarifa.IMPORTESEGURO,0) + NVL(tarifa.IMPORTEOUTROS,0) AS \"valorTabela\"")
.append("FROM BOLETO B ") .append("FROM BOLETO B ")
.append("LEFT JOIN BOLETO BO1 ON BO1.BOLETO_ID = B.BOLETOORIGINAL_ID ") .append("LEFT JOIN BOLETO BO1 ON BO1.BOLETO_ID = B.BOLETOORIGINAL_ID ")
.append("LEFT JOIN BOLETO BO2 ON BO2.BOLETO_ID = BO1.BOLETOORIGINAL_ID ") .append("LEFT JOIN BOLETO BO2 ON BO2.BOLETO_ID = BO1.BOLETOORIGINAL_ID ")
@ -721,7 +721,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.addScalar("numFolioPreImpreso", Hibernate.STRING) .addScalar("numFolioPreImpreso", Hibernate.STRING)
.addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING) .addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING)
.addScalar("valorpagado", Hibernate.BIG_DECIMAL) .addScalar("valorpagado", Hibernate.BIG_DECIMAL)
.addScalar("valorBilhete", Hibernate.BIG_DECIMAL) .addScalar("valorTabela", Hibernate.BIG_DECIMAL)
.addScalar("seguroOutros", Hibernate.BIG_DECIMAL) .addScalar("seguroOutros", Hibernate.BIG_DECIMAL)
.addScalar("pedagio", Hibernate.BIG_DECIMAL) .addScalar("pedagio", Hibernate.BIG_DECIMAL)
.addScalar("seguro", Hibernate.BIG_DECIMAL) .addScalar("seguro", Hibernate.BIG_DECIMAL)

12
src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
View File

@ -24,7 +24,7 @@ public class BoletoComissao {
private Integer motivoCancelacionOriginal2; private Integer motivoCancelacionOriginal2;
private String descmotivocancelacion; private String descmotivocancelacion;
private BigDecimal valorpagado; private BigDecimal valorpagado;
private BigDecimal valorBilhete; private BigDecimal valorTabela;
private BigDecimal seguro; private BigDecimal seguro;
private BigDecimal pedagio; private BigDecimal pedagio;
private BigDecimal embarque; private BigDecimal embarque;
@ -372,7 +372,7 @@ public class BoletoComissao {
.add(getEmbarque()) .add(getEmbarque())
.add(getSeguro()) .add(getSeguro())
.add(getPedagio()) .add(getPedagio())
.add(getSeguro()); .add(getSeguroOutros());
} }
public String getDescTipoVenta() { public String getDescTipoVenta() {
@ -868,12 +868,12 @@ public class BoletoComissao {
this.corridaId = corridaId; this.corridaId = corridaId;
} }
public BigDecimal getValorBilhete() { public BigDecimal getValorTabela() {
return valorBilhete; return valorTabela;
} }
public void setValorBilhete(BigDecimal valorBilhete) { public void setValorTabela(BigDecimal valorTabela) {
this.valorBilhete = valorBilhete; this.valorTabela = valorTabela;
} }
public String getFeccorridaServico() { public String getFeccorridaServico() {