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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@34199 d1611594-4594-4d17-8e1d-87c2c4800839

master
gleimar 2014-03-19 13:53:02 +00:00
parent 807801a228
commit 22facb57b5
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
.addScalar("origen", StringType.INSTANCE) .addScalar("origen", StringType.INSTANCE)
.addScalar("destino", StringType.INSTANCE) .addScalar("destino", StringType.INSTANCE)
.addScalar("corridaId", IntegerType.INSTANCE) .addScalar("corridaId", IntegerType.INSTANCE)
.addScalar("precioBase", BigDecimalType.INSTANCE) .addScalar("precioPagado", BigDecimalType.INSTANCE)
.addScalar("fecHorVenta", DateType.INSTANCE) .addScalar("fecHorVenta", DateType.INSTANCE)
.addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE) .addScalar("importeTaxaEmbarque", BigDecimalType.INSTANCE)
.addScalar("ruta", StringType.INSTANCE) .addScalar("ruta", StringType.INSTANCE)

3
src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
View File

@ -651,8 +651,7 @@ public class SQLBuilderOracle implements SQLBuilder {
sb.append(" ori.descparada as \"origen\", "); sb.append(" ori.descparada as \"origen\", ");
sb.append(" des.descparada as \"destino\", "); sb.append(" des.descparada as \"destino\", ");
sb.append(" c.CORRIDA_ID as \"corridaId\", "); sb.append(" c.CORRIDA_ID as \"corridaId\", ");
sb.append(" (case when c.motivocancelacion_id is null then c.PRECIOBASE else c.PRECIOBASE * -1 end) as \"precioBase\", "); sb.append(" (case when c.motivocancelacion_id is null then c.PRECIOPAGADO else c.PRECIOPAGADO * -1 end) as \"precioPagado\", ");
sb.append(" c.PRECIOPAGADO as \"precioPagado\", ");
sb.append(" c.FECHORVENTA as \"fecHorVenta\", "); sb.append(" c.FECHORVENTA as \"fecHorVenta\", ");
sb.append(" c.IMPORTETAXAEMBARQUE as \"importeTaxaEmbarque\", "); sb.append(" c.IMPORTETAXAEMBARQUE as \"importeTaxaEmbarque\", ");
sb.append(" ru.descruta as \"ruta\", "); sb.append(" ru.descruta as \"ruta\", ");

15
src/com/rjconsultores/ventaboletos/vo/caja/CajaCerradoVO.java
View File

@ -15,7 +15,7 @@ public class CajaCerradoVO {
private String origen; private String origen;
private String destino; private String destino;
private Integer corridaId; private Integer corridaId;
private BigDecimal precioBase; private BigDecimal precioPagado;
private Date fecHorVenta; private Date fecHorVenta;
private BigDecimal importeTaxaEmbarque; private BigDecimal importeTaxaEmbarque;
private String ruta; private String ruta;
@ -31,7 +31,7 @@ public class CajaCerradoVO {
this.origen = ""; this.origen = "";
this.destino = ""; this.destino = "";
this.corridaId = new Integer(-1); this.corridaId = new Integer(-1);
this.precioBase = new BigDecimal(0); this.precioPagado = new BigDecimal(0);
this.fecHorVenta = new Date(); this.fecHorVenta = new Date();
this.importeTaxaEmbarque = new BigDecimal(0); this.importeTaxaEmbarque = new BigDecimal(0);
this.ruta = ""; this.ruta = "";
@ -72,12 +72,15 @@ public class CajaCerradoVO {
public void setCorridaId(Integer corridaId) { public void setCorridaId(Integer corridaId) {
this.corridaId = corridaId; this.corridaId = corridaId;
} }
public BigDecimal getPrecioBase() {
return precioBase; public BigDecimal getPrecioPagado() {
return precioPagado;
} }
public void setPrecioBase(BigDecimal precioBase) {
this.precioBase = precioBase; public void setPrecioPagado(BigDecimal precioPagado) {
this.precioPagado = precioPagado;
} }
public Date getFecHorVenta() { public Date getFecHorVenta() {
return fecHorVenta; return fecHorVenta;
} }