Fix check newPartitaMag

This commit is contained in:
Marco Elefante 2024-04-16 08:51:27 +02:00
parent c808cf7ce3
commit 518a00becf

View File

@ -492,7 +492,8 @@ public class DialogInputQuantityV2ViewModel {
return;
}
if (!disableTracciabilitaCheck && mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) {
if (!disableTracciabilitaCheck && mtbAart.get().isFlagTracciabilitaBoolean()) {
if (UtilityString.isNullOrEmpty(internalPartitaMag)) {
if (suggestPartitaMagRunnable != null) {
internalPartitaMag = suggestPartitaMagRunnable.run(this);
if (internalPartitaMag == null) {
@ -505,6 +506,26 @@ public class DialogInputQuantityV2ViewModel {
onValidated.run(false);
return;
}
} else {
if (SettingsManager.iDB().isFlagWarningNewPartitaMag()) {
MtbPartitaMag mtbPartitaMag = null;
try {
mtbPartitaMag = retrievePartitaMag(internalPartitaMag, this.getMtbAart().getCodMart());
} catch (Exception e) {
this.sendError(e);
onValidated.run(false);
return;
}
if (mtbPartitaMag == null) {
boolean result = runWarningDialogSyncronized(UtilityResources.getString(R.string.batch_lot_inexistent_error_message));
if (!result) {
onValidated.run(false);
return;
}
}
}
}
}
if (this.statoArt == StatoPartitaMag.DISATTIVO) {
@ -577,25 +598,6 @@ public class DialogInputQuantityV2ViewModel {
if (!UtilityString.isNullOrEmpty(this.internalPartitaMag))
this.internalPartitaMag = this.internalPartitaMag.toUpperCase();
if (SettingsManager.iDB().isFlagWarningNewPartitaMag()) {
MtbPartitaMag mtbPartitaMag = null;
try {
mtbPartitaMag = retrievePartitaMag(internalPartitaMag, this.getMtbAart().getCodMart());
} catch (Exception e) {
this.sendError(e);
onValidated.run(false);
return;
}
if (mtbPartitaMag == null) {
boolean result = runWarningDialogSyncronized(UtilityResources.getString(R.string.batch_lot_inexistent_error_message));
if (!result) {
onValidated.run(false);
return;
}
}
}
if (this.warnOnQuantityOverflow && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {