Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Rinominato enum causale MtbColr per conflitto con classe omonima in MtbCols

Browse Source
This commit is contained in:
Valerio Castellana
2024-11-06 15:03:04 +01:00
parent 1e00bd2668
commit 5db66278d4
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
View File

@@ -111,7 +111,7 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
private BigDecimal numCnf;
@SqlField(value = "causale", nullable = false)
private Causale causale;
private CausaleRiga causale;
@SqlField(value = "utente", maxLength = 40)
private String utente;
@@ -392,11 +392,11 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
return this;
}
public Causale getCausale() {
public CausaleRiga getCausale() {
return causale;
}
public MtbColr setCausale(Causale causale) {
public MtbColr setCausale(CausaleRiga causale) {
this.causale = causale;
return this;
}
@@ -606,19 +606,19 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
return Objects.hash(getDataCollo(), getGestione(), getSerCollo(), getNumCollo(), getRiga(), getRigaOrd(), getCodMart(), getCodBarre(), getCodCol(), getCodTagl(), getPartitaMag(), getGestioneRif(), getSerColloRif(), getNote(), getDataOrd(), getDataColloRif(), getQtaCnf(), getQtaCol(), getNumOrd(), getNumEtich(), getNumColloRif(), getDatetimeRow(), getCodJcom(), getNumCnf(), getCausale(), getUtente(), getCodAnagDoc(), getCodDtipDoc(), getDataDoc(), getSerDoc(), getNumDoc(), getIdRigaDoc(), getPesoNettoKg(), getPesoLordoKg(), getInsPartitaMag(), getMtbPartitaMag_descrizione(), getDataScadPartita(), getDescrizione(), getFlagQtaCnfFissa(), getArtAPeso());
}
public enum Causale implements IBaseEnum<Causale> {
public enum CausaleRiga implements IBaseEnum<CausaleRiga> {
DEFAULT((short) 0), RETTIFICA((short) 1), VERSAMENTO((short) 2);
private final short value;
Causale(short value) {
CausaleRiga(short value) {
this.value = value;
}
public static Causale from(Object value) {
public static CausaleRiga from(Object value) {
short castValue = (short) value;
for (Causale b : Causale.values()) {
for (CausaleRiga b : CausaleRiga.values()) {
if (b.value == castValue)
return b;
}
@@ -636,7 +636,7 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
}
@Override
public Causale fromInternal(Object val) {
public CausaleRiga fromInternal(Object val) {
return from(val);
}
}

2
ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneService.java
View File

@@ -279,7 +279,7 @@ public class WMSAccettazioneService {
final MtbColr targetMtbColr = new MtbColr()
.setCausale(MtbColr.Causale.DEFAULT)
.setCausale(MtbColr.CausaleRiga.DEFAULT)
.setPartitaMag(insertUDCRowRequestDTO.getPartitaMag())
.setDataScadPartita(UtilityDate.toDate(insertUDCRowRequestDTO.getDataScad()))
.setQtaCol(insertUDCRowRequestDTO.getQtaTot())

12
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
View File

@@ -1231,7 +1231,7 @@ public class WMSGenericService {
.setNumCnf(differenceNumCnf)
.setQtaCnf(qtaCnf)
.setDatetimeRow(new Date())
.setCausale(MtbColr.Causale.RETTIFICA)
.setCausale(MtbColr.CausaleRiga.RETTIFICA)
.setPesoNettoKg(null)
.setPesoLordoKg(null);
@@ -1267,7 +1267,7 @@ public class WMSGenericService {
.setDataColloRif(UtilityLocalDate.localDateToDate(mtbColtOrphan.getDataCollo()))
.setGestioneRif(mtbColtOrphan.getGestione())
.setNumColloRif(mtbColtOrphan.getNumCollo())
.setCausale(MtbColr.Causale.RETTIFICA)
.setCausale(MtbColr.CausaleRiga.RETTIFICA)
.setPesoNettoKg(null)
.setPesoLordoKg(null)
.setDatetimeRow(new Date());
@@ -1301,7 +1301,7 @@ public class WMSGenericService {
.setQtaCol(differenceQtaCol.abs())
.setQtaCnf(qtaCnf)
.setNumCnf(differenceNumCnf.abs())
.setCausale(MtbColr.Causale.RETTIFICA)
.setCausale(MtbColr.CausaleRiga.RETTIFICA)
.setSerColloRif(sourceMtbColr.getSerCollo())
.setDataColloRif(UtilityLocalDate.localDateToDate(sourceMtbColr.getDataCollo()))
.setGestioneRif(sourceMtbColr.getGestione())
@@ -1354,7 +1354,7 @@ public class WMSGenericService {
.setNumCnf(differenceNumCnf)
.setQtaCnf(qtaCnf)
.setQtaCol(differenceQtaCol)
.setCausale(MtbColr.Causale.RETTIFICA)
.setCausale(MtbColr.CausaleRiga.RETTIFICA)
.setDatetimeRow(new Date())
.setPesoNettoKg(null)
.setPesoLordoKg(null)
@@ -2006,7 +2006,7 @@ public class WMSGenericService {
.setNumColloRif(cloneMtbColr.getNumColloRif())
.setSerColloRif(cloneMtbColr.getSerColloRif())
.setDataColloRif(cloneMtbColr.getDataColloRif())
.setCausale(MtbColr.Causale.VERSAMENTO)
.setCausale(MtbColr.CausaleRiga.VERSAMENTO)
.setUtente(requestDataDTO.getUsername())
.setQtaCol(stornoSourceMtbColr.getQtaCol().multiply(new BigDecimal(-1)))
@@ -2033,7 +2033,7 @@ public class WMSGenericService {
.setNumCollo(null)
.setDataCollo(null)
.setRiga(null)
.setCausale(MtbColr.Causale.VERSAMENTO)
.setCausale(MtbColr.CausaleRiga.VERSAMENTO)
.setUtente(requestDataDTO.getUsername());
mtbColrDestObservableField.add(cloneMtbColr);

2
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
View File

@@ -283,7 +283,7 @@ public class WMSLavorazioneService {
}
final MtbColr targetMtbColr = new MtbColr()
.setCausale(MtbColr.Causale.DEFAULT)
.setCausale(MtbColr.CausaleRiga.DEFAULT)
.setCodMart(mtbAart.getCodMart())
.setPartitaMag(insertUDSRowRequestDTO.getPartitaMag())
.setDataScadPartita(insertUDSRowRequestDTO.getDataScad())

2
ems-engine/src/main/java/it/integry/ems/retail/wms/vendita/service/WMSSpedizioneService.java
View File

@@ -294,7 +294,7 @@ public class WMSSpedizioneService {
final MtbColr targetMtbColr = new MtbColr()
.setCausale(MtbColr.Causale.DEFAULT)
.setCausale(MtbColr.CausaleRiga.DEFAULT)
.setCodMart(mtbAart.getCodMart())
.setPartitaMag(insertUDSRowRequestDTO.getPartitaMag())
.setDataScadPartita(insertUDSRowRequestDTO.getDataScad())