From ea58d7b75b4e7db88acec2eb9f7c7144359fa97f Mon Sep 17 00:00:00 2001 From: carla Date: Mon, 29 Oct 2012 20:24:08 +0000 Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=A3o=20do=20cadastro=20de=20pont?= =?UTF-8?q?o=20de=20venda=20(agencia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@22268 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../entidad/PtovtaAntecipacomissao.java | 23 +++--- .../ventaboletos/entidad/PtovtaEstoque.java | 35 +++++++- .../ventaboletos/entidad/PtovtaHorario.java | 8 +- .../ventaboletos/entidad/PtovtaTitular.java | 26 +++--- .../ventaboletos/entidad/PuntoVenta.java | 79 ++++++++++++------- 5 files changed, 118 insertions(+), 53 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java index d94c7122c..85be98644 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaAntecipacomissao.java @@ -5,15 +5,19 @@ package com.rjconsultores.ventaboletos.entidad; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -23,13 +27,14 @@ import javax.persistence.TemporalType; * @author Rafael */ @Entity +@SequenceGenerator(name = "PTOVTA_ANTECIPACOMISSAO_SEQ", sequenceName = "PTOVTA_ANTECIPACOMISSAO_SEQ", allocationSize = 1) @Table(name = "PTOVTA_ANTECIPACOMISSAO") -@NamedQueries({ - @NamedQuery(name = "PtovtaAntecipacomissao.findAll", query = "SELECT p FROM PtovtaAntecipacomissao p")}) + public class PtovtaAntecipacomissao implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_ANTECIPACOMISSAO_SEQ") @Column(name = "ID") private Integer id; @@ -38,10 +43,10 @@ public class PtovtaAntecipacomissao implements Serializable { private Date data; @Column(name = "RETEM") - private int retem; + private BigDecimal retem; @Basic(optional = false) @Column(name = "PERCENTUAL") - private int percentual; + private BigDecimal percentual; @Column(name = "ACTIVO") private Boolean activo; @@ -63,7 +68,7 @@ public class PtovtaAntecipacomissao implements Serializable { this.id = id; } - public PtovtaAntecipacomissao(Integer id, Date data, int retem, int percentual, Boolean activo, Date fecmodif, int usuarioId) { + public PtovtaAntecipacomissao(Integer id, Date data, BigDecimal retem, BigDecimal percentual, Boolean activo, Date fecmodif, int usuarioId) { this.id = id; this.data = data; this.retem = retem; @@ -89,19 +94,19 @@ public class PtovtaAntecipacomissao implements Serializable { this.data = data; } - public int getRetem() { + public BigDecimal getRetem() { return retem; } - public void setRetem(int retem) { + public void setRetem(BigDecimal retem) { this.retem = retem; } - public int getPercentual() { + public BigDecimal getPercentual() { return percentual; } - public void setPercentual(int percentual) { + public void setPercentual(BigDecimal percentual) { this.percentual = percentual; } diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java index 19b4e8617..26369588d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEstoque.java @@ -5,7 +5,10 @@ package com.rjconsultores.ventaboletos.entidad; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; +import java.util.List; + import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -65,6 +68,18 @@ public class PtovtaEstoque implements Serializable { public PtovtaEstoque(Integer id) { this.id = id; } + + + private static List formList = new ArrayList(); + private static List loteList = new ArrayList(); + + static{ + formList.add("SIM"); + formList.add("NÃO"); + + loteList.add("SIM"); + loteList.add("NÃO"); + } public PtovtaEstoque(Integer id, String especie, short formCont, long quantidade, long loteform, Boolean activo, Date fecmodif, int usuarioId) { this.id = id; @@ -148,8 +163,26 @@ public class PtovtaEstoque implements Serializable { public void setPuntoventaId(PuntoVenta puntoventaId) { this.puntoventaId = puntoventaId; } + + - @Override + public static List getFormList() { + return formList; + } + + public static void setFormList(List formList) { + PtovtaEstoque.formList = formList; + } + + public static List getLoteList() { + return loteList; + } + + public static void setLoteList(List loteList) { + PtovtaEstoque.loteList = loteList; + } + + @Override public int hashCode() { int hash = 0; hash += (id != null ? id.hashCode() : 0); diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java index bbcdf061c..f12e6d799 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaHorario.java @@ -9,11 +9,14 @@ import java.util.Date; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -23,13 +26,14 @@ import javax.persistence.TemporalType; * @author Rafael */ @Entity +@SequenceGenerator(name = "PTOVTA_HORARIO_SEQ", sequenceName = "PTOVTA_HORARIO_SEQ", allocationSize = 1) @Table(name = "PTOVTA_HORARIO") -@NamedQueries({ - @NamedQuery(name = "PtovtaHorario.findAll", query = "SELECT p FROM PtovtaHorario p")}) + public class PtovtaHorario implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTA_HORARIO_SEQ") @Column(name = "ID") private Integer id; diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java index b09f994c9..6762d5a9a 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaTitular.java @@ -6,7 +6,10 @@ package com.rjconsultores.ventaboletos.entidad; import java.io.Serializable; import java.util.Date; +import java.util.List; + import javax.persistence.Basic; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -17,6 +20,7 @@ import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; @@ -61,10 +65,9 @@ public class PtovtaTitular implements Serializable { private Date fecmodif; @Column(name = "USUARIO_ID") - private int usuarioId; - @JoinColumn(name = "PUNTOVENTA_ID", referencedColumnName = "PUNTOVENTA_ID") - @ManyToOne - private PuntoVenta puntoventaId; + private int usuarioId; + @OneToMany(cascade = CascadeType.ALL, mappedBy = "titularId") + private List puntoVentaList; public PtovtaTitular() { } @@ -156,15 +159,16 @@ public class PtovtaTitular implements Serializable { this.usuarioId = usuarioId; } - public PuntoVenta getPuntoventaId() { - return puntoventaId; - } + + public List getPuntoVentaList() { + return puntoVentaList; + } - public void setPuntoventaId(PuntoVenta puntoventaId) { - this.puntoventaId = puntoventaId; - } + public void setPuntoVentaList(List puntoVentaList) { + this.puntoVentaList = puntoVentaList; + } - @Override + @Override public int hashCode() { int hash = 0; hash += (id != null ? id.hashCode() : 0); diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java index 183f2e18c..25aaa46e1 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java @@ -110,18 +110,14 @@ public class PuntoVenta implements Serializable { private String compl; // @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") // private List ptovtaEstoqueList; -// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") -// private List ptovtaTitularList; -// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") -// private List ptovtaHorarioList; + @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") + private List ptovtaHorarioList; // @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") // private List ptovtaComissaoList; // @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") // private List ptovtaDiversosList; -// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") -// private List ptovtaAgenciaList; -// @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") -// private List ptovtaAntecipacomissaoList; + @OneToMany(cascade = CascadeType.ALL, mappedBy = "puntoventaId") + private List ptovtaAntecipacomissaoList; //@JoinColumn(name = "AGENCIA_ID", referencedColumnName = "ID") @@ -153,6 +149,9 @@ public class PuntoVenta implements Serializable { } public PuntoVenta() { + this.colonia = new Colonia(); + this.agenciaId = new PtovtaAgenciaBancaria(); + this.titularId = new PtovtaTitular(); } public PuntoVenta(Integer puntoventaId) { @@ -378,21 +377,27 @@ public class PuntoVenta implements Serializable { // this.ptovtaEstoqueList = ptovtaEstoqueList; // } // -// public List getPtovtaTitularList() { -// return ptovtaTitularList; -// } -// -// public void setPtovtaTitularList(List ptovtaTitularList) { -// this.ptovtaTitularList = ptovtaTitularList; -// } -// -// public List getPtovtaHorarioList() { -// return ptovtaHorarioList; -// } -// -// public void setPtovtaHorarioList(List ptovtaHorarioList) { -// this.ptovtaHorarioList = ptovtaHorarioList; -// } + + public List getPtovtaHorarioList() { + + List tmp = new ArrayList(); + if (this.ptovtaHorarioList != null) { + for (PtovtaHorario ddab : this.ptovtaHorarioList) { + if (ddab.getActivo()) { + tmp.add(ddab); + } + } + } + + this.ptovtaHorarioList = tmp; + + return tmp; + + } + + public void setPtovtaHorarioList(List ptovtaHorarioList) { + this.ptovtaHorarioList = ptovtaHorarioList; + } // // public List getPtovtaComissaoList() { // return ptovtaComissaoList; @@ -418,13 +423,27 @@ public class PuntoVenta implements Serializable { // this.ptovtaAgenciaList = ptovtaAgenciaList; // } // -// public List getPtovtaAntecipacomissaoList() { -// return ptovtaAntecipacomissaoList; -// } -// -// public void setPtovtaAntecipacomissaoList(List ptovtaAntecipacomissaoList) { -// this.ptovtaAntecipacomissaoList = ptovtaAntecipacomissaoList; -// } + public List getPtovtaAntecipacomissaoList() { + + List tmp = new ArrayList(); + if (this.ptovtaAntecipacomissaoList != null) { + for (PtovtaAntecipacomissao ddab : this.ptovtaAntecipacomissaoList) { + if (ddab.getActivo()) { + tmp.add(ddab); + } + } + } + + this.ptovtaAntecipacomissaoList = tmp; + + return tmp; + + + } + + public void setPtovtaAntecipacomissaoList(List ptovtaAntecipacomissaoList) { + this.ptovtaAntecipacomissaoList = ptovtaAntecipacomissaoList; + } public void setLsPtovtaUsuarioBancario(List lsPtovtaUsuarioBancario) { this.lsPtovtaUsuarioBancario = lsPtovtaUsuarioBancario;