Merge branch 'develop' into feature/FastPickingSpedizione

# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
This commit is contained in:
Giuseppe Scorrano 2025-03-03 12:35:33 +01:00
commit 086597985b
2 changed files with 12 additions and 4 deletions

View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 477 def appVersionCode = 479
def appVersionName = '1.44.08' def appVersionName = '1.44.10'
signingConfigs { signingConfigs {
release { release {

View File

@ -654,8 +654,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
this.fabPopupMenu.dismiss(); this.fabPopupMenu.dismiss();
this.onLoadingStarted(); this.onLoadingStarted();
this.mViewModel.createNewLU(null, null, null, false, () -> { executorService.execute(() -> {
this.onLoadingEnded(); try {
//Aggiunto perchè a volte rimaneva il dialog di caricamento avanti a tutto
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
this.mViewModel.createNewLU(null, null, null, false, () -> {
this.onLoadingEnded();
});
}); });
} }