fixes bug#AL-2686

master
aristides@rjconsultores.com.br 2023-06-23 19:29:59 -03:00
parent e324058751
commit 4f2dc4bf80
3 changed files with 50 additions and 1 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.5.6</version> <version>1.6.0</version>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>rj-releases</id> <id>rj-releases</id>

View File

@ -1,6 +1,7 @@
package com.rjconsultores.ventaboletos.entidad; package com.rjconsultores.ventaboletos.entidad;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
@ -66,6 +67,15 @@ public class OrgaoEmpParam implements Serializable, Auditavel<OrgaoEmpParam> {
@Column(name = "CODEMPRESAPORORGAO", length=30) @Column(name = "CODEMPRESAPORORGAO", length=30)
private String codEmpresaPorOrgao; private String codEmpresaPorOrgao;
@Column(name = "INDICEEXCESSODEPAGAGEM")
private BigDecimal indiceExcessoDeBagagem;
@Column(name = "PESOEXCESSODEBAGAGEMFRANQUIA")
private Integer pesoExcessoDeBagagemFranquia;
@Column(name = "PESOEXTRAEXCESSODEBAGAGEM")
private Integer pesoExtraExcessoDeBagagem;
@Transient @Transient
@NaoAuditar @NaoAuditar
private OrgaoEmpParam orgaoEmpParamClone; private OrgaoEmpParam orgaoEmpParamClone;
@ -150,6 +160,33 @@ public class OrgaoEmpParam implements Serializable, Auditavel<OrgaoEmpParam> {
this.indNaoRestringe2ViaBPe = indNaoRestringe2ViaBPe; this.indNaoRestringe2ViaBPe = indNaoRestringe2ViaBPe;
} }
public BigDecimal getIndiceExcessoDeBagagem() {
return indiceExcessoDeBagagem;
}
public void setIndiceExcessoDeBagagem(BigDecimal indiceExcessoDeBagagem) {
this.indiceExcessoDeBagagem = indiceExcessoDeBagagem;
}
public Integer getPesoExcessoDeBagagemFranquia() {
return pesoExcessoDeBagagemFranquia;
}
public void setPesoExcessoDeBagagemFranquia(Integer pesoExcessoDeBagagemFranquia) {
this.pesoExcessoDeBagagemFranquia = pesoExcessoDeBagagemFranquia;
}
public Integer getPesoExtraExcessoDeBagagem() {
return pesoExtraExcessoDeBagagem;
}
public void setPesoExtraExcessoDeBagagem(Integer pesoExtraExcessoDeBagagem) {
this.pesoExtraExcessoDeBagagem = pesoExtraExcessoDeBagagem;
}
@Override @Override
public void clonar() throws CloneNotSupportedException { public void clonar() throws CloneNotSupportedException {
orgaoEmpParamClone = new OrgaoEmpParam(); orgaoEmpParamClone = new OrgaoEmpParam();

View File

@ -102,6 +102,8 @@ public class TipoEventoExtra implements Serializable {
private List<TipoEventoExtraEmpresa> empresas = new ArrayList<TipoEventoExtraEmpresa>(); private List<TipoEventoExtraEmpresa> empresas = new ArrayList<TipoEventoExtraEmpresa>();
@Column(name = "INDCONFERENCIAFISICACOMISSAO") @Column(name = "INDCONFERENCIAFISICACOMISSAO")
private Boolean indconferenciafisicacomissao; private Boolean indconferenciafisicacomissao;
@Column(name = "INDENVIAEXCESSODEBAGAGEMSEFAZ")
private Boolean indEnviaExcessoDeBagagemSefaz;
@Type(type = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate", parameters = { @Type(type = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate", parameters = {
@Parameter(name = "type", value = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate"), @Parameter(name = "type", value = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate"),
@ -453,4 +455,14 @@ public class TipoEventoExtra implements Serializable {
this.indValidarEstoque = indValidarEstoque; this.indValidarEstoque = indValidarEstoque;
} }
public Boolean getIndEnviaExcessoDeBagagemSefaz() {
return indEnviaExcessoDeBagagemSefaz==null?false:indEnviaExcessoDeBagagemSefaz;
}
public void setIndEnviaExcessoDeBagagemSefaz(Boolean indEnviaExcessoDeBagagemSefaz) {
this.indEnviaExcessoDeBagagemSefaz = indEnviaExcessoDeBagagemSefaz;
}
} }