From 0e45fe5b1f131a8cb4ca07d610319cb947498e83 Mon Sep 17 00:00:00 2001
From: Fabio <fabio.fbarreto@totvs.com.br>
Date: Fri, 23 Feb 2024 13:12:02 -0300
Subject: [PATCH] =?UTF-8?q?Adi=C3=A7=C3=A3o=20de=20Estoque=20Simplificado?=
 =?UTF-8?q?=20macon=20feat=20bug=20#AL-3865?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  2 +-
 .../ventaboletos/constantes/Constantes.java           |  4 ++++
 .../ventaboletos/entidad/Clasificacion.java           |  5 ++++-
 .../ventaboletos/entidad/DetAbastoBoleto.java         | 11 +++++++++++
 .../ventaboletos/utilerias/CustomEnum.java            |  2 ++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9462efe7f..528f29b2e 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.39.1</version>
+	<version>1.40.0</version>
  
 	<distributionManagement>
         <repository>
diff --git a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java
index 5968839e2..3ec76cd8e 100644
--- a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java
+++ b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java
@@ -48,6 +48,10 @@ public class Constantes {
 	public static final Integer TIPO_OPERACION_CC_LQ = new Integer(1);
 	public static final Integer TIPO_OPERACION_CC_PAGO = new Integer(2);
 	
+	public static final Integer ARTICULO_VENTA = 1;
+	public static final Integer ARTICULO_OUTROS = 2;
+	public static final Integer ARTICULO_MANUAL = 3;
+	
 	public static Short TURNO_AUTOMATICO = new Short("99");
 	
 	public static final String IMAGEM_EMPRESA = "EMPRESA_BACKGROUND";
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java b/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java
index 597a47862..702999e92 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java
@@ -12,7 +12,6 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
@@ -50,6 +49,10 @@ public class Clasificacion implements Serializable {
 	@OneToMany(mappedBy = "clasificacion", cascade = CascadeType.ALL)
 	private List<RequisicionBoleto> requisicionBoletoList;
 
+	public Clasificacion(Integer clasificacionId) {
+		this.clasificacionId = clasificacionId;
+	}
+	
 	public Integer getClasificacionId() {
 		return clasificacionId;
 	}
diff --git a/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java b/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java
index a5aada479..e7accb20d 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java
@@ -53,6 +53,9 @@ public class DetAbastoBoleto implements Serializable {
 	@JoinColumn(name = "ABASTOBOLETO_ID", referencedColumnName = "ABASTOBOLETO_ID")
 	@ManyToOne
 	private AbastoBoleto abastoBoleto;
+	@JoinColumn(name = "AIDF_ID", referencedColumnName = "AIDF_ID")
+	@ManyToOne
+	private Aidf aidf;
 
 	public Integer getDetabastoboletoId() {
 		return detabastoboletoId;
@@ -158,6 +161,14 @@ public class DetAbastoBoleto implements Serializable {
 		this.abastoBoleto = abastoBoleto;
 	}
 
+	public Aidf getAidf() {
+		return aidf;
+	}
+
+	public void setAidf(Aidf aidf) {
+		this.aidf = aidf;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
diff --git a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java b/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java
index d0bfdeb07..ef0c9dd82 100644
--- a/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java
+++ b/src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java
@@ -155,6 +155,8 @@ public enum CustomEnum {
 	
 	INTEGRACION_SAFER("integracion.safer"),
 	
+	VALIDA_ESTOQUE_SIMPLIFICADO("MODCLI_ValidaEstoqueSimplificado"),
+	
 	IS_VENDA_MACON("IsVendaMacon");
 
 	private String descricao;