In inputQuantity l'avviso partita inattiva non è più bloccante ma chiede di continuare
This commit is contained in:
parent
dc38311125
commit
56d509b07b
@ -1,5 +1,7 @@
|
||||
package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
|
||||
|
||||
import android.text.SpannableString;
|
||||
|
||||
import androidx.databinding.ObservableField;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
@ -29,6 +31,7 @@ import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
|
||||
import it.integry.integrywmsnative.core.utility.UtilityDate;
|
||||
import it.integry.integrywmsnative.core.utility.UtilityResources;
|
||||
import it.integry.integrywmsnative.core.utility.UtilityString;
|
||||
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
|
||||
import it.integry.integrywmsnative.view.dialogs.exception.InactiveBatchLotException;
|
||||
import it.integry.integrywmsnative.view.dialogs.exception.InvalidBatchLotException;
|
||||
import it.integry.integrywmsnative.view.dialogs.exception.InvalidExpireDateException;
|
||||
@ -390,12 +393,12 @@ public class DialogInputQuantityV2ViewModel {
|
||||
public void setNewPartitaMag(String internalPartitaMag) {
|
||||
this.internalPartitaMag = internalPartitaMag;
|
||||
|
||||
if (mPartitaMagList != null && SettingsManager.iDB().isSuggestDataScad()){
|
||||
if (mPartitaMagList != null && SettingsManager.iDB().isSuggestDataScad()) {
|
||||
Optional<MtbPartitaMag> partitaMag = mPartitaMagList.stream()
|
||||
.filter(x -> x.getPartitaMag().equalsIgnoreCase(internalPartitaMag))
|
||||
.findFirst();
|
||||
|
||||
if (partitaMag.isPresent()){
|
||||
if (partitaMag.isPresent()) {
|
||||
setNewDataScad(partitaMag.get().getDataScad());
|
||||
} else {
|
||||
MtbAart localMtbAart = mtbAart.get();
|
||||
@ -569,9 +572,11 @@ public class DialogInputQuantityV2ViewModel {
|
||||
}
|
||||
|
||||
if (this.statoArt == StatoPartitaMag.DISATTIVO) {
|
||||
this.sendError(new InactiveBatchLotException(internalPartitaMag));
|
||||
onValidated.run(false);
|
||||
return;
|
||||
boolean result = runWarningDialogSyncronized(String.format(UtilityResources.getString(R.string.batch_lot_not_enabled), internalPartitaMag));
|
||||
if (!result) {
|
||||
onValidated.run(false);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.shouldAskDataScad && UtilityString.isNullOrEmpty(internalPartitaMag)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user