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

Adição de Estoque Simplificado macon feat bug #AL-3865' (!152) from AL-3865 into master 

Reviewed-on: adm/ModelWeb#152
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
fabio 2024-02-23 17:02:40 +00:00
parent 1403109f3a 0e45fe5b1f
commit 1ae6ce4b27
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -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>

4
src/com/rjconsultores/ventaboletos/constantes/Constantes.java
View File

@ -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";

5
src/com/rjconsultores/ventaboletos/entidad/Clasificacion.java
View File

@ -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;
}

11
src/com/rjconsultores/ventaboletos/entidad/DetAbastoBoleto.java
View File

@ -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;

2
src/com/rjconsultores/ventaboletos/utilerias/CustomEnum.java
View File

@ -155,6 +155,8 @@ public enum CustomEnum {
INTEGRACION_SAFER("integracion.safer"),
VALIDA_ESTOQUE_SIMPLIFICADO("MODCLI_ValidaEstoqueSimplificado"),
IS_VENDA_MACON("IsVendaMacon");
private String descricao;