Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vari

Browse Source
This commit is contained in:
Giuseppe Scorrano
2020-10-13 18:21:56 +02:00
parent c8dbbcf06a
commit 664f92b26c
8 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
View File

@@ -537,6 +537,10 @@ public class MtbColt extends EntityBase {
}
public boolean isDocumentPresent() {
return this.getNumDoc() != null && this.getDataDoc() != null && this.getSerDoc() != null;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;

8
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
View File

@@ -199,7 +199,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
private List<AccettazioneListModel> convertDataModelToListModel(List<PickingObjectDTO> dataList) {
List<PickingObjectDTO> tmpList = Stream.of(dataList)
.filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaOrd(), BigDecimal.ZERO))
.filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO))
.toList();
List<AccettazioneListModel> sortedList = null;
@@ -243,7 +243,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
}
accettazioneListModel.setQtaEvasa(qtaEvasa);
accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
if (x.getMtbAart() != null)
accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
@@ -280,7 +280,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
}
accettazioneListModel.setQtaEvasa(qtaEvasa);
accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
if (x.getMtbAart() != null)
accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
@@ -318,7 +318,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
}
accettazioneListModel.setQtaEvasa(qtaEvasa);
accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
if (x.getMtbAart() != null) {
accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());

30
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
View File

@@ -317,7 +317,7 @@ public class RettificaGiacenzeViewModel {
mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
if (!mIsCreatedLU) {
if (!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
mtbColr
.setQtaCol(BigDecimal.ZERO)
.setNumCnf(BigDecimal.ZERO)
@@ -538,7 +538,7 @@ public class RettificaGiacenzeViewModel {
private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
this.sendOnLoadingStarted();
if(!mIsCreatedLU) {
if(!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
mtbColrToUpdate,
@@ -604,7 +604,19 @@ public class RettificaGiacenzeViewModel {
if (shouldDelete) {
this.sendOnLoadingStarted();
if(mIsCreatedLU) {
if(!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
mtbColrToDelete,
BigDecimal.ZERO,
BigDecimal.ZERO,
savedMtbColr -> {
this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
this.sendOnLoadingEnded();
this.sendOnRowSaved();
},
this::sendError
);
} else {
MtbColt mtbColt = new MtbColt()
.setNumCollo(mtbColrToDelete.getNumCollo())
.setDataCollo(mtbColrToDelete.getDataColloS())
@@ -625,18 +637,6 @@ public class RettificaGiacenzeViewModel {
this.sendOnLoadingEnded();
}, this::sendError);
} else {
this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
mtbColrToDelete,
BigDecimal.ZERO,
BigDecimal.ZERO,
savedMtbColr -> {
this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
this.sendOnLoadingEnded();
this.sendOnRowSaved();
},
this::sendError
);
}
}
});