diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index e8c553d8..ee6d7267 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 4d5c8f75..bde28fa5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,13 +95,13 @@ dependencies { }) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.orhanobut:logger:2.2.0' - implementation 'com.google.firebase:firebase-core:16.0.8' + implementation 'com.google.firebase:firebase-core:16.0.9' implementation 'com.google.firebase:firebase-crash:16.2.1' - implementation 'com.google.firebase:firebase-perf:16.2.5' - implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' + implementation 'com.google.firebase:firebase-perf:17.0.0' + implementation 'com.crashlytics.sdk.android:crashlytics:2.10.0' implementation 'androidx.appcompat:appcompat:1.1.0-alpha04' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha05' + implementation 'com.google.android.material:material:1.1.0-alpha06' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04' diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java index d5168a05..cbd3646e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java @@ -703,6 +703,10 @@ public class MtbAart implements Parcelable{ return flagQtaCnfFissa; } + public boolean isFlagQtaCnfFissa() { + return "S".equalsIgnoreCase(flagQtaCnfFissa); + } + public MtbAart setFlagQtaCnfFissa(String flagQtaCnfFissa) { this.flagQtaCnfFissa = flagQtaCnfFissa; return this; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 218f7dc4..12f66021 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -314,6 +314,10 @@ public class DialogInputQuantity { quantityDTO.qtaCnf.set(dto.getQtaCnf().floatValue()); } else { quantityDTO.qtaCnf.set(dto.mtbAart.getQtaCnf().floatValue()); + + if(dto.getMtbAart().isFlagQtaCnfFissa()) { + quantityDTO.blockedQtaPerCnf.set(true); + } } }