Implementações na OCD feat bug#AL-3779' (!170) from AL-3779 into master

Reviewed-on: adm/ModelWeb#170
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master
fabio 2024-04-05 11:29:53 +00:00
commit 8d90147453
2 changed files with 25 additions and 16 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.43.2</version> <version>1.44.0</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

View File

@ -26,8 +26,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@Entity @Entity
@Table(name = "OCD_PARAM") @Table(name = "OCD_PARAM")
public class OCDParam implements java.io.Serializable { public class OCDParam implements java.io.Serializable {
/** /**
* *
@ -52,9 +51,9 @@ public class OCDParam implements java.io.Serializable {
private Boolean indOCDPorFormadePagamento; private Boolean indOCDPorFormadePagamento;
private BigDecimal tiempoLimitePenalizacion; private BigDecimal tiempoLimitePenalizacion;
private List<OCDPtoVtaParam> listOCDPtoVtaParam; private List<OCDPtoVtaParam> listOCDPtoVtaParam;
private Boolean indEstornoPix;
public OCDParam(Long ocdparamId, BigDecimal penalizacion, public OCDParam(Long ocdparamId, BigDecimal penalizacion, Integer diasPagar, PuntoVenta puntoventa, Empresa empresa,
Integer diasPagar, PuntoVenta puntoventa, Empresa empresa,
Estado estado, Boolean activo, Date fecmodif, Integer usuarioId) { Estado estado, Boolean activo, Date fecmodif, Integer usuarioId) {
super(); super();
this.ocdparamId = ocdparamId; this.ocdparamId = ocdparamId;
@ -68,7 +67,8 @@ public class OCDParam implements java.io.Serializable {
this.usuarioId = usuarioId; this.usuarioId = usuarioId;
} }
public OCDParam() {/*...*/} public OCDParam() {
/* ... */}
@SequenceGenerator(name = "OCD_PARAM_SEQ", sequenceName = "OCD_PARAM_SEQ", allocationSize = 1) @SequenceGenerator(name = "OCD_PARAM_SEQ", sequenceName = "OCD_PARAM_SEQ", allocationSize = 1)
@Id @Id
@ -198,6 +198,7 @@ public class OCDParam implements java.io.Serializable {
public void setIndOcdDinheiro(Boolean indOcdDinheiro) { public void setIndOcdDinheiro(Boolean indOcdDinheiro) {
this.indOcdDinheiro = indOcdDinheiro; this.indOcdDinheiro = indOcdDinheiro;
} }
@Column(name = "INDOCDTRANSFERENCIA") @Column(name = "INDOCDTRANSFERENCIA")
public Boolean getIndOCDTransferencia() { public Boolean getIndOCDTransferencia() {
return indOCDTransferencia; return indOCDTransferencia;
@ -225,7 +226,6 @@ public class OCDParam implements java.io.Serializable {
this.tiempoLimitePenalizacion = tiempoLimitePenalizacion; this.tiempoLimitePenalizacion = tiempoLimitePenalizacion;
} }
@Column(name = "INDOCDFORMAPAGAMENTO") @Column(name = "INDOCDFORMAPAGAMENTO")
public Boolean getIndOCDPorFormadePagamento() { public Boolean getIndOCDPorFormadePagamento() {
return indOCDPorFormadePagamento; return indOCDPorFormadePagamento;
@ -245,6 +245,7 @@ public class OCDParam implements java.io.Serializable {
this.listOCDPtoVtaParam.add(ocd); this.listOCDPtoVtaParam.add(ocd);
return ocd; return ocd;
} }
public void removePtovtaOCDParam(OCDPtoVtaParam ocdPtoVtaParam) { public void removePtovtaOCDParam(OCDPtoVtaParam ocdPtoVtaParam) {
this.listOCDPtoVtaParam.remove(ocdPtoVtaParam); this.listOCDPtoVtaParam.remove(ocdPtoVtaParam);
@ -276,4 +277,12 @@ public class OCDParam implements java.io.Serializable {
this.indsempregerarapagar = indsempregerarapagar; this.indsempregerarapagar = indsempregerarapagar;
} }
public Boolean getIndEstornoPix() {
return indEstornoPix == null ? false : indEstornoPix;
}
public void setIndEstornoPix(Boolean indEstornoPix) {
this.indEstornoPix = indEstornoPix;
}
} }