From 4f2dc4bf801affb2e1c9a4a8283e36000a33d41d Mon Sep 17 00:00:00 2001
From: "aristides@rjconsultores.com.br" <tide2006>
Date: Fri, 23 Jun 2023 19:29:59 -0300
Subject: [PATCH] fixes bug#AL-2686

---
 pom.xml                                       |  2 +-
 .../ventaboletos/entidad/OrgaoEmpParam.java   | 37 +++++++++++++++++++
 .../ventaboletos/entidad/TipoEventoExtra.java | 12 ++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa1f5e276..7a5d0374d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.5.6</version>
+	<version>1.6.0</version>
 	<distributionManagement>
         <repository>
             <id>rj-releases</id>
diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java b/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java
index 916662b42..7adba79e7 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/OrgaoEmpParam.java
@@ -1,6 +1,7 @@
 package com.rjconsultores.ventaboletos.entidad;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import javax.persistence.Basic;
@@ -66,6 +67,15 @@ public class OrgaoEmpParam implements Serializable, Auditavel<OrgaoEmpParam> {
 	@Column(name = "CODEMPRESAPORORGAO", length=30)
 	private String codEmpresaPorOrgao;
 	
+	@Column(name = "INDICEEXCESSODEPAGAGEM")
+	private BigDecimal indiceExcessoDeBagagem;
+	
+	@Column(name = "PESOEXCESSODEBAGAGEMFRANQUIA")
+	private Integer pesoExcessoDeBagagemFranquia;
+	
+	@Column(name = "PESOEXTRAEXCESSODEBAGAGEM")
+	private Integer pesoExtraExcessoDeBagagem;
+	
 	@Transient
     @NaoAuditar
     private OrgaoEmpParam orgaoEmpParamClone;
@@ -149,6 +159,33 @@ public class OrgaoEmpParam implements Serializable, Auditavel<OrgaoEmpParam> {
 	public void setIndNaoRestringe2ViaBPe(Boolean 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
 	public void clonar() throws CloneNotSupportedException {
diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java b/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java
index 1fadc85a6..79cc6e394 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/TipoEventoExtra.java
@@ -102,6 +102,8 @@ public class TipoEventoExtra implements Serializable {
 	private List<TipoEventoExtraEmpresa> empresas = new ArrayList<TipoEventoExtraEmpresa>();
 	@Column(name = "INDCONFERENCIAFISICACOMISSAO")
 	private Boolean indconferenciafisicacomissao;
+	@Column(name = "INDENVIAEXCESSODEBAGAGEMSEFAZ")
+	private Boolean indEnviaExcessoDeBagagemSefaz;
 
 	@Type(type = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate", parameters = {
 			@Parameter(name = "type", value = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate"),
@@ -453,4 +455,14 @@ public class TipoEventoExtra implements Serializable {
 		this.indValidarEstoque = indValidarEstoque;
 	}
 
+	public Boolean getIndEnviaExcessoDeBagagemSefaz() {
+		return indEnviaExcessoDeBagagemSefaz==null?false:indEnviaExcessoDeBagagemSefaz;
+	}
+
+	public void setIndEnviaExcessoDeBagagemSefaz(Boolean indEnviaExcessoDeBagagemSefaz) {
+		this.indEnviaExcessoDeBagagemSefaz = indEnviaExcessoDeBagagemSefaz;
+	}
+	
+	
+
 }