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

Finish v1.40.13(430)

Browse Source
This commit is contained in:
Marco Elefante 2024-04-16 08:56:03 +02:00
commit adeab93b17
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 429 def appVersionCode = 430
def appVersionName = '1.40.12' def appVersionName = '1.40.13'
signingConfigs { signingConfigs {
release { release {

54
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
View File

@ -492,18 +492,39 @@ public class DialogInputQuantityV2ViewModel {
return; return;
} }
if (!disableTracciabilitaCheck && mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) { if (!disableTracciabilitaCheck && mtbAart.get().isFlagTracciabilitaBoolean()) {
if (suggestPartitaMagRunnable != null) { if (UtilityString.isNullOrEmpty(internalPartitaMag)) {
internalPartitaMag = suggestPartitaMagRunnable.run(this); if (suggestPartitaMagRunnable != null) {
if (internalPartitaMag == null) { internalPartitaMag = suggestPartitaMagRunnable.run(this);
if (internalPartitaMag == null) {
this.sendError(new InvalidBatchLotException());
onValidated.run(false);
return;
}
} else {
this.sendError(new InvalidBatchLotException()); this.sendError(new InvalidBatchLotException());
onValidated.run(false); onValidated.run(false);
return; return;
} }
} else { } else {
this.sendError(new InvalidBatchLotException()); if (SettingsManager.iDB().isFlagWarningNewPartitaMag()) {
onValidated.run(false); MtbPartitaMag mtbPartitaMag = null;
return; 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;
}
}
}
} }
} }
@ -577,25 +598,6 @@ public class DialogInputQuantityV2ViewModel {
if (!UtilityString.isNullOrEmpty(this.internalPartitaMag)) if (!UtilityString.isNullOrEmpty(this.internalPartitaMag))
this.internalPartitaMag = this.internalPartitaMag.toUpperCase(); 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) && if (this.warnOnQuantityOverflow && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
this.mtbAart.get().isFlagQtaCnfFissaBoolean()) { this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {