Fix loading in versamento merce

Fix separatore virgola nel dialog input quantity.

.gitignore

@@ -149,5 +149,6 @@ crashlytics.properties
 crashlytics-build.properties
 ### AndroidStudio Patch ###
 !/gradle/wrapper/gradle-wrapper.jar
-/.idea/copilot.data.migration.agent.xml
-/.idea/copilot.data.migration.edit.xml
+
+copilot.*.xml
+/.idea/dataSources.xml

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-14T09:45:15.341614500Z">
+        <DropdownSelection timestamp="2025-10-02T11:26:10.944286600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=23324B682F" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=7da0808" />
             </handle>
           </Target>
         </DropdownSelection>

.idea/runConfigurations/app.xml

@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS.app.main" />
+    <module name="WMS.app" />
+    <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -8,14 +9,17 @@
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
     <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="ALLOW_ASSUME_VERIFIED" value="false" />
     <option name="CLEAR_APP_STORAGE" value="false" />
     <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
+    <option name="RESTORE_ENABLED" value="false" />
+    <option name="RESTORE_FILE" value="" />
+    <option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />
@@ -59,6 +63,7 @@
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>
     <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY" value="" />
     <option name="ACTIVITY_CLASS" value="" />
     <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
     <option name="SKIP_ACTIVITY_VALIDATION" value="false" />

Jenkinsfile.groovy

@@ -36,7 +36,7 @@ pipeline {
 
         stage('Publish') {
             steps {
-                azureUpload allowAnonymousAccess: true, fileShareName: 'storage-ci', filesPath: 'app/build/outputs/apk/release/*', removePrefixPath: 'app/build/outputs/apk/release/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'wms'
+                azureUpload allowAnonymousAccess: true, fileShareName: 'storage-ci', filesPath: 'app/build/outputs/apk/release/*.apk,app/build/outputs/apk/release/*.txt', removePrefixPath: 'app/build/outputs/apk/release/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'wms'
             }
         }
     }
@@ -49,21 +49,21 @@ pipeline {
                 bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false"'
                 bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"'
                 if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
-                    office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'WMS è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
+                    office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'WMS è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
                 }
             }
         }
         unstable {
             script {
                 if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
-                    office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'WMS è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
+                    office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'WMS è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
                 }
             }
         }
         failure {
             script {
                 if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") {
-                    office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su WMS', status: 'FAILURE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE'
+                    office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su WMS', status: 'FAILURE', webhookUrl: 'https://default0b9c060c159c4e5f82a77459a72572.16.environment.api.powerplatform.com:443/powerautomate/automations/direct/workflows/a73f903a4044474c84ad9a0d68a9a479/triggers/manual/paths/invoke?api-version=1&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=gXc43FQXqIq7Xpfvis2XgFoPl8lpg0Sf5HtuxZG_jeI'
                 }
             }
         }

app/build.gradle

@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 531
-    def appVersionName = '1.47.18'
+    def appVersionCode = 553
+    def appVersionName = '1.50.04'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java

@@ -142,6 +142,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBat
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtComponent;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtModule;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeComponent;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeModule;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoComponent;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoModule;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
@@ -251,7 +253,8 @@ import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAva
         VerificaGiacenzeModule.class,
         DialogExtraInfoModule.class,
         DialogAskDepositoModule.class,
-        DialogChooseArtFromListaArtsModule.class
+        DialogChooseArtFromListaArtsModule.class,
+        DialogDeviceEndOfLifeModule.class
 })
 public interface MainApplicationComponent {
 
@@ -422,6 +425,8 @@ public interface MainApplicationComponent {
 
     DialogChooseArtFromListaArtsComponent.Factory dialogChooseArtFromListaArtsComponent();
 
+    DialogDeviceEndOfLifeComponent.Factory dialogDeviceEndOfLifeComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java

@@ -56,7 +56,6 @@ import it.integry.integrywmsnative.core.sound.SoundAlertService;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.login.rest.AuthenticationRESTConsumer;
-import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
@@ -263,12 +262,6 @@ public class MainApplicationModule {
         return new PosizioniRESTConsumer(restBuilder, systemRESTConsumer, executorService);
     }
 
-    @Provides
-    @Singleton
-    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
-        return new ProdFabbisognoLineeProdRESTConsumer(restBuilder, systemRESTConsumer);
-    }
-
     @Provides
     @Singleton
     DocInterniRESTConsumer provideDocInterniRESTConsumer(RESTBuilder restBuilder, MagazzinoRESTConsumer magazzinoRESTConsumer) {
@@ -283,8 +276,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    GiacenzaPvRESTConsumer provideGiacenzaPvRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
-        return new GiacenzaPvRESTConsumer(restBuilder, executorService);
+    GiacenzaPvRESTConsumer provideGiacenzaPvRESTConsumer(RESTBuilder restBuilder) {
+        return new GiacenzaPvRESTConsumer(restBuilder);
     }
 
     @Provides
@@ -319,8 +312,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliAccettazioneRESTConsumer provideColliAccettazioneRESTConsumer(RESTBuilder restBuilder) {
-        return new ColliAccettazioneRESTConsumer(restBuilder);
+    ColliAccettazioneRESTConsumer provideColliAccettazioneRESTConsumer(ExecutorService executorService, RESTBuilder restBuilder) {
+        return new ColliAccettazioneRESTConsumer(executorService, restBuilder);
     }
 
     @Provides

app/src/main/java/it/integry/integrywmsnative/SplashActivity.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.SpannableString;
@@ -12,8 +13,10 @@ import android.view.LayoutInflater;
 
 import androidx.databinding.DataBindingUtil;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import javax.inject.Inject;
 
@@ -27,6 +30,7 @@ import it.integry.integrywmsnative.databinding.ActivitySplashBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.main.MainActivity;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeView;
 
 public class SplashActivity extends BaseActivity implements MainContext.Listener {
 
@@ -65,9 +69,24 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
         UtilityContext.initMainActivity(this);
 
+        LocalDate endSupportDate = LocalDate.of(2026, 1, 31);
 
-        initAppVersion();
-        initPermissions(this::init);
+        boolean isOldAndroid = Build.VERSION.SDK_INT < Build.VERSION_CODES.O;
+
+        executorService.execute(() -> {
+
+            if (isOldAndroid)
+                showDeviceEndOfLifeMessage();
+
+            handler.post(() -> {
+                if (LocalDate.now().isBefore(endSupportDate) || !isOldAndroid) {
+                    initAppVersion();
+                    initPermissions(this::init);
+                } else {
+                    this.finish();
+                }
+            });
+        });
     }
 
     private void initAppVersion() {
@@ -105,6 +124,21 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
         }
     }
 
+
+    private void showDeviceEndOfLifeMessage() {
+
+        CountDownLatch latch = new CountDownLatch(1);
+
+        DialogDeviceEndOfLifeView.newInstance(latch::countDown)
+                .show(this.getSupportFragmentManager(), "dialog_device_end_of_life");
+
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public void onDBDataLoading(String item) {
         handler.post(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));

app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverDTO.java

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.data_recover;
 
+import java.time.LocalDate;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -10,7 +11,7 @@ public class ColliDataRecoverDTO {
     private int id;
     private int numCollo;
     private String serCollo;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String gestioneCollo;
     private String filtro;
 
@@ -43,11 +44,11 @@ public class ColliDataRecoverDTO {
         return this;
     }
 
-    public String getDataCollo() {
+    public LocalDate getDataCollo() {
         return dataCollo;
     }
 
-    public ColliDataRecoverDTO setDataCollo(String dataCollo) {
+    public ColliDataRecoverDTO setDataCollo(LocalDate dataCollo) {
         this.dataCollo = dataCollo;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.data_recover;
 
 import android.content.Context;
 
-import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.android.gms.common.util.IOUtils;
 import com.google.gson.Gson;
@@ -14,6 +13,7 @@ import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 
 import javax.inject.Inject;
@@ -65,9 +65,9 @@ public class ColliDataRecoverService {
     }
 
     private ColliDataRecoverDTO getIfExists(int id) {
-        Optional<ColliDataRecoverDTO> recoverDTOOptional = Stream.of(mtbColtsSessions)
+        Optional<ColliDataRecoverDTO> recoverDTOOptional = mtbColtsSessions.stream()
                 .filter(x -> x.getId() == id)
-                .findSingle();
+                .findFirst();
 
 
         return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
@@ -85,7 +85,7 @@ public class ColliDataRecoverService {
 
         ColliDataRecoverDTO recoverDTO = new ColliDataRecoverDTO()
                 .setId(newId)
-                .setDataCollo(mtbColtSession.getDataColloS())
+                .setDataCollo(mtbColtSession.getDataColloLD())
                 .setNumCollo(mtbColtSession.getNumCollo())
                 .setSerCollo(mtbColtSession.getSerCollo())
                 .setGestioneCollo(mtbColtSession.getGestione())

app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java

@@ -11,6 +11,7 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 
 import androidx.annotation.ColorRes;
 import androidx.appcompat.widget.AppCompatCheckBox;
@@ -37,6 +38,8 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -45,6 +48,7 @@ import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.LocaleDecimalKeyListener;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
@@ -975,4 +979,64 @@ public class Converters {
         view.setLayoutParams(layoutParams);
     }
 
-}
+    /**
+     * BindingAdapter per bindare una LocalDate diretta su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateText="@{myLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDate date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    @BindingAdapter(value = {"localDateTimeText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDateTime date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy hh:mm";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter per bindare una ObservableField<LocalDate> su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateObservableText="@{myObservableLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateObservableText", "dateFormat"}, requireAll = false)
+    public static void bindObservableLocalDateText(TextView view, ObservableField<LocalDate> observableDate, String dateFormat) {
+        if (observableDate == null) {
+            view.setText("");
+            return;
+        }
+        LocalDate date = observableDate.get();
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter che applica automaticamente il KeyListener localizzato
+     * ai campi con inputType numberDecimal, permettendo l'uso della virgola
+     * come separatore decimale in base al locale del dispositivo.
+     */
+    @BindingAdapter("useLocaleDecimalInput")
+    public static void setLocaleDecimalInput(EditText view, boolean useLocaleInput) {
+        if (useLocaleInput) {
+            view.setKeyListener(LocaleDecimalKeyListener.getInstance());
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/model/DtbDoct.java

@@ -1,7 +1,7 @@
 package it.integry.integrywmsnative.core.model;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 public class DtbDoct {
@@ -10,7 +10,7 @@ public class DtbDoct {
 
     private String codAnag;
     private String codDtip;
-    private Date dataDoc;
+    private LocalDate dataDoc;
     private Integer numDoc;
     private String serDoc;
     private BigDecimal acconto;
@@ -41,14 +41,14 @@ public class DtbDoct {
     private String compilatoDa;
     private String userName;
     private String controllatoDa;
-    private Date dataChkDoc;
-    private Date dataDocVal;
-    private Date dataInizTrasp;
-    private Date dataIns;
-    private Date dataOrd;
-    private Date dataReg;
-    private Date dataRifScad;
-    private Date dataUltMod;
+    private LocalDate dataChkDoc;
+    private LocalDate dataDocVal;
+    private LocalDate dataInizTrasp;
+    private LocalDate dataIns;
+    private LocalDate dataOrd;
+    private LocalDate dataReg;
+    private LocalDate dataRifScad;
+    private LocalDate dataUltMod;
     private String descrizionePaga;
     private String flagPrzScontati;
     private String gestione;
@@ -89,7 +89,7 @@ public class DtbDoct {
     private String targa;
     private Integer postiPallet;
     private BigDecimal tempMedia;
-    private Date dataCons;
+    private LocalDate dataCons;
     private BigDecimal nolo;
     private BigDecimal nolo2;
     private String conducente;
@@ -102,7 +102,7 @@ public class DtbDoct {
     private String setDataDecorrenza2DataRic;
     private BigDecimal totSpese;
     private String chkArtListino;
-    private Date dataCmov;
+    private LocalDate dataCmov;
     private String reso;
     private Integer numCmovAutofattura;
     private Object dtbTipi;
@@ -141,11 +141,11 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataDoc() {
+    public LocalDate getDataDoc() {
         return dataDoc;
     }
 
-    public DtbDoct setDataDoc(Date dataDoc) {
+    public DtbDoct setDataDoc(LocalDate dataDoc) {
         this.dataDoc = dataDoc;
         return this;
     }
@@ -420,74 +420,74 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataChkDoc() {
+    public LocalDate getDataChkDoc() {
         return dataChkDoc;
     }
 
-    public DtbDoct setDataChkDoc(Date dataChkDoc) {
+    public DtbDoct setDataChkDoc(LocalDate dataChkDoc) {
         this.dataChkDoc = dataChkDoc;
         return this;
     }
 
-    public Date getDataDocVal() {
+    public LocalDate getDataDocVal() {
         return dataDocVal;
     }
 
-    public DtbDoct setDataDocVal(Date dataDocVal) {
+    public DtbDoct setDataDocVal(LocalDate dataDocVal) {
         this.dataDocVal = dataDocVal;
         return this;
     }
 
-    public Date getDataInizTrasp() {
+    public LocalDate getDataInizTrasp() {
         return dataInizTrasp;
     }
 
-    public DtbDoct setDataInizTrasp(Date dataInizTrasp) {
+    public DtbDoct setDataInizTrasp(LocalDate dataInizTrasp) {
         this.dataInizTrasp = dataInizTrasp;
         return this;
     }
 
-    public Date getDataIns() {
+    public LocalDate getDataIns() {
         return dataIns;
     }
 
-    public DtbDoct setDataIns(Date dataIns) {
+    public DtbDoct setDataIns(LocalDate dataIns) {
         this.dataIns = dataIns;
         return this;
     }
 
-    public Date getDataOrd() {
+    public LocalDate getDataOrd() {
         return dataOrd;
     }
 
-    public DtbDoct setDataOrd(Date dataOrd) {
+    public DtbDoct setDataOrd(LocalDate dataOrd) {
         this.dataOrd = dataOrd;
         return this;
     }
 
-    public Date getDataReg() {
+    public LocalDate getDataReg() {
         return dataReg;
     }
 
-    public DtbDoct setDataReg(Date dataReg) {
+    public DtbDoct setDataReg(LocalDate dataReg) {
         this.dataReg = dataReg;
         return this;
     }
 
-    public Date getDataRifScad() {
+    public LocalDate getDataRifScad() {
         return dataRifScad;
     }
 
-    public DtbDoct setDataRifScad(Date dataRifScad) {
+    public DtbDoct setDataRifScad(LocalDate dataRifScad) {
         this.dataRifScad = dataRifScad;
         return this;
     }
 
-    public Date getDataUltMod() {
+    public LocalDate getDataUltMod() {
         return dataUltMod;
     }
 
-    public DtbDoct setDataUltMod(Date dataUltMod) {
+    public DtbDoct setDataUltMod(LocalDate dataUltMod) {
         this.dataUltMod = dataUltMod;
         return this;
     }
@@ -852,11 +852,11 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataCons() {
+    public LocalDate getDataCons() {
         return dataCons;
     }
 
-    public DtbDoct setDataCons(Date dataCons) {
+    public DtbDoct setDataCons(LocalDate dataCons) {
         this.dataCons = dataCons;
         return this;
     }
@@ -969,11 +969,11 @@ public class DtbDoct {
         return this;
     }
 
-    public Date getDataCmov() {
+    public LocalDate getDataCmov() {
         return dataCmov;
     }
 
-    public DtbDoct setDataCmov(Date dataCmov) {
+    public DtbDoct setDataCmov(LocalDate dataCmov) {
         this.dataCmov = dataCmov;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java

@@ -15,7 +15,7 @@ public class MtbColr extends EntityBase {
     private String gestione;
     private String serCollo;
     private Integer numCollo;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private Integer riga;
     private Integer rigaOrd;
     private String codMart;
@@ -27,7 +27,7 @@ public class MtbColr extends EntityBase {
     private String serColloRif;
     private String note;
     private LocalDate dataOrd;
-    private String dataColloRif;
+    private LocalDate dataColloRif;
     private BigDecimal qtaCnf;
     private BigDecimal qtaCol;
     private Integer numOrd;
@@ -164,21 +164,18 @@ public class MtbColr extends EntityBase {
         return this;
     }
 
-    public String getDataColloS() {
+
+    public LocalDate getDataColloLD() {
         return dataCollo;
     }
 
-    public Date getDataColloD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS());
-    }
-
     public MtbColr setDataCollo(String dataCollo) {
-        this.dataCollo = dataCollo;
+        this.dataCollo = UtilityDate.recognizeLocalDateWithExceptionHandler(dataCollo);
         return this;
     }
 
-    public MtbColr setDataCollo(Date dataCollo) {
-        setDataCollo(UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
+    public MtbColr setDataCollo(LocalDate dataCollo) {
+        this.dataCollo = dataCollo;
         return this;
     }
 
@@ -287,25 +284,24 @@ public class MtbColr extends EntityBase {
     }
 
     public String getDataColloRifS() {
-        return dataColloRif;
+        return dataColloRif != null ? UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_SLASHED_FORMATTER.format(dataColloRif) : null;
     }
 
     public Date getDataColloRifD() {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataColloRifS());
     }
 
-    public MtbColr setDataColloRif(String dataColloRif) {
-        this.dataColloRif = dataColloRif;
-        return this;
+    public LocalDate getDataColloRifLD() {
+        return dataColloRif;
     }
 
-    public MtbColr setDataColloRif(Date dataColloRif) {
-        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+    public MtbColr setDataColloRif(String dataColloRif) {
+        this.dataColloRif = UtilityDate.recognizeLocalDateWithExceptionHandler(dataColloRif);
         return this;
     }
 
     public MtbColr setDataColloRif(LocalDate dataColloRif) {
-        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        this.dataColloRif = dataColloRif;
         return this;
     }
 
@@ -355,13 +351,10 @@ public class MtbColr extends EntityBase {
     }
 
 
-    public String getDatetimeRowS() {
+    public String getDatetimeRow() {
         return datetimeRow;
     }
 
-    public Date getDatetimeRowD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDatetimeRowS());
-    }
 
     public MtbColr setDatetimeRow(String datetimeRow) {
         this.datetimeRow = datetimeRow;

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java

@@ -22,7 +22,6 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 
 /**
@@ -31,7 +30,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class MtbColt extends EntityBase {
     private String gestione;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String serCollo;
     private Integer numCollo;
     private String rifOrd;
@@ -86,7 +85,7 @@ public class MtbColt extends EntityBase {
 
     public MtbColt() {
         type = "mtb_colt";
-        setDataCollo(UtilityDate.getDateInstance());
+        setDataCollo(LocalDate.now());
         setSerCollo("/");
 
         if (SettingsManager.i().isUserLoggedIn()) {
@@ -145,20 +144,13 @@ public class MtbColt extends EntityBase {
     }
 
     public String getDataColloHumanLong() {
-        Date dataColloD = null;
-        try {
-            dataColloD = getDataColloD();
-        } catch (Exception ex) {
-            UtilityLogger.error(ex);
-        }
-
-        if (dataColloD != null) {
-            return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN_LONG);
+        if (dataCollo != null) {
+            return UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_HUMAN_FORMATTER.format(dataCollo);
         } else return null;
     }
 
     public String getDataColloS() {
-        return dataCollo;
+        return dataCollo != null ? UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_SLASHED_FORMATTER.format(dataCollo) : null;
     }
 
     public Date getDataColloD() {
@@ -166,21 +158,16 @@ public class MtbColt extends EntityBase {
     }
 
     public LocalDate getDataColloLD() {
-        return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataColloS());
+        return dataCollo;
     }
 
     public MtbColt setDataCollo(String dataCollo) {
-        this.dataCollo = dataCollo;
-        return this;
-    }
-
-    public MtbColt setDataCollo(Date dataCollo) {
-        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+        this.dataCollo = UtilityDate.recognizeLocalDateWithExceptionHandler(dataCollo);
         return this;
     }
 
     public MtbColt setDataCollo(LocalDate dataCollo) {
-        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        this.dataCollo = dataCollo;
         return this;
     }
 

app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java

@@ -4,7 +4,6 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
 
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 
@@ -306,7 +305,7 @@ public class MvwSitArtUdcDetInventario {
         return new MtbColr()
                 .setCodJcom(getCodJcom())
                 .setCodMart(getCodMart())
-                .setDataCollo(UtilityDate.toDate(getDataCollo()))
+                .setDataCollo(getDataCollo())
                 .setNumCollo(getNumCollo())
                 .setSerCollo(getSerCollo())
                 .setGestione(getGestione())

app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest;
 import java.io.IOException;
 
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -17,19 +18,29 @@ public class HttpInterceptor implements Interceptor {
     @Override
     public Response intercept(Chain chain) throws IOException {
 
-        final String PROFILE_DB     = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
-        final String APP_TOKEN      = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
+        final String PROFILE_DB = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
+        final String APP_TOKEN = "fa3a21af-606b-4129-a22b-aedc2a52c7b6";
 
-        final Request request = chain.request();
-        final HttpUrl url = request.url().newBuilder()
-                .addQueryParameter("profileDb", PROFILE_DB)
-                .build();
+        HttpUrl.Builder urlBuilder = chain.request().url().newBuilder();
 
-        Request.Builder builder = chain.request().newBuilder()
+        if (!UtilityString.isNullOrEmpty(PROFILE_DB))
+            urlBuilder
+                    .addQueryParameter("profileDb", PROFILE_DB);
+
+        HttpUrl url = urlBuilder.build();
+
+        final Request.Builder requestBuilder = chain.request().newBuilder();
+
+        Request.Builder builder = requestBuilder
                 .addHeader("Content-Type", "application/json")
                 .addHeader("Accept", "*/*")
                 .addHeader("x-app-token", APP_TOKEN);
 
+        if (SettingsManager.i().getUserSession() != null &&
+                SettingsManager.i().getUserSession().getDepo() != null &&
+                !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getDepo().getCodMdep()))
+            builder.addHeader("codMdep", SettingsManager.i().getUserSession().getDepo().getCodMdep());
+
         var newRequest = builder
                 .url(url)
                 .build();

app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java

@@ -37,19 +37,19 @@ public class RESTBuilder {
     }
 
     public <T> T getService(final Class<T> service, int timeout) {
-        return getService(service, SettingsManager.i().getServer().getProtocol(), SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, true, timeout);
+        return getService(service, SettingsManager.i().getServer().getProtocol(), SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, timeout);
 
     }
 
-    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors) {
-        return getService(service, protocol, host, port, addInterceptors, true, 60);
+    public <T> T getService(final Class<T> service, String protocol, String host, int port) {
+        return getService(service, protocol, host, port, true, 60);
     }
 
-    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi) {
-        return getService(service, protocol, host, port, addInterceptors, addEmsApi, 60);
+    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addEmsApi) {
+        return getService(service, protocol, host, port, addEmsApi, 60);
     }
 
-    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout) {
+    public <T> T getService(final Class<T> service, String protocol, String host, int port, boolean addEmsApi, int timeout) {
         OkHttpClient.Builder clientBuilder = getDefaultHttpClient();
 
         timeout = 0;
@@ -62,7 +62,7 @@ public class RESTBuilder {
         clientBuilder.retryOnConnectionFailure(true);
 
         clientBuilder.addInterceptor(authInterceptor);
-        if (addInterceptors) clientBuilder.addInterceptor(new HttpInterceptor());
+        clientBuilder.addInterceptor(new HttpInterceptor());
         if (ADD_LOGGER_INTERCEPTOR) clientBuilder.addInterceptor(new HttpLoggerInterceptor());
 
         OkHttpClient client = clientBuilder.build();

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java

@@ -132,7 +132,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         var codMarts = codMartToFind.parallelStream()
                 .filter(Objects::nonNull)
                 .distinct()
-.collect(Collectors.toUnmodifiableList());
+                .collect(Collectors.toUnmodifiableList());
         ArticoloRESTConsumerService articoloRESTConsumer = restBuilder.getService(ArticoloRESTConsumerService.class);
         var response = articoloRESTConsumer
                 .getByCodMart(new RetrieveArticoloByCodMartRequestDTO()
@@ -197,17 +197,6 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         return this.systemRESTConsumer.processSqlSynchronized("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList);
     }
 
-    public void getArtsGroups(List<String> groupsToFind, RunnableArgs<List<MtbGrup>> onComplete, RunnableArgs<Exception> onFailed) {
-        executorService.execute(() -> {
-            try {
-                var data = getArtsGroupsSynchronized(groupsToFind);
-                if (onComplete != null) onComplete.run(data);
-            } catch (Exception ex) {
-                if (onFailed != null) onFailed.run(ex);
-            }
-        });
-    }
-
 
     public List<MtbUntMis> getUntMisArtsSynchronized(List<String> inputUntMis) throws Exception {
         List<HashMap<String, Object>> whereCondList = inputUntMis.parallelStream()

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliAccettazioneRESTConsumer.java

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.annotation.NonNull;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -14,112 +16,133 @@ import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.DeleteUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import retrofit2.Call;
 import retrofit2.Response;
 
 @Singleton
 public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements ColliCaricoRESTConsumerInterface {
 
+    private final ExecutorService executorService;
     private final RESTBuilder restBuilder;
 
-    public ColliAccettazioneRESTConsumer(RESTBuilder restBuilder) {
+    public ColliAccettazioneRESTConsumer(ExecutorService executorService, RESTBuilder restBuilder) {
+        this.executorService = executorService;
         this.restBuilder = restBuilder;
     }
 
-    public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    @Override
+    public MtbColt createUDCSynchronized(CreateUDCRequestDTO createUDCRequestDTO) throws Exception {
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = restBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
-        colliAccettazioneRESTConsumerService.createUDC(createUDCRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Response<ServiceRESTResponse<CreateUDCResponseDTO>> response) {
-                        analyzeAnswer(response, "accettazione/createUDC", data -> onComplete.run(data.getMtbColt()), onFailed);
-                    }
+        var response = colliAccettazioneRESTConsumerService.createUDC(createUDCRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "accettazione/createUDC");
+        return data.getMtbColt();
+    }
 
+    @Override
+    public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                MtbColt result = createUDCSynchronized(createUDCRequestDTO);
+                onComplete.run(result);
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    @Override
+    public CloseUDCResponseDTO synchronousCloseUDC(CloseUDCRequestDTO closeUDCRequestDTO) throws Exception {
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = restBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        var response = colliAccettazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
+                .execute();
+
+        return analyzeAnswer(response, "accettazione/closeUDC");
     }
 
     @Override
     public void closeUDC(CloseUDCRequestDTO closeUDCRequestDTO, RunnableArgs<CloseUDCResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                CloseUDCResponseDTO result = synchronousCloseUDC(closeUDCRequestDTO);
+                onComplete.run(result);
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    @Override
+    public MtbColr synchronousInsertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO) throws Exception {
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = restBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
-        colliAccettazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Response<ServiceRESTResponse<CloseUDCResponseDTO>> response) {
-                        analyzeAnswer(response, "accettazione/closeUDC", onComplete, onFailed);
-                    }
+        var response = colliAccettazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "accettazione/insertUDCRow");
+
+        return data.getSavedMtbColr();
     }
 
     @Override
     public void insertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                onComplete.run(synchronousInsertUDCRow(insertUDCRowRequestDTO));
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    @Override
+    public MtbColr synchronousEditUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO) throws Exception {
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = restBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
-        colliAccettazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDCRowResponseDTO>> response) {
-                        analyzeAnswer(response, "accettazione/insertUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
+        var response = colliAccettazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "accettazione/editUDCRow");
+        return data.getSavedMtbColr();
     }
 
     @Override
     public void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                onComplete.run(synchronousEditUDCRow(editUDCRowRequestDTO));
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    @Override
+    public void synchronousDeleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO) throws Exception {
         ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = restBuilder.getService(ColliAccettazioneRESTConsumerService.class);
 
-        colliAccettazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDCRowResponseDTO>> response) {
-                        analyzeAnswer(response, "accettazione/editUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
+        var response = colliAccettazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        analyzeAnswer(response, "accettazione/deleteUDCRow");
     }
 
     @Override
     public void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = restBuilder.getService(ColliAccettazioneRESTConsumerService.class);
-
-        colliAccettazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "accettazione/deleteUDCRow", data -> onComplete.run(), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        executorService.execute(() -> {
+            try {
+                synchronousDeleteUDCRow(deleteUDCRowRequestDTO);
+                onComplete.run();
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
     }
 
     public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java

@@ -20,10 +20,8 @@ import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.DeleteUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSFromArtRequestDTO;
@@ -31,7 +29,6 @@ import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -53,75 +50,93 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
     }
 
     @Override
-    public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public MtbColt createUDCSynchronized(CreateUDCRequestDTO createUDCRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.createUDC(createUDCRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, Response<ServiceRESTResponse<CreateUDCResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/createUDC", data -> onComplete.run(data.getMtbColt()), onFailed);
-                    }
+        var response = colliLavorazioneRESTConsumerService.createUDC(createUDCRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CreateUDCResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "lavorazione/createUDC");
+        return data.getMtbColt();
+    }
+
+    @Override
+    public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                MtbColt result = createUDCSynchronized(createUDCRequestDTO);
+                onComplete.run(result);
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    @Override
+    public CloseUDCResponseDTO synchronousCloseUDC(CloseUDCRequestDTO closeUDCRequestDTO) throws Exception {
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        var response = colliLavorazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
+                .execute();
+
+        return analyzeAnswer(response, "lavorazione/closeUDC");
     }
 
     @Override
     public void closeUDC(CloseUDCRequestDTO closeUDCRequestDTO, RunnableArgs<CloseUDCResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                CloseUDCResponseDTO result = synchronousCloseUDC(closeUDCRequestDTO);
+                onComplete.run(result);
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    @Override
+    public MtbColr synchronousInsertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.closeUDC(closeUDCRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, Response<ServiceRESTResponse<CloseUDCResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/closeUDC", onComplete, onFailed);
-                    }
+        var response = colliLavorazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<CloseUDCResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "lavorazione/insertUDCRow");
+
+        return data.getSavedMtbColr();
     }
 
     @Override
     public void insertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                onComplete.run(synchronousInsertUDCRow(insertUDCRowRequestDTO));
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
+    }
+
+    @Override
+    public MtbColr synchronousEditUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.insertUDCRow(insertUDCRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, Response<ServiceRESTResponse<InsertUDCRowResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/insertUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
+        var response = colliLavorazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<InsertUDCRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "lavorazione/editUDCRow");
+        return data.getSavedMtbColr();
     }
 
     @Override
     public void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
-
-        colliLavorazioneRESTConsumerService.editUDCRow(editUDCRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, Response<ServiceRESTResponse<EditUDCRowResponseDTO>> response) {
-                        analyzeAnswer(response, "lavorazione/editUDCRow", data -> onComplete.run(data.getSavedMtbColr()), onFailed);
-                    }
-
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<EditUDCRowResponseDTO>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        executorService.execute(() -> {
+            try {
+                onComplete.run(synchronousEditUDCRow(editUDCRowRequestDTO));
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
     }
 
     public MtbColt createUDSSynchronized(CreateUDSRequestDTO createUDSRequestDTO) throws Exception {
@@ -231,22 +246,26 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
         });
     }
 
+
     @Override
-    public void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void synchronousDeleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO) throws Exception {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = restBuilder.getService(ColliLavorazioneRESTConsumerService.class);
 
-        colliLavorazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "lavorazione/deleteUDCRow", data -> onComplete.run(), onFailed);
-                    }
+        var response = colliLavorazioneRESTConsumerService.deleteUDCRow(deleteUDCRowRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        analyzeAnswer(response, "lavorazione/deleteUDCRow");
+    }
+    @Override
+    public void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                synchronousDeleteUDCRow(deleteUDCRowRequestDTO);
+                onComplete.run();
+            } catch (Exception e) {
+                onFailed.run(e);
+            }
+        });
     }
 
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java

@@ -11,18 +11,19 @@ import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import javax.inject.Singleton;
 
-import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -160,11 +161,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
             mtbColrClone
                     .setNumCollo(null)
-                    .setDataCollo((String) null)
+                    .setDataCollo((LocalDate) null)
                     .setRiga(null)
                     .setGestione(GestioneEnum.LAVORAZIONE)
 
-                    .setDataColloRif(sourceMtbColt.getDataColloD())
+                    .setDataColloRif(sourceMtbColt.getDataColloLD())
                     .setNumColloRif(sourceMtbColt.getNumCollo())
                     .setGestioneRif(sourceMtbColt.getGestione())
                     .setSerColloRif(sourceMtbColt.getSerCollo())
@@ -214,10 +215,10 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         MtbColr mtbColrClone = new MtbColr();
         mtbColrClone
                 .setNumCollo(null)
-                .setDataCollo((String) null)
+                .setDataCollo((LocalDate) null)
                 .setRiga(null)
                 .setGestione(GestioneEnum.LAVORAZIONE)
-                .setDataColloRif(sourceMtbColt.getDataColloD())
+                .setDataColloRif(sourceMtbColt.getDataColloLD())
                 .setNumColloRif(sourceMtbColt.getNumCollo())
                 .setGestioneRif(sourceMtbColt.getGestione())
                 .setSerColloRif(sourceMtbColt.getSerCollo())
@@ -244,10 +245,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         saveCollo(newMtbColt, onComplete, onFailed);
     }
 
-    public void createColloFromEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        createColloFromEtichettaAnonima(barcodeScanDTO.getStringValue(), gestione, onComplete, onFailed);
-    }
-
     public void createColloFromEtichettaAnonima(String barcode, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt mtbColtToCreate = new MtbColt()
@@ -309,6 +306,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+
     public List<MtbColr> fillMtbAartsOfMtbColrsSynchronized(List<MtbColr> mtbColrs) throws Exception {
 
         List<String> codMarts = new ArrayList<>(mtbColrs.stream()
@@ -350,29 +348,24 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     .collect(Collectors.toList()));
         }
 
-        List<MtbAart> mtbAarts = mArticoloRESTConsumer.getByCodMartsSynchronized(codMarts);
+        List<MtbAart> artList = mArticoloRESTConsumer.getByCodMartsSynchronized(codMarts);
+        if (artList == null)
+            artList = new ArrayList<>();
+
+        Map<String, MtbAart> mtbAartsMap = artList.parallelStream()
+                .collect(Collectors.toMap(mtbAart -> mtbAart.getCodMart().toUpperCase(), x -> x));
 
         for (MtbColt mtbColt : mtbColts) {
             for (MtbColr mtbColr : mtbColt.getMtbColr()) {
 
-                if (mtbAarts != null && !mtbAarts.isEmpty()) {
-                    MtbAart foundMtbAart = null;
-
-                    List<MtbAart> mtbAartStream = mtbAarts.parallelStream()
-                            .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
-                            .collect(Collectors.toList());
-
-                    if (!mtbAartStream.isEmpty()) {
-                        foundMtbAart = mtbAartStream.get(0);
-                    }
-
-                    mtbColr.setMtbAart(foundMtbAart);
+                if (mtbAartsMap.containsKey(mtbColr.getCodMart().toUpperCase())) {
+                    mtbColr.setMtbAart(mtbAartsMap.get(mtbColr.getCodMart().toUpperCase()));
                 }
 
                 mtbColr.setGestione(mtbColt.getGestione());
                 mtbColr.setSerCollo(mtbColt.getSerCollo());
                 mtbColr.setNumCollo(mtbColt.getNumCollo());
-                mtbColr.setDataCollo(mtbColt.getDataColloS());
+                mtbColr.setDataCollo(mtbColt.getDataColloLD());
             }
         }
 
@@ -408,7 +401,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
     }
 
-    public MtbColt getByChiaveColloSynchronized(GestioneEnum gestione, int numCollo, String dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull) throws Exception {
+    public MtbColt getByChiaveColloSynchronized(GestioneEnum gestione, int numCollo, LocalDate dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull) throws Exception {
         MtbColt mtbColtToRetrieve = new MtbColt()
                 .setGestione(gestione)
                 .setNumCollo(numCollo)
@@ -418,7 +411,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         return getByTestataSynchronized(mtbColtToRetrieve, onlyResiduo, throwExcIfNull);
     }
 
-    public void getByChiaveCollo(GestioneEnum gestione, int numCollo, String dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getByChiaveCollo(GestioneEnum gestione, int numCollo, LocalDate dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToRetrieve = new MtbColt()
                 .setGestione(gestione)
                 .setNumCollo(numCollo)
@@ -455,7 +448,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void spostaUlSynchronized(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically) throws Exception {
+    public void spostaUlSynchronized(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, boolean enableDocumentDailyGrouping) throws Exception {
         MtbColt mtbColtToMoveClone = (MtbColt) mtbColtToMove.clone();
 
         for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
@@ -478,11 +471,19 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         analyzeAnswer(response, "spostaUL");
     }
 
+    public void spostaUlSynchronized(MtbColt mtbColtToMove, MtbDepoPosizione posizione, boolean enableDocumentDailyGrouping) throws Exception {
 
-    public void spostaUL(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        String codMdep = posizione.getCodMdep();
+        String posizioneString = posizione.getPosizione();
+
+        spostaUlSynchronized(mtbColtToMove, codMdep, posizioneString, true, enableDocumentDailyGrouping);
+    }
+
+
+    public void spostaUL(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, boolean enableDocumentDailyGrouping, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         executorService.execute(() -> {
             try {
-                spostaUlSynchronized(mtbColtToMove, codMdep, posizione, createDocAutomatically);
+                spostaUlSynchronized(mtbColtToMove, codMdep, posizione, createDocAutomatically, enableDocumentDailyGrouping);
                 if (onComplete != null) onComplete.run();
             } catch (Exception ex) {
                 if (onFailed != null) onFailed.run(ex);
@@ -490,14 +491,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void spostaUL(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-
-        String codMdep = posizione.getCodMdep();
-        String posizioneString = posizione.getPosizione();
-
-        spostaUL(mtbColtToMove, codMdep, posizioneString, true, onComplete, onFailed);
-    }
-
     public void updateTipoULSynchronized(MtbColt mtbColt, String codTcol) throws Exception {
 
         MtbColt mtbColtClone = (MtbColt) mtbColt.clone();

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java

@@ -13,23 +13,17 @@ import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDT
 
 public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer {
 
-
     private final RESTBuilder restBuilder;
-    private final ExecutorService executorService;
 
-    public GiacenzaPvRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
+    public GiacenzaPvRESTConsumer(RESTBuilder restBuilder) {
         this.restBuilder = restBuilder;
-        this.executorService = executorService;
     }
 
-
-    public List<GiacenzaPvDTO> retrieveGiacenzeSynchronized(String codMdep) throws Exception {
+    public List<GiacenzaPvDTO> retrieveGiacenzeSynchronized(String codMdep, String codMart) throws Exception {
         GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 120);
-        var response = giacenzaPvRESTConsumerService.retrieve(codMdep)
-                .execute();
+        var response = giacenzaPvRESTConsumerService.retrieve(codMdep, codMart).execute();
 
         var giacenzeList = analyzeAnswer(response, "retrieve-giacenze-pv");
-
         return giacenzeList != null ? giacenzeList : new ArrayList<>();
     }
 
@@ -64,5 +58,4 @@ public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer {
 
         analyzeAnswer(response, "close-verifica-pv");
     }
-
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java

@@ -17,8 +17,7 @@ import retrofit2.http.Query;
 public interface GiacenzaPvRESTConsumerService {
 
     @GET("wms/pv/verifica_giacenze/retrieve")
-    Call<ServiceRESTResponse<List<GiacenzaPvDTO>>> retrieve(@Query("codMdep") String codMdep);
-
+    Call<ServiceRESTResponse<List<GiacenzaPvDTO>>> retrieve(@Query("codMdep") String codMdep, @Query("codMart") String codMart);
 
     @POST("wms/pv/verifica_giacenze/save_new_row")
     Call<ServiceRESTResponse<Void>> saveNewRowVerifica(@Body SaveNewRowVerificaRequestDTO saveNewRowVerificaRequest);

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoAutomaticoRESTConsumer.java

@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import androidx.annotation.NonNull;
-
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
@@ -9,12 +7,8 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemsRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPutItemsRequestDTO;
-import retrofit2.Call;
-import retrofit2.Response;
 
 @Singleton
 public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
@@ -49,20 +43,12 @@ public class MagazzinoAutomaticoRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void putItems(MtbDepoPosizione posizione, MagazzinoAutomaticoPutItemsRequestDTO magazzinoAutomaticoPutItemsRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public void makeSynchronousPutItemsRequest(MtbDepoPosizione posizione, MagazzinoAutomaticoPutItemsRequestDTO magazzinoAutomaticoPutItemsRequestDTO) throws Exception {
         MagazzinoAutomaticoRESTConsumerService magazzinoAutomaticoRESTConsumerService = restBuilder.getService(MagazzinoAutomaticoRESTConsumerService.class);
-        magazzinoAutomaticoRESTConsumerService.putItems(posizione.getPosizione(), magazzinoAutomaticoPutItemsRequestDTO)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
-                        analyzeAnswer(response, "magazzino-automatico/putItems", data -> onComplete.run(), onFailed);
-                    }
+        var response = magazzinoAutomaticoRESTConsumerService.putItems(posizione.getPosizione(), magazzinoAutomaticoPutItemsRequestDTO)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "magazzino-automatico/putItems");
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java

@@ -66,21 +66,14 @@ public class MesRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getOrdiniLavorazione(String flagEvaso, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<OrdineLavorazioneDTO> getOrdiniLavorazioneSynchronized(String flagEvaso) throws Exception {
         MesRESTConsumerService mesRESTConsumerService = restBuilder.getService(MesRESTConsumerService.class);
 
-        mesRESTConsumerService.getOrdiniLavorazione(flagEvaso)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
-                        analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed);
-                    }
+        var response = mesRESTConsumerService.getOrdiniLavorazione(flagEvaso)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "mes_v2/getOrdiniLavorazione");
+        return data;
     }
 
     public void getLineeProduzione(String codJfasParent, RunnableArgs<List<JtbFasi>> onComplete, RunnableArgs<Exception> onFailed) {

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java

@@ -15,9 +15,9 @@ import java.util.concurrent.ExecutorService;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
@@ -82,22 +82,22 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public List<AvailableCodMdepsDTO> getAvailableCodMdepsSynchronized() throws Exception {
+    public List<MtbDepo> getAvailableCodMdepsSynchronized() throws Exception {
         SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
         var response = service.getAvailableCodMdeps().execute();
         return analyzeAnswer(response, "CodMdepsAvailable");
     }
 
-    public void getAvailableCodMdeps(final RunnableArgs<List<AvailableCodMdepsDTO>> onSuccess, RunnableArgs<Exception> onFailed) {
+    public void getAvailableCodMdeps(final RunnableArgs<List<MtbDepo>> onSuccess, RunnableArgs<Exception> onFailed) {
         SystemRESTConsumerService service = restBuilder.getService(SystemRESTConsumerService.class);
         service.getAvailableCodMdeps().enqueue(new ManagedErrorCallback<>() {
             @Override
-            public void onResponse(Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> call, Response<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> response) {
+            public void onResponse(Call<ServiceRESTResponse<List<MtbDepo>>> call, Response<ServiceRESTResponse<List<MtbDepo>>> response) {
                 analyzeAnswer(response, "CodMdepsAvailable", onSuccess, onFailed);
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> call, @NonNull final Exception e) {
+            public void onFailure(Call<ServiceRESTResponse<List<MtbDepo>>> call, @NonNull final Exception e) {
                 onFailed.run(e);
             }
         });

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java

@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
@@ -25,7 +25,7 @@ public interface SystemRESTConsumerService {
     Call<ServiceRESTResponse<List<String>>> getAvailableProfiles(@Query("username") String username, @Query("password") String password);
 
     @GET("getAvailableCodMdepsForUser")
-    Call<ServiceRESTResponse<List<AvailableCodMdepsDTO>>> getAvailableCodMdeps();
+    Call<ServiceRESTResponse<List<MtbDepo>>> getAvailableCodMdeps();
 
     @POST("sendEmail")
     Call<ServiceRESTResponse<Void>> sendMail(@Body MailRequestDTO mailDto);

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java

@@ -91,34 +91,40 @@ public abstract class _BaseRESTConsumer {
     }
 
     public static <T> void analyzeAnswerList(Response<ServiceRESTResponse<T>> response, String logTitle, RunnableArgs<List<T>> onComplete, RunnableArgs<Exception> onFailed) {
+        try {
+            var dataList = analyzeAnswerList(response, logTitle);
+            onComplete.run(dataList);
+        } catch (Exception e) {
+            onFailed.run(e);
+        }
+    }
+
+    public static <T> List<T> analyzeAnswerList(Response<ServiceRESTResponse<T>> response, String logTitle) throws Exception {
         if (response.isSuccessful()) {
             if (response.body() != null) {
                 if (response.body().getEsito() == EsitoType.OK) {
                     if (!UtilityString.isNullOrEmpty(response.body().getErrorMessage())) {
-                        onFailed.run(new Exception(response.body().getErrorMessage()));
+                        throw new Exception(response.body().getErrorMessage());
                     } else {
-
-                        List<T> dataObj = response.body().getEntityList();
-
-                        onComplete.run(dataObj);
+                        return response.body().getEntityList();
                     }
                 } else {
                     Log.e(logTitle, response.body().getErrorMessage());
-                    onFailed.run(CommonRESTException.tryRecognizeException(response.body().getErrorMessage()));
+                    throw CommonRESTException.tryRecognizeException(response.body().getErrorMessage());
                 }
             } else {
                 Log.e(logTitle, response.message());
-                onFailed.run(new Exception(response.message()));
+                throw new Exception(response.message());
             }
         } else {
             if (response.code() == 404) {
                 Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata");
-                onFailed.run(new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")"));
+                 throw new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")");
             } else if (response.code() == 550)
-                onFailed.run(new InvalidLicenseException());
+                 throw new InvalidLicenseException();
             else {
                 Log.e(logTitle, "Status " + response.code() + ": " + response.message());
-                onFailed.run(new Exception("Status " + response.code() + ": " + response.message()));
+                 throw new Exception("Status " + response.code() + ": " + response.message());
             }
         }
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/interfaces/ColliCaricoRESTConsumerInterface.java

@@ -12,13 +12,18 @@ import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
 
 public interface ColliCaricoRESTConsumerInterface {
 
+    MtbColt createUDCSynchronized(CreateUDCRequestDTO createUDCRequestDTO) throws Exception;
     void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed);
 
+    CloseUDCResponseDTO synchronousCloseUDC(CloseUDCRequestDTO closeUDCRequestDTO) throws Exception;
     void closeUDC(CloseUDCRequestDTO closeUDCRequestDTO, RunnableArgs<CloseUDCResponseDTO> onComplete, RunnableArgs<Exception> onFailed);
 
+    MtbColr synchronousInsertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO) throws Exception;
     void insertUDCRow(InsertUDCRowRequestDTO insertUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed);
 
+    MtbColr synchronousEditUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO) throws Exception;
     void editUDCRow(EditUDCRowRequestDTO editUDCRowRequestDTO, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed);
 
+    void synchronousDeleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRowRequestDTO) throws Exception;
     void deleteUDCRow(DeleteUDCRowRequestDTO deleteUDCRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed);
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java

@@ -1,28 +0,0 @@
-package it.integry.integrywmsnative.core.rest.model;
-
-import com.google.gson.annotations.SerializedName;
-
-public class AvailableCodMdepsDTO {
-
-    @SerializedName("codMdep")
-    private String codMdep;
-
-    @SerializedName("descrizione")
-    private String descrizione;
-
-    public String getCodMdep() {
-        return codMdep;
-    }
-
-    public String getDescrizione() {
-        return descrizione;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if((obj) != null) {
-            return ((AvailableCodMdepsDTO) obj).codMdep.equalsIgnoreCase(codMdep);
-        }
-        return false;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/services/inventario/InventarioService.java

@@ -16,7 +16,6 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 @Singleton
 public class InventarioService {
@@ -48,7 +47,7 @@ public class InventarioService {
         MtbColt mtbColt = new MtbColt();
 
         mtbColt.setGestione(inventario.getGestione());
-        mtbColt.setDataCollo(UtilityDate.toDate(inventario.getDataCollo()));
+        mtbColt.setDataCollo(inventario.getDataCollo());
         mtbColt.setSerCollo(inventario.getSerCollo());
         mtbColt.setNumCollo(inventario.getNumCollo());
         mtbColt.setSegno(inventario.getSegno());
@@ -71,7 +70,7 @@ public class InventarioService {
         MtbColr mtbColr = new MtbColr();
 
         mtbColr.setGestione(inventario.getGestione());
-        mtbColr.setDataCollo(UtilityDate.toDate(inventario.getDataCollo()));
+        mtbColr.setDataCollo(inventario.getDataCollo());
         mtbColr.setSerCollo(inventario.getSerCollo());
         mtbColr.setNumCollo(inventario.getNumCollo());
         mtbColr.setCodMart(inventario.getCodMart());

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -7,15 +7,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.Azienda;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 
 public class DBSettingsModel {
 
     private List<String> availableProfiles = null;
-    private List<AvailableCodMdepsDTO> availableCodMdep = null;
+    private List<MtbDepo> availableDepos = null;
     private List<MtbDepoPosizione> availablePosizioni = null;
 
     private Azienda datiAzienda = null;
@@ -99,6 +99,10 @@ public class DBSettingsModel {
     private boolean flagSpedizioneEnableFastPicking = false;
     private boolean flagAccettazioneBollaEditableQtaTot = true;
     private boolean flagViewSwitchDepoButton = true;
+    private boolean flagProduzioneSkipAskVersamentoAutomatico;
+    private boolean flagAccettazioneViewLotto = false;
+    private boolean flagSpedizioneUnderflowQuantityWarning = false;
+    private boolean flagAccettazioneBollaMarkReceived = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -154,12 +158,12 @@ public class DBSettingsModel {
         return this;
     }
 
-    public List<AvailableCodMdepsDTO> getAvailableCodMdep() {
-        return availableCodMdep;
+    public List<MtbDepo> getAvailableDepos() {
+        return availableDepos;
     }
 
-    public void setAvailableCodMdep(List<AvailableCodMdepsDTO> availableCodMdep) {
-        this.availableCodMdep = availableCodMdep;
+    public void setAvailableDepos(List<MtbDepo> availableDepos) {
+        this.availableDepos = availableDepos;
     }
 
     public boolean isEnableCheckPartitaMagCheckPickingV() {
@@ -833,4 +837,40 @@ public class DBSettingsModel {
     public void setFlagViewSwitchDepoButton(boolean flagViewSwitchDepoButton) {
         this.flagViewSwitchDepoButton = flagViewSwitchDepoButton;
     }
+
+    public boolean isFlagProduzioneSkipAskVersamentoAutomatico() {
+        return flagProduzioneSkipAskVersamentoAutomatico;
+    }
+
+    public DBSettingsModel setFlagProduzioneSkipAskVersamentoAutomatico(boolean flagProduzioneSkipAskVersamentoAutomatico) {
+        this.flagProduzioneSkipAskVersamentoAutomatico = flagProduzioneSkipAskVersamentoAutomatico;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneViewLotto() {
+        return flagAccettazioneViewLotto;
+    }
+
+    public DBSettingsModel setFlagAccettazioneViewLotto(boolean flagAccettazioneViewLotto) {
+        this.flagAccettazioneViewLotto = flagAccettazioneViewLotto;
+        return this;
+    }
+
+    public boolean isFlagSpedizioneUnderflowQuantityWarning() {
+        return flagSpedizioneUnderflowQuantityWarning;
+    }
+
+    public DBSettingsModel setFlagSpedizioneUnderflowQuantityWarning(boolean flagSpedizioneUnderflowQuantityWarning) {
+        this.flagSpedizioneUnderflowQuantityWarning = flagSpedizioneUnderflowQuantityWarning;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneBollaMarkReceived() {
+        return flagAccettazioneBollaMarkReceived;
+    }
+
+    public DBSettingsModel setFlagAccettazioneBollaMarkReceived(boolean flagAccettazioneBollaMarkReceived) {
+        this.flagAccettazioneBollaMarkReceived = flagAccettazioneBollaMarkReceived;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -18,6 +18,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
@@ -26,7 +27,6 @@ import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.utility.UtilityFirebase;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -170,7 +170,7 @@ public class SettingsManager {
     private static void loadAvailableCodMdeps() throws Exception {
         var availableCodMdeps = mSystemRESTConsumer.getAvailableCodMdepsSynchronized();
 
-        dbSettingsModelIstance.setAvailableCodMdep(availableCodMdeps);
+        dbSettingsModelIstance.setAvailableDepos(availableCodMdeps);
 
         if (availableCodMdeps == null || availableCodMdeps.isEmpty()) {
             throw new Exception(mContext.getText(R.string.no_codmdep_available).toString());
@@ -179,7 +179,7 @@ public class SettingsManager {
         boolean codMdepExistsAnymore = false;
 
         if (settingsModelIstance.getUserSession().getDepo() != null) {
-            for (AvailableCodMdepsDTO availableCodMdepDTO : availableCodMdeps) {
+            for (MtbDepo availableCodMdepDTO : availableCodMdeps) {
                 //Controllo se il codMdep salvato esiste ancora
                 if (availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.getUserSession().getDepo().getCodMdep())) {
                     codMdepExistsAnymore = true;
@@ -254,11 +254,21 @@ public class SettingsManager {
                 .setSection("ACCETTAZIONE")
                 .setKeySection("FLAG_DELETE_ROW_ON_CLOSE")
                 .setSetter(dbSettingsModelIstance::setFlagAccettazioneDeleteRowOnClose));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE")
+                .setKeySection("FLAG_VIEW_LOTTO")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneViewLotto));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_CAN_ADD_EXTRA_QUANTITY")
                 .setSetter(dbSettingsModelIstance::setFlagCanAddExtraQuantitySpedizione));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_UNDERFLOW_QUANTITY_WARNING")
+                .setSetter(dbSettingsModelIstance::setFlagSpedizioneUnderflowQuantityWarning));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -301,6 +311,12 @@ public class SettingsManager {
                 .setSection("PRODUZIONE")
                 .setKeySection("VIEW_POSIZIONI")
                 .setSetter(dbSettingsModelIstance::setViewPosizioni));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PRODUZIONE")
+                .setKeySection("FLAG_SKIP_ASK_VERSAMENTO_AUTOMATICO")
+                .setSetter(dbSettingsModelIstance::setFlagProduzioneSkipAskVersamentoAutomatico)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -474,6 +490,12 @@ public class SettingsManager {
                 .setKeySection("FLAG_ASK_PRINT_UL")
                 .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaAskPrintUl)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE_BOLLA")
+                .setKeySection("FLAG_ENABLE_MARK_RECEIVED")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaMarkReceived)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java

@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.settings;
 
 import java.time.LocalDateTime;
 
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 
 public class SettingsModel {
 
@@ -85,7 +85,7 @@ public class SettingsModel {
         private LocalDateTime refreshTokenExpiryDate;
         private String deviceId;
         private String profileDB;
-        private AvailableCodMdepsDTO depo;
+        private MtbDepo depo;
         private Integer defaultOrdinamentoPickingAccettazione = 0;
         private Integer defaultOrdinamentoPickingAccettazioneBolle = 0;
 
@@ -134,11 +134,11 @@ public class SettingsModel {
             return this;
         }
 
-        public AvailableCodMdepsDTO getDepo() {
+        public MtbDepo getDepo() {
             return depo;
         }
 
-        public UserSession setDepo(AvailableCodMdepsDTO depo) {
+        public UserSession setDepo(MtbDepo depo) {
             this.depo = depo;
             return this;
         }

app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java

@@ -7,18 +7,22 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
+import android.text.Html;
+import android.util.Log;
 
-import androidx.fragment.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
+
 import java.io.File;
-import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.BuildConfig;
-import it.integry.integrywmsnative.core.helper.ContextHelper;
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -26,11 +30,14 @@ import it.integry.integrywmsnative.core.utility.FileDownloader;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAvailableView;
 
 @Singleton
 public class UpdatesManager {
 
+    private static final String TAG = "UpdatesManager";
+
     private final ExecutorService executorService;
     private final Handler handler;
     private final SystemRESTConsumer systemRESTConsumer;
@@ -41,109 +48,149 @@ public class UpdatesManager {
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
-    public void executeCheck(Context context, boolean forceReinstall) {
-
+    public void executeCheck(@NonNull Context context, @NonNull FragmentManager fragmentManager, boolean forceReinstall) {
         executorService.execute(() -> {
-
             try {
-                final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
-                        (SettingsManager.i().getServer().getPort() > 0 ? ":" + SettingsManager.i().getServer().getPort() : "") + "/ems-api/";
-
                 SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-                var betaEnabled = sharedPreferences.getBoolean(MainSettingsFragment.KEY_BUTTON_ENABLE_BETA, false);
+                boolean betaEnabled = sharedPreferences.getBoolean(MainSettingsFragment.KEY_BUTTON_ENABLE_BETA, false);
 
                 LatestAppVersionInfoDTO latestData = systemRESTConsumer.retrieveUpdatesInfoSynchronized(betaEnabled);
 
-                if (latestData == null)
+                if (latestData == null) {
+                    Log.d(TAG, "No update information received from server.");
                     return;
+                }
 
-                if (latestData.getLatestVersionCode() < BuildConfig.VERSION_CODE)
+                boolean isUpdateRequired = latestData.getLatestVersionCode() > BuildConfig.VERSION_CODE;
+                boolean currentVersionIsBeta = BuildConfig.VERSION_NAME.toLowerCase().contains("beta");
+                boolean isChannelSwitch = currentVersionIsBeta != betaEnabled;
+
+                if (!isUpdateRequired && !forceReinstall && !isChannelSwitch) {
+                    Log.d(TAG, "App is up to date.");
                     return;
+                }
 
-                boolean currentVersionIsBeta = BuildConfig.VERSION_NAME.contains("beta");
-
-                if(!forceReinstall && currentVersionIsBeta == betaEnabled && latestData.getLatestVersionCode() == BuildConfig.VERSION_CODE)
-                    return;
-
-                //Se sto passando da una beta a una stable e viceversa non obbligo l'utente a fare l'aggiornamento
-                if(currentVersionIsBeta != betaEnabled || forceReinstall) {
+                // Se si passa da beta a stabile (o viceversa) o se è una reinstallazione forzata,
+                // l'aggiornamento non deve essere obbligatorio per non bloccare l'utente.
+                if (isChannelSwitch || forceReinstall) {
                     latestData.setForced(false);
                 }
 
-                String currentDownloadUrl = baseEndpoint + latestData.getUrl();
+                final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
+                        (SettingsManager.i().getServer().getPort() > 0 ? ":" + SettingsManager.i().getServer().getPort() : "") + "/ems-api/";
+                String downloadUrl = baseEndpoint + latestData.getUrl();
 
-                showDialog(context, latestData, () -> {
-                    installAPK(context, currentDownloadUrl);
-                });
+                handler.post(() -> showUpdateAvailableDialog(context, fragmentManager, latestData, downloadUrl));
 
             } catch (Exception e) {
-                handler.post(() -> {
-                    UtilityExceptions.defaultException(context, e);
-                });
+                Log.e(TAG, "Error during update check", e);
+                // Se il check fallisce, non è un errore bloccante. L'utente può continuare a usare l'app.
             }
         });
     }
 
-    private void showDialog(Context context, LatestAppVersionInfoDTO updatesData, Runnable onUpdateStart) {
-        DialogUpdateAvailableView.newInstance(updatesData, onUpdateStart)
-                .show(((FragmentActivity)context).getSupportFragmentManager(), "dialog-updates");
+    private void showUpdateAvailableDialog(@NonNull Context context, @NonNull FragmentManager fragmentManager, @NonNull LatestAppVersionInfoDTO updatesData, @NonNull String downloadUrl) {
+        DialogUpdateAvailableView dialog = DialogUpdateAvailableView.newInstance(updatesData, () -> {
+            // L'utente ha accettato di aggiornare
+            downloadAndInstall(context, fragmentManager, downloadUrl, updatesData.isForced());
+        });
+
+        if (updatesData.isForced()) {
+            dialog.setCancelable(false);
+        }
+
+        dialog.show(fragmentManager, "dialog-updates");
     }
 
-    private void installAPK(Context context, String downloadURL) {
-
-        File destination = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-
-        var progressDialogBuilder = new DialogProgressView("Download", null, false);
-        progressDialogBuilder.show(Objects.requireNonNull(ContextHelper.getFragmentManagerFromContext(context)), "tag");
-
-
-        var fileDownloader = new FileDownloader()
-                .setDestFolder(destination)
-                .setUrlString(downloadURL)
-                .setOnProgressUpdate(progress -> {
-                    handler.post(() -> {
-                        progressDialogBuilder.setProgress(progress);
-                    });
-                })
-                .setOnDownloadCompleted(destPath -> {
-
-                    handler.post(() -> {
-                        progressDialogBuilder.dismiss();
-
-                        if (!destination.exists()) {
-                            UtilityExceptions.defaultException(context, new Exception("Errore durante il download dell'aggiornamento"));
-                            return;
-                        }
-
-                        Uri fileLoc;
-                        Intent intent;
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                            intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
-                            fileLoc = GenericFileProvider.getUriForFile(context,
-                                    context.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
-                                    destPath);
-                        } else {
-                            intent = new Intent(Intent.ACTION_VIEW);
-                            fileLoc = Uri.fromFile(destPath);
-                        }
-
-                        intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");
-                        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
-                        context.startActivity(intent);
-                    });
-
-                });
+    private void downloadAndInstall(@NonNull Context context, @NonNull FragmentManager fragmentManager, @NonNull String downloadUrl, boolean isForced) {
+        DialogProgressView progressDialog = new DialogProgressView("Download", null, false);
+        if (isForced) {
+            progressDialog.setCancelable(false);
+        }
+        progressDialog.show(fragmentManager, "progress-dialog");
 
+        FileDownloader fileDownloader = new FileDownloader()
+                .setExecutorService(executorService)
+                .setDestFolder(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS))
+                .setUrlString(downloadUrl)
+                .setOnProgressUpdate(progress -> handler.post(() -> progressDialog.setProgress(progress)));
 
         executorService.execute(() -> {
             try {
-                fileDownloader.download();
+                File apkFile = fileDownloader.download();
+                handler.post(() -> {
+                    progressDialog.dismiss();
+                    installApk(context, fragmentManager, apkFile, isForced);
+                });
             } catch (Exception e) {
-                progressDialogBuilder.dismissAllowingStateLoss();
-                UtilityExceptions.defaultException(context, e);
+                Log.e(TAG, "Download failed", e);
+                handler.post(() -> {
+                    progressDialog.dismissAllowingStateLoss();
+                    handleUpdateError(fragmentManager, e, isForced);
+                });
             }
         });
     }
+
+    private void installApk(@NonNull Context context, @NonNull FragmentManager fragmentManager, @NonNull File apkFile, boolean isForced) {
+        if (!apkFile.exists()) {
+            handleUpdateError(fragmentManager, new Exception("File APK non trovato dopo il download."), isForced);
+            return;
+        }
+
+        Uri fileUri;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            fileUri = GenericFileProvider.getUriForFile(context,
+                    context.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
+                    apkFile);
+        } else {
+            fileUri = Uri.fromFile(apkFile);
+        }
+
+        Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+        intent.setDataAndType(fileUri, "application/vnd.android.package-archive");
+        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        try {
+            context.startActivity(intent);
+            // Se l'aggiornamento è forzato, l'app si chiuderà per attendere l'installazione manuale.
+            if (isForced) {
+                // Diamo tempo all'utente di vedere l'installer di sistema prima di chiudere l'app.
+                handler.postDelayed(MainApplication::exit, 1000);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to start APK installation", e);
+            handleUpdateError(fragmentManager, e, isForced);
+        }
+    }
+
+    private void handleUpdateError(@NonNull FragmentManager fragmentManager, @NonNull Exception ex, boolean isForced) {
+        FirebaseCrashlytics.getInstance().recordException(ex);
+        String errorMessage = UtilityExceptions.recognizeExceptionMessage(ex);
+
+        handler.post(() -> {
+            String title = isForced ? "Aggiornamento Obbligatorio Fallito" : "Errore Aggiornamento";
+            Runnable onPositiveClick = null;
+            if (isForced) {
+                onPositiveClick = MainApplication::exit;
+            }
+
+            DialogSimpleMessageView dialog = DialogSimpleMessageView.newInstance(
+                    isForced ? DialogSimpleMessageView.TYPE.ERROR : DialogSimpleMessageView.TYPE.WARNING,
+                    title,
+                    Html.fromHtml(errorMessage),
+                    null,
+                    onPositiveClick,
+                    null,
+                    null,
+                    null);
+
+            if (isForced) {
+                dialog.setCancelable(false);
+            }
+
+            dialog.show(fragmentManager, "error-dialog");
+        });
+    }
 }
+

app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java

@@ -0,0 +1 @@
+

app/src/main/java/it/integry/integrywmsnative/core/utility/FileDownloader.java

@@ -9,6 +9,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
@@ -18,68 +21,87 @@ public class FileDownloader {
     private File destFolder;
 
     private RunnableArgs<Integer> onProgressUpdate;
-    private RunnableArgs<File> onDownloadCompleted;
 
+    private ExecutorService executorService;
 
-    public void download() throws Exception {
-        InputStream input = null;
-        OutputStream output = null;
-        HttpURLConnection connection = null;
-        File downloadFile = null;
+    public File download() throws Exception {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
 
-        try {
-            if (!destFolder.exists()) destFolder.mkdirs();
+        AtomicReference<File> result = new AtomicReference<>();
+        AtomicReference<Exception> exceptionAtomicReference = new AtomicReference<>();
 
-            URL url = new URL(urlString);
-            connection = (HttpURLConnection) url.openConnection();
-            connection.connect();
-            connection.setConnectTimeout(120 * 1000);
+        executorService.execute(() -> {
+            InputStream input = null;
+            OutputStream output = null;
+            HttpURLConnection connection = null;
+            File downloadFile = null;
 
-            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
-                throw new Exception("Server returned HTTP " + connection.getResponseCode() + " " + connection.getResponseMessage());
-
-            input = connection.getInputStream();
-            int totalBytesToDownload = connection.getContentLength();
-            int downloadedBytes = 0;
-
-            String title = URLUtil.guessFileName(String.valueOf(url), null, null);
-            downloadFile = new File(destFolder, title);
-
-            if (downloadFile.exists())
-                downloadFile.delete();
-
-            output = new FileOutputStream(downloadFile);
-
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = input.read(buf)) > 0) {
-                output.write(buf, 0, len);
-
-                downloadedBytes += len;
-                if (onProgressUpdate != null)
-                    onProgressUpdate.run((downloadedBytes * 100) / totalBytesToDownload);
-            }
-
-        } catch (Exception e) {
-            if(downloadFile != null && downloadFile.exists())
-                downloadFile.delete();
-            throw e;
-
-        } finally {
             try {
-                if (output != null)
-                    output.close();
-                if (input != null)
-                    input.close();
-            } catch (IOException ignored) {
-            }
-            if (connection != null)
-                connection.disconnect();
-        }
+                if (!destFolder.exists()) destFolder.mkdirs();
 
-        if (onDownloadCompleted != null) onDownloadCompleted.run(downloadFile);
+                URL url = new URL(urlString);
+                connection = (HttpURLConnection) url.openConnection();
+                connection.connect();
+                connection.setConnectTimeout(120 * 1000);
+
+                if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
+                    throw new Exception("Server returned HTTP " + connection.getResponseCode() + " " + connection.getResponseMessage());
+
+                input = connection.getInputStream();
+                int totalBytesToDownload = connection.getContentLength();
+                int downloadedBytes = 0;
+
+                String title = URLUtil.guessFileName(String.valueOf(url), null, null);
+                downloadFile = new File(destFolder, title);
+
+                if (downloadFile.exists())
+                    downloadFile.delete();
+
+                output = new FileOutputStream(downloadFile);
+
+                byte[] buf = new byte[1024];
+                int len;
+                while ((len = input.read(buf)) > 0) {
+                    output.write(buf, 0, len);
+
+                    downloadedBytes += len;
+                    if (onProgressUpdate != null)
+                        onProgressUpdate.run((downloadedBytes * 100) / totalBytesToDownload);
+                }
+
+                result.set(downloadFile);
+            } catch (Exception e) {
+                if(downloadFile != null && downloadFile.exists())
+                    downloadFile.delete();
+                exceptionAtomicReference.set(e);
+
+            } finally {
+                try {
+                    if (output != null)
+                        output.close();
+                    if (input != null)
+                        input.close();
+                } catch (IOException ignored) {
+                }
+                if (connection != null)
+                    connection.disconnect();
+
+                countDownLatch.countDown();
+            }
+        });
+
+        countDownLatch.await();
+
+        if(exceptionAtomicReference.get() != null)
+            throw exceptionAtomicReference.get();
+
+        return result.get();
     }
 
+    public FileDownloader setExecutorService(ExecutorService executorService) {
+        this.executorService = executorService;
+        return this;
+    }
 
     public String getUrlString() {
         return urlString;
@@ -103,9 +125,4 @@ public class FileDownloader {
         this.onProgressUpdate = onProgressUpdate;
         return this;
     }
-
-    public FileDownloader setOnDownloadCompleted(RunnableArgs<File> onDownloadCompleted) {
-        this.onDownloadCompleted = onDownloadCompleted;
-        return this;
-    }
 }

app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.utility;
+
+import android.text.method.DigitsKeyListener;
+
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+/**
+ * KeyListener personalizzato che accetta numeri decimali
+ * usando il separatore decimale del locale corrente (virgola per italiano)
+ */
+public class LocaleDecimalKeyListener {
+
+    /**
+     * Ottiene un'istanza del KeyListener per il locale corrente
+     */
+    public static DigitsKeyListener getInstance() {
+        return getInstance(Locale.getDefault());
+    }
+
+    /**
+     * Ottiene un'istanza del KeyListener per un locale specifico
+     */
+    public static DigitsKeyListener getInstance(Locale locale) {
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+        char decimalSeparator = symbols.getDecimalSeparator();
+        return DigitsKeyListener.getInstance("0123456789" + decimalSeparator);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java

@@ -41,6 +41,19 @@ public class UtilityDate {
         public static final String DM_HUMAN = "dd MMM";
         public static final String DMY_HUMAN = "dd MMM yyyy";
         public static final String DMY_HUMAN_LONG = "dd MMMM yyyy";
+
+
+
+
+        public static final DateTimeFormatter DATE_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(DMY_SLASH)
+                .withZone(ZoneId.systemDefault());
+
+
+        public static final DateTimeFormatter DATETIME_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(DMY_TIME_SLASH)
+                .withZone(ZoneId.systemDefault());
+
+        public static final DateTimeFormatter DATE_DMY_HUMAN_FORMATTER = DateTimeFormatter.ofPattern(DMY_HUMAN_LONG)
+                .withZone(ZoneId.systemDefault());
     }
 
     public static Date recognizeDateWithExceptionHandler(String dateString) {

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java

@@ -38,13 +38,7 @@ public class UtilityExceptions {
             Logger.e(ex, "Errore", (Object) ex.getStackTrace());
         }
 
-        String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
-
-        if (errorMessage == null) {
-            errorMessage = ex.getMessage();
-
-            if (ex.getCause() != null) errorMessage += "<br />" + ex.getCause().getMessage();
-        }
+        String errorMessage = recognizeExceptionMessage(ex);
 
         FragmentManager fm = ContextHelper.getFragmentManagerFromContext(context);
 
@@ -68,4 +62,15 @@ public class UtilityExceptions {
         }
     }
 
+    public static String recognizeExceptionMessage(Exception ex) {
+        String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
+
+        if (errorMessage == null) {
+            errorMessage = ex.getMessage();
+
+            if (ex.getCause() != null) errorMessage += "<br />" + ex.getCause().getMessage();
+        }
+        return errorMessage;
+    }
+
 }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java

@@ -3,9 +3,15 @@ package it.integry.integrywmsnative.core.utility;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
+import android.util.TypedValue;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.annotation.RawRes;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -69,4 +75,23 @@ public class UtilityResources {
         return 0;
     }
 
+
+
+
+
+    // Funzione di utilità per ottenere un colore da un attributo del tema
+    public static @ColorRes int getColorResourceFromAttr(Context context, @AttrRes int attrRes) {
+        TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attrRes, typedValue, true);
+        return typedValue.data;
+    }
+
+    public static @ColorInt int getColorFromAttr(Context context, @AttrRes int attrRes) {
+        return ContextCompat.getColor(context, getColorResourceFromAttr(context, attrRes));
+    }
+
+    public static ColorStateList getColorStateListFromAttr(Context context, @AttrRes int attrRes) {
+        return ColorStateList.valueOf(getColorResourceFromAttr(context, attrRes));
+    }
+
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoFragment.java

@@ -2,12 +2,17 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_elenco;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.databinding.BindingAdapter;
 import androidx.databinding.ObservableArrayList;
 
 import com.annimon.stream.Stream;
@@ -48,6 +53,9 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
     private AppCompatTextView mAppBarTitle;
 
     public BindableBoolean fabVisible = new BindableBoolean(false);
+    public BindableBoolean fabMenuVisible = new BindableBoolean(false);
+
+    private PopupMenu fabPopupMenu;
 
     private String mTextFilter;
 
@@ -100,6 +108,9 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
 
         this.initRecyclerView();
 
+        if (SettingsManager.iDB().isFlagAccettazioneBollaMarkReceived())
+            this.initFab();
+
         mToolbar.setRecyclerView(mBinding.accettazioneMainList);
 
         return mBinding.getRoot();
@@ -111,6 +122,7 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
         super.onStart();
 
         this.fabVisible.set(false);
+        this.fabMenuVisible.set(false);
         mViewModel.init();
     }
 
@@ -147,8 +159,11 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
                             .filter(y -> !y.getGroupTitle().equalsIgnoreCase(x.getGroupTitle()) && y.getSelectedObservable().get())
                             .forEach(y -> y.getSelectedObservable().set(false));
 
-                    fabVisible.set(Stream.of(mBolleInevaseMutableData)
-                            .anyMatch(y -> y.getSelectedObservable().get()));
+                    boolean rowSelected = Stream.of(mBolleInevaseMutableData)
+                            .anyMatch(y -> y.getSelectedObservable().get());
+
+                    fabVisible.set(rowSelected && !SettingsManager.iDB().isFlagAccettazioneBollaMarkReceived());
+                    fabMenuVisible.set(rowSelected && SettingsManager.iDB().isFlagAccettazioneBollaMarkReceived());
                 });
 
         adapter.setEmptyView(this.mBinding.bolleAccettazioneEmptyView);
@@ -159,6 +174,28 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
             mToolbar.setRecyclerView(this.mBinding.accettazioneMainList);
     }
 
+    private void initFab() {
+        fabPopupMenu = new PopupMenu(requireContext(), this.mBinding.accettazioneBollaFab,
+                (Gravity.END | Gravity.BOTTOM),
+                androidx.appcompat.R.attr.popupMenuStyle,
+                com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
+
+        fabPopupMenu.setForceShowIcon(true);
+        fabPopupMenu.getMenuInflater().inflate(R.menu.accettazione_bolla_fab_menu, fabPopupMenu.getMenu());
+
+        fabPopupMenu.setOnMenuItemClickListener(item -> {
+            int itemId = item.getItemId();
+
+            if (itemId == R.id.open_document) {
+                this.dispatchBolle();
+            } else if (itemId == R.id.mark_document_received) {
+                this.setBolleReceived();
+            }
+
+            return false;
+        });
+    }
+
 
     private void refreshList() {
         List<TestataBollaAccettazioneDTO> tmpList = mViewModel.getBolleList().getValue();
@@ -223,14 +260,23 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
         }).toList();
     }
 
+    public void openFabMenu() {
+        fabPopupMenu.show();
+    }
+
+    private void setBolleReceived() {
+        this.mViewModel.markDocumentReceived(getSelectedBolle());
+    }
 
     public void dispatchBolle() {
-        List<TestataBollaAccettazioneDTO> selectedBolle = Stream.of(this.mBolleInevaseMutableData)
+        this.mViewModel.loadPicking(getSelectedBolle());
+    }
+
+    private List<TestataBollaAccettazioneDTO> getSelectedBolle() {
+        return Stream.of(this.mBolleInevaseMutableData)
                 .filter(x -> x.getSelectedObservable().get())
                 .map(MainAccettazioneBolleElencoListModel::getOriginalModel)
                 .toList();
-
-        this.mViewModel.loadPicking(selectedBolle);
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoViewModel.java

@@ -1,12 +1,15 @@
 package it.integry.integrywmsnative.gest.accettazione_bolla_elenco;
 
+import androidx.databinding.ObservableInt;
 import androidx.lifecycle.MutableLiveData;
 
 import java.util.List;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.BolleAccettazioneRESTConsumer;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBollaAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.TestataBollaAccettazioneDTO;
@@ -34,14 +37,10 @@ public class MainAccettazioneBollaElencoViewModel {
         }, this::sendError);
     }
 
-
     public MutableLiveData<List<TestataBollaAccettazioneDTO>> getBolleList() {
         return bolleList;
     }
 
-
-
-
     public void loadPicking(List<TestataBollaAccettazioneDTO> selectedBolle) {
         this.sendOnLoadingStarted();
 
@@ -53,21 +52,10 @@ public class MainAccettazioneBollaElencoViewModel {
         }, this::sendError);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    public void markDocumentReceived(List<TestataBollaAccettazioneDTO> selectedBolle) {
+        this.sendOnLoadingStarted();
+        this.bolleAccettazioneRESTConsumer.markDocumentReceived(selectedBolle, this::sendOnLoadingEnded, this::sendError);
+    }
 
     public MainAccettazioneBollaElencoViewModel setListener(MainAccettazioneBollaElencoViewModel.Listener listener) {
         this.listener = listener;
@@ -87,10 +75,9 @@ public class MainAccettazioneBollaElencoViewModel {
     }
 
     private void sendOnPickingReady(List<TestataBollaAccettazioneDTO> bolle, List<SitBollaAccettazioneDTO> sitArts) {
-        if(this.listener != null) listener.onPickingReady(bolle, sitArts);
+        if (this.listener != null) listener.onPickingReady(bolle, sitArts);
     }
 
-
     public interface Listener extends ILoadingListener {
         void onError(Exception ex);
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumer.java

@@ -9,9 +9,12 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumerService;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
+import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.MarkDocumentReceivedRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaResponseDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoBolleAccettazioneResponseDTO;
@@ -65,4 +68,19 @@ public class BolleAccettazioneRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
+    public void markDocumentReceived(List<TestataBollaAccettazioneDTO> bolle, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        BolleAccettazioneRESTConsumerService service = restBuilder.getService(BolleAccettazioneRESTConsumerService.class);
+        service.markDocumentReceived(new MarkDocumentReceivedRequestDTO().setBolle(bolle))
+                .enqueue(new ManagedErrorCallback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "markDocumentReceived", m -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, @NonNull final Exception e) {
+                        onFailed.run(e);
+                    }
+                });
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumerService.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.MarkDocumentReceivedRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaRequestDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoArticoliAccettazioneBollaResponseDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.RetrieveElencoBolleAccettazioneResponseDTO;
@@ -17,4 +18,6 @@ public interface BolleAccettazioneRESTConsumerService {
     @POST("wms/accettazione-bolla/retrievePickingList")
     Call<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> retrievePickingListBolle(@Body RetrieveElencoArticoliAccettazioneBollaRequestDTO retrieveElencoArticoliAccettazioneBollaReques);
 
+    @POST("wms/accettazione-bolla/markDocumentReceived")
+    Call<ServiceRESTResponse<Void>> markDocumentReceived(@Body MarkDocumentReceivedRequestDTO request);
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/MarkDocumentReceivedRequestDTO.java

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto;
+
+import java.util.List;
+
+public class MarkDocumentReceivedRequestDTO {
+
+    private List<TestataBollaAccettazioneDTO> bolle;
+
+    public List<TestataBollaAccettazioneDTO> getBolle() {
+        return bolle;
+    }
+
+    public MarkDocumentReceivedRequestDTO setBolle(List<TestataBollaAccettazioneDTO> bolle) {
+        this.bolle = bolle;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java

@@ -114,7 +114,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoFragment.java

@@ -78,7 +78,6 @@ public class MainAccettazioneOrdiniElencoFragment extends BaseFragment implement
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
-        onLoadingEnded();
         outState.putString("mToolbar", DataCache.addItem(mToolbar));
 
         super.onSaveInstanceState(outState);

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java

@@ -36,6 +36,7 @@ public class SitArtOrdDTO {
     private String descrizioneEstesaArt;
     private String descrizioneEstesaOrd;
     private Date dataCons;
+    private String partitaMag;
 
     public String getDescrizioneEstesaOrd() {
         return descrizioneEstesaOrd;
@@ -301,4 +302,13 @@ public class SitArtOrdDTO {
         this.dataCons = dataCons;
         return this;
     }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public SitArtOrdDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java

@@ -11,7 +11,6 @@ import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
@@ -19,6 +18,7 @@ import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.math.BigDecimal;
@@ -157,7 +157,17 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         boolean useQtaOrd = SettingsManager.iDB().isFlagAccettazioneUseQtaOrd();
 
         mViewModel.setListeners(this);
-        mViewModel.init(mOrders, mSitArts, useQtaOrd);
+
+        this.onLoadingStarted();
+        executorService.execute(() -> {
+            try {
+                mViewModel.init(mOrders, mSitArts, useQtaOrd);
+                this.onLoadingEnded();
+            } catch (Exception e) {
+                this.onError(e);
+            }
+        });
+
     }
 
     private void initFab() {
@@ -369,7 +379,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     private void refreshList() {
 
-        runOnUiThread(() -> {
+        handler.post(() -> {
             List<PickingObjectDTO> tmpList;
 
             if (mAppliedFilterViewModel != null) {
@@ -683,10 +693,15 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     }
 
     private void showOrderByDialog() {
-        AlertDialog dialog = new AlertDialog.Builder(this).setTitle(this.getText(R.string.action_orderBy)).setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(), (dialog12, which) -> {
-            mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
-            SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which);
-        }).setPositiveButton(getText(R.string.ok), (dialog1, which) -> this.refreshList()).create();
+        MaterialAlertDialogBuilder dialog = new MaterialAlertDialogBuilder(this)
+                .setTitle(this.getText(R.string.action_orderBy))
+                .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(),
+                        (dialog12, which) -> {
+                            mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
+                            SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which);
+                        })
+                .setPositiveButton(getText(R.string.ok), (dialog1, which) -> this.refreshList());
+
         dialog.show();
     }
 
@@ -772,7 +787,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onWarning(String warningText, Runnable action) {
-        this.runOnUiThread(() -> {
+        handler.post(() -> {
             this.onLoadingEnded();
             DialogSimpleMessageView
                     .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
@@ -800,7 +815,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onRowSaved() {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
                     .setBackgroundTint(getResources().getColor(R.color.green_500))
                     .show();
@@ -809,7 +824,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onFilterCodMartApplied(String codMartToFilter) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             var codMarts = new ArrayList<String>();
             codMarts.add(codMartToFilter);
 
@@ -819,7 +834,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onFilterPosizioneApplied(String posizioneToFilter) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             var posizioni = new ArrayList<String>();
             posizioni.add(posizioneToFilter);
 
@@ -830,7 +845,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     @Override
     public void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
 
-        runOnUiThread(() -> {
+        handler.post(() -> {
             DialogVersamentoAutomaticoULDoneView.newInstance(versamentoAutomaticoULResponseDTO, onComplete).show(getSupportFragmentManager(), "tag");
         });
 
@@ -838,7 +853,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             String text = getResources().getString(R.string.alert_delete_mtb_colr);
             DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false)).show(getSupportFragmentManager(), "tag");
         });
@@ -846,7 +861,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onLUOpened(MtbColt mtbColt) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             noLUPresent.set(false);
             Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
                     .setBackgroundTint(getResources().getColor(R.color.green_500))

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java

@@ -1,50 +1,9 @@
 package it.integry.integrywmsnative.gest.accettazione_ordini_picking;
 
 import dagger.Module;
-import dagger.Provides;
-import it.integry.integrywmsnative.core.ean128.Ean128Service;
-import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ColliAccettazioneRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.gest.accettazione_ordini_picking.rest.AccettazioneOrdiniPickingRESTConsumer;
-import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 
 @Module(subcomponents = AccettazioneOrdiniPickingComponent.class)
 public class AccettazioneOrdiniPickingModule {
 
-    @Provides
-    AccettazioneOrdiniPickingRESTConsumer providesAccettazionePickingRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
-        return new AccettazioneOrdiniPickingRESTConsumer(restBuilder, systemRESTConsumer);
-    }
-
-    @Provides
-    BottomSheetFragmentLUContentViewModel providesBottomSheetFragmentLUContentViewModel() {
-        return new BottomSheetFragmentLUContentViewModel();
-    }
-
-    @Provides
-    AccettazioneOrdiniPickingViewModel providesAccettazioneViewModel(
-            ArticoloRESTConsumer articoloRESTConsumer,
-            BarcodeRESTConsumer barcodeRESTConsumer,
-            ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-            AccettazioneOrdiniPickingRESTConsumer accettazioneOrdiniPickingRESTConsumer,
-            ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer,
-            ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
-            Ean128Service ean128Service,
-            ImballiRESTConsumer imballiRESTConsumer) {
-        return new AccettazioneOrdiniPickingViewModel(articoloRESTConsumer,
-                barcodeRESTConsumer,
-                colliMagazzinoRESTConsumer,
-                accettazioneOrdiniPickingRESTConsumer,
-                colliAccettazioneRESTConsumer,
-                colliLavorazioneRESTConsumer,
-                ean128Service,
-                imballiRESTConsumer);
-    }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_ordini_picking;
 
+import android.os.Handler;
+
 import androidx.annotation.NonNull;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
@@ -11,6 +13,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -72,6 +76,8 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.Tracciament
 
 public class AccettazioneOrdiniPickingViewModel {
 
+    private final ExecutorService executorService;
+    private final Handler handler;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final BarcodeRESTConsumer mBarcodeRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
@@ -96,7 +102,9 @@ public class AccettazioneOrdiniPickingViewModel {
     private final List<HistoryMtbAartDTO> mHistoryUsedAarts = new ArrayList<>();
 
     @Inject
-    public AccettazioneOrdiniPickingViewModel(ArticoloRESTConsumer articoloRESTConsumer,
+    public AccettazioneOrdiniPickingViewModel(Handler handler,
+                                              ExecutorService executorService,
+                                              ArticoloRESTConsumer articoloRESTConsumer,
                                               BarcodeRESTConsumer barcodeRESTConsumer,
                                               ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
                                               AccettazioneOrdiniPickingRESTConsumer accettazioneOrdiniPickingRESTConsumer,
@@ -104,6 +112,8 @@ public class AccettazioneOrdiniPickingViewModel {
                                               ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
                                               Ean128Service ean128Service,
                                               ImballiRESTConsumer imballiRESTConsumer) {
+        this.handler = handler;
+        this.executorService = executorService;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
@@ -115,23 +125,24 @@ public class AccettazioneOrdiniPickingViewModel {
     }
 
 
-    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, boolean useQtaOrd) {
+    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, boolean useQtaOrd) throws Exception {
         this.mOrders = orders;
         this.mUseQtaOrd = useQtaOrd;
 
-        List<SitArtOrdDTO> mSitArts = Stream.of(sitArts)
+        List<SitArtOrdDTO> mSitArts = sitArts.stream()
                 .filter(x ->
                         UtilityBigDecimal.greaterThan(x.getNumCnfDaEvadere(), BigDecimal.ZERO) &&
                                 UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO))
                 .toList();
 
-        getEmptyPickingList(mSitArts, this.mPickingList::postValue);
+        var pickingList = getEmptyPickingList(mSitArts);
+        this.mPickingList.postValue(pickingList);
 
         //Definizione della gestione collo di default
-        Boolean isOrdTrasf = Stream.of(mOrders)
+        Boolean isOrdTrasf = mOrders.stream()
                 .map(OrdineAccettazioneInevasoDTO::isOrdTrasf)
-                .withoutNulls()
-                .distinctBy(x -> x)
+                .filter(Objects::nonNull)
+                .distinct()
                 .findFirst()
                 .get();
 
@@ -145,10 +156,10 @@ public class AccettazioneOrdiniPickingViewModel {
 
 
         //Definizione della gestione collo di default
-        List<GestioneEnum> foundGestioni = Stream.of(mOrders)
+        List<GestioneEnum> foundGestioni = mOrders.stream()
                 .map(OrdineAccettazioneInevasoDTO::getGestioneEnum)
-                .withoutNulls()
-                .distinctBy(x -> x)
+                .filter(Objects::nonNull)
+                .distinct()
                 .toList();
 
         if (foundGestioni.size() == 1) {
@@ -157,7 +168,7 @@ public class AccettazioneOrdiniPickingViewModel {
             } else
                 defaultGestioneOfUL = foundGestioni.get(0) == GestioneEnum.PRODUZIONE ? GestioneEnum.LAVORAZIONE : foundGestioni.get(0);
         } else {
-            this.sendError(new InvalidLUMultiGestioneException());
+            throw new InvalidLUMultiGestioneException();
         }
 
         switch (defaultGestioneOfUL) {
@@ -166,32 +177,31 @@ public class AccettazioneOrdiniPickingViewModel {
         }
     }
 
-    private void getEmptyPickingList(List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<PickingObjectDTO>> onComplete) {
+    private List<PickingObjectDTO> getEmptyPickingList(List<SitArtOrdDTO> sitArtOrdList) throws Exception {
 
-        List<String> codMarts = Stream.of(sitArtOrdList)
+        List<String> codMarts = sitArtOrdList.stream()
                 .map(SitArtOrdDTO::getCodMart)
-                .toList();
+                .collect(Collectors.toList());
 
-        this.mArticoloRESTConsumer.getByCodMarts(codMarts, listMtbAarts -> {
-            List<PickingObjectDTO> pickingList = Stream.of(sitArtOrdList)
-                    .map(sitArtOrdDTO -> {
-                        MtbAart mtbAart = null;
+        var listMtbAarts = this.mArticoloRESTConsumer.getByCodMartsSynchronized(codMarts);
+        List<PickingObjectDTO> pickingList = sitArtOrdList.stream()
+                .map(sitArtOrdDTO -> {
+                    MtbAart mtbAart = null;
 
-                        for (MtbAart mtbAartItem : listMtbAarts) {
-                            if (mtbAartItem.getCodMart().equalsIgnoreCase(sitArtOrdDTO.getCodMart())) {
-                                mtbAart = mtbAartItem;
-                                break;
-                            }
+                    for (MtbAart mtbAartItem : listMtbAarts) {
+                        if (mtbAartItem.getCodMart().equalsIgnoreCase(sitArtOrdDTO.getCodMart())) {
+                            mtbAart = mtbAartItem;
+                            break;
                         }
+                    }
 
-                        return new PickingObjectDTO()
-                                .setSitArtOrdDTO(sitArtOrdDTO)
-                                .setMtbAart(mtbAart);
-                    })
-                    .toList();
+                    return new PickingObjectDTO()
+                            .setSitArtOrdDTO(sitArtOrdDTO)
+                            .setMtbAart(mtbAart);
+                })
+                .collect(Collectors.toList());
 
-            onComplete.run(pickingList);
-        }, this::sendError);
+        return pickingList;
     }
 
     public MutableLiveData<List<PickingObjectDTO>> getPickingList() {
@@ -273,7 +283,7 @@ public class AccettazioneOrdiniPickingViewModel {
                     try {
                         numCollo = UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue());
                         this.createNewLU(
-                                null,
+                                barcodeScanDTO.getStringValue(),
                                 numCollo,
                                 CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, true, onComplete);
                     } catch (Exception ex) {
@@ -559,6 +569,9 @@ public class AccettazioneOrdiniPickingViewModel {
             dataScad = dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita());
         }
 
+        if (partitaMag == null && SettingsManager.iDB().isFlagAccettazioneViewLotto())
+            partitaMag = pickingObjectDTO.getSitArtOrdDTO().getPartitaMag();
+
         if (partitaMag == null && dataScad == null) {
             HistoryMtbAartDTO historyMtbAartDTO = this.getHistoryItemIfExists(pickingObjectDTO.getMtbAart().getCodMart());
 
@@ -651,8 +664,10 @@ public class AccettazioneOrdiniPickingViewModel {
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
-            pickingObjectDTO.getWithdrawMtbColrs().add(insertedMtbColr);
-            mCurrentMtbColt.getMtbColr().add(insertedMtbColr);
+            handler.post(() -> {
+                pickingObjectDTO.getWithdrawMtbColrs().add(insertedMtbColr);
+                mCurrentMtbColt.getMtbColr().add(insertedMtbColr);
+            });
 
             //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
             resetMatchedRows();
@@ -768,7 +783,9 @@ public class AccettazioneOrdiniPickingViewModel {
                             pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete);
                         }
 
-                        this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
+                        handler.post(() -> {
+                            this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
+                        });
 
                         this.resetMatchedRows();
                         this.sendOnRowSaved();

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java

@@ -22,6 +22,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.AccettazioneOrdineInevasoMainListGroupHeaderBinding;
 import it.integry.integrywmsnative.databinding.AccettazioneOrdineInevasoMainListGroupItemBinding;
@@ -112,9 +113,9 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
         } else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
         } else if (position % 2 == 1) {
-            holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
+            holder.mBinding.getRoot().setBackgroundColor(0);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(UtilityResources.getColorResourceFromAttr(mContext, R.attr.colorLetturaFacilitataSurface));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);

app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java

@@ -123,7 +123,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
     }
 
     private void initColloInfo() {
-        SettingsManager.iDB().getAvailableCodMdep().stream()
+        SettingsManager.iDB().getAvailableDepos().stream()
                 .filter(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.get().getCodMdep()))
                 .findFirst()
                 .ifPresent(x -> descrizioneDepo.set("(" + x.getDescrizione() + ")"));

app/src/main/java/it/integry/integrywmsnative/gest/login/rest/AuthenticationRESTConsumer.java

@@ -34,7 +34,7 @@ public class AuthenticationRESTConsumer extends _BaseRESTConsumer {
         String host = CommonConst.Login.Azienda.host;
         int port = CommonConst.Login.Azienda.port;
 
-        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port, false, true);
+        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port);
         service.loginAzienda(codAzienda).enqueue(new ManagedErrorCallback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<LoginAziendaDTO>> call, Response<ServiceRESTResponse<LoginAziendaDTO>> response) {
@@ -67,7 +67,7 @@ public class AuthenticationRESTConsumer extends _BaseRESTConsumer {
 
 
     public void authenticate(String protocol, String host, int port, String username, String password, String profileDb, String deviceSalt, RunnableArgs<AuthenticationJwtResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
-        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port, false);
+        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port);
 
         LoginRequestDTO loginRequestDTO = new LoginRequestDTO()
                 .setUsername(username)
@@ -94,7 +94,7 @@ public class AuthenticationRESTConsumer extends _BaseRESTConsumer {
 
 
     public void retrieveAvailableProfiles(String protocol, String host, int port, String username, String password, RunnableArgs<List<String>> onComplete, RunnableArgs<Exception> onFailed) {
-        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port, false);
+        AuthenticationRESTConsumerService service = restBuilder.getService(AuthenticationRESTConsumerService.class, protocol, host, port);
 
         service.retreiveAvailableProfiles(username, password)
                 .enqueue(new ManagedErrorCallback<>() {

app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java

@@ -158,7 +158,7 @@ public class LoginViewModel {
     public void loadDepo(Runnable onComplete) {
 
         this.mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
-            SettingsManager.iDB().setAvailableCodMdep(availableCodMdeps);
+            SettingsManager.iDB().setAvailableDepos(availableCodMdeps);
 
             if (availableCodMdeps == null || availableCodMdeps.isEmpty()) {
                 this.sendError(new InvalidUserDepositException());

app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java

@@ -93,7 +93,7 @@ public class MainActivity extends BaseActivity
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
-        updatesManager.executeCheck(this, false);
+        updatesManager.executeCheck(this, getSupportFragmentManager(), false);
         UtilityContext.initMainActivity(this);
 
         setSupportActionBar(mBinding.appBarMain.toolbar);
@@ -102,7 +102,7 @@ public class MainActivity extends BaseActivity
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, mBinding.drawerLayout, mBinding.appBarMain.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        mBinding.drawerLayout.setDrawerListener(toggle);
+        mBinding.drawerLayout.addDrawerListener(toggle);
         toggle.syncState();
 
 
@@ -122,6 +122,16 @@ public class MainActivity extends BaseActivity
         startActivity(myIntent);
     }
 
+
+    public void toggleDrawer() {
+        if (mBinding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            mBinding.drawerLayout.closeDrawer(GravityCompat.START);
+        } else {
+            mBinding.drawerLayout.openDrawer(GravityCompat.START);
+        }
+    }
+
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -294,9 +304,13 @@ public class MainActivity extends BaseActivity
         for (int i = 0; i < count; i++) {
             getSupportFragmentManager().popBackStack();
         }
+
+        mBinding.appBarMain.elevatedToolbar.setVisibility(getSupportFragmentManager().getBackStackEntryCount() > 1 ? View.VISIBLE : View.GONE);
     }
 
     private void adaptViewToFragment(Fragment fragment) {
+        mBinding.appBarMain.elevatedToolbar.setVisibility(fragment instanceof MainFragment ? View.GONE : View.VISIBLE);
+
         if (fragment instanceof ISearchableFragment) {
             mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment);
             mBinding.appBarMain.mainSearch.setVisibility(View.VISIBLE);

app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java

@@ -1,10 +1,7 @@
 package it.integry.integrywmsnative.gest.main;
 
 
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.LayoutInflater;
@@ -36,11 +33,11 @@ import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.menu.MenuService;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -122,7 +119,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main, container, false);
         mBindings.setView(this);
 
-        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(false, false);
         return mBindings.getRoot();
     }
 
@@ -162,7 +158,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
         initRecuperoCollo();
 
-        mBindings.switchDepoButton.setVisibility(SettingsManager.iDB().getAvailableCodMdep().size() > 1 ? View.VISIBLE : View.GONE);
+        mBindings.switchDepoButton.setVisibility(SettingsManager.iDB().getAvailableDepos().size() > 1 ? View.VISIBLE : View.GONE);
     }
 
     private void initSessionData() {
@@ -246,6 +242,13 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     }
 
+
+    public void toggleDrawer() {
+        if (getActivity() != null && getActivity() instanceof MainActivity) {
+            ((MainActivity) getActivity()).toggleDrawer();
+        }
+    }
+
     private void collapseNoConnectionLayout() {
         if (getActivity() != null)
             getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true));
@@ -284,8 +287,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         MenuConfiguration baseMenuConfiguration = new MenuConfiguration();
         List<MenuConfiguration.MenuGroup> menuGroups = baseMenuConfiguration.getGroups();
 
-        for (int i = 0; i < menuGroups.size(); i++) {
-            try {
+        try {
+            for (int i = 0; i < menuGroups.size(); i++) {
 
                 BaseMenuConfiguration.MenuGroup menuGroup = menuGroups.get(i);
 
@@ -313,16 +316,12 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
                     menuListAdapter.setClickListener(this::onMenuClick);
 
                     mBindings.menuContainer.addView(groupBinding.getRoot());
-
-
                 }
-
-
-            } catch (Exception exception) {
-                UtilityExceptions.defaultException(requireActivity(), exception);
             }
-        }
 
+        } catch (Exception exception) {
+            UtilityExceptions.defaultException(requireActivity(), exception);
+        }
     }
 
     private void onMenuClick(MenuConfiguration.MenuItem menuItem) {
@@ -339,95 +338,12 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         this.mOnPreDestroyList.add(onPreDestroy);
     }
 
-
-    public void toggleEasterEggMode() {
-        easterEggToggle = !easterEggToggle;
-
-
-        int rootBgStart, rootBgEnd;
-        int profileBgStart, profileBgEnd;
-        float titleFlipStart, titleFlipEnd;
-        int animationTimeMillis = 0;
-
-        if (easterEggToggle) {
-            rootBgStart = Color.argb(255, 255, 255, 255);
-            rootBgEnd = Color.argb(255, 0, 0, 0);
-
-            profileBgStart = Color.argb(255, 26, 115, 232);
-            profileBgEnd = Color.argb(255, 211, 47, 47);
-            animationTimeMillis = 2500;
-            titleFlipStart = 1f;
-            titleFlipEnd = -1f;
-        } else {
-            rootBgStart = Color.argb(255, 0, 0, 0);
-            rootBgEnd = Color.argb(255, 255, 255, 255);
-
-            profileBgStart = Color.argb(255, 211, 47, 47);
-            profileBgEnd = Color.argb(255, 26, 115, 232);
-            animationTimeMillis = 750;
-            titleFlipStart = -1f;
-            titleFlipEnd = 1f;
-        }
-
-        mBindings.easterEggHorrorBloodExpandableLayout.setDuration(animationTimeMillis);
-        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(easterEggToggle, true);
-
-        View rootActivityView = requireActivity().findViewById(R.id.drawer_layout);
-        ObjectAnimator colorFadeRootBg = ObjectAnimator.ofObject(rootActivityView, "backgroundColor",
-                new ArgbEvaluator(),
-                rootBgStart,
-                rootBgEnd);
-
-        colorFadeRootBg.setDuration(animationTimeMillis);
-        colorFadeRootBg.start();
-
-        View toolbarActivityView = requireActivity().findViewById(R.id.toolbar);
-        ObjectAnimator colorFadeToolbarBg = ObjectAnimator.ofObject(toolbarActivityView, "backgroundColor",
-                new ArgbEvaluator(),
-                rootBgStart,
-                rootBgEnd);
-
-        colorFadeToolbarBg.setDuration(animationTimeMillis);
-        colorFadeToolbarBg.start();
-
-        ObjectAnimator colorFadeProfileBg = ObjectAnimator.ofObject(mBindings.profileRootContainer, "backgroundColor",
-                new ArgbEvaluator(),
-                profileBgStart,
-                profileBgEnd);
-
-        colorFadeProfileBg.setDuration(animationTimeMillis);
-        colorFadeProfileBg.start();
-
-        View toolbarTitleActivityView = requireActivity().findViewById(R.id.toolbar_title);
-        ObjectAnimator flipToolbarTitleX = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleX",
-                titleFlipStart,
-                titleFlipEnd);
-
-        flipToolbarTitleX.setDuration(animationTimeMillis);
-        flipToolbarTitleX.start();
-
-        ObjectAnimator flipToolbarTitleY = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleY",
-                titleFlipStart,
-                titleFlipEnd);
-
-        flipToolbarTitleY.setDuration(animationTimeMillis);
-        flipToolbarTitleY.start();
-
-        ObjectAnimator colorFadeTitleTextColor = ObjectAnimator.ofObject(toolbarTitleActivityView, "textColor",
-                new ArgbEvaluator(),
-                rootBgEnd,
-                rootBgStart);
-
-        colorFadeTitleTextColor.setDuration(animationTimeMillis);
-        colorFadeTitleTextColor.start();
-    }
-
     public void changeUserDepo() {
-        DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableCodMdep(), this::onUserDepoChanged)
+        DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableDepos(), this::onUserDepoChanged)
                 .show(getParentFragmentManager(), "switch-user-depo");
     }
 
-    private void onUserDepoChanged(AvailableCodMdepsDTO newDepo) {
+    private void onUserDepoChanged(MtbDepo newDepo) {
         SettingsManager.i().getUserSession().setDepo(newDepo);
         initSessionData();
     }

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java

@@ -251,6 +251,9 @@ public class OrdiniUscitaElencoFiltroViewModel {
                 .distinct()
                 .toList();
 
+        if(codMdeps.isEmpty())
+            return new ArrayList<>();
+
         return Stream.of(Objects.requireNonNull(mtbDepoFullList))
                 .filter(x -> codMdeps.contains(x.getCodMdep()))
                 .distinct()

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java

@@ -243,7 +243,7 @@ public class PickingLiberoViewModel {
         } else if (mtbColtList.size() == 1) {
             var mtbColt = this.mColliMagazzinoRESTConsumer.getByTestataSynchronized(mtbColtList.get(0), true, false);
 
-            boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep())
+            boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableDepos())
                     .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
 
             if (codMdepIsValid) {
@@ -269,7 +269,7 @@ public class PickingLiberoViewModel {
 
         } else if ((mtbColtScanned.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColtScanned.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColtScanned.getSegno() > 0) {
 
-            boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
+            boolean codMdepIsValid = SettingsManager.iDB().getAvailableDepos().stream()
                     .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColtScanned.getCodMdep()));
 
             if (codMdepIsValid) {
@@ -575,7 +575,7 @@ public class PickingLiberoViewModel {
         MtbColt sourceMtbColt = new MtbColt()
                 .setNumCollo(mtbColr.getNumCollo())
                 .setGestione(mtbColr.getGestione())
-                .setDataCollo(mtbColr.getDataColloD())
+                .setDataCollo(mtbColr.getDataColloLD())
                 .setSerCollo(mtbColr.getSerCollo())
                 .setMtbColr(new ObservableArrayList<>());
 
@@ -657,7 +657,7 @@ public class PickingLiberoViewModel {
         String newCodMdep = shouldChangeCodMdep ? refMtbColt.getCodMdep() : null;
 
         if (shouldChangeCodMdep) {
-            mColliMagazzinoRESTConsumer.spostaUlSynchronized(mCurrentMtbColt, newCodMdep, null, false);
+            mColliMagazzinoRESTConsumer.spostaUlSynchronized(mCurrentMtbColt, newCodMdep, null, false, false);
             mCurrentMtbColt.setCodMdep(newCodMdep);
         }
     }
@@ -695,7 +695,7 @@ public class PickingLiberoViewModel {
             MtbColt mtbColt = mColliMagazzinoRESTConsumer.getByChiaveColloSynchronized(
                     mtbColr.getGestioneRifEnum(),
                     mtbColr.getNumColloRif(),
-                    mtbColr.getDataColloRifS(),
+                    mtbColr.getDataColloRifLD(),
                     mtbColr.getSerColloRif(),
                     true,
                     false);

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java

@@ -565,7 +565,7 @@ public class PickingResiViewModel {
                     .setSerColloRif(UtilityString.empty2null(mtbColrToDispatch.getSerCollo()))
                     .setNumColloRif(mtbColrToDispatch.getNumCollo())
                     .setGestioneRif(UtilityString.empty2null(mtbColrToDispatch.getGestione()))
-                    .setDataColloRif(UtilityString.empty2null(mtbColrToDispatch.getDataColloS()));
+                    .setDataColloRif(mtbColrToDispatch.getDataColloLD());
 
 
             if (mtbColrToDispatch.getPesoNettoKg() != null) {
@@ -608,7 +608,7 @@ public class PickingResiViewModel {
         this.mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> {
 
             mtbColr
-                    .setDataCollo(value.getDataColloS())
+                    .setDataCollo(value.getDataColloLD())
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
@@ -634,7 +634,7 @@ public class PickingResiViewModel {
 
         MtbColt mtbColt = new MtbColt()
                 .setNumCollo(mtbColrToUpdate.getNumCollo())
-                .setDataCollo(mtbColrToUpdate.getDataColloS())
+                .setDataCollo(mtbColrToUpdate.getDataColloLD())
                 .setSerCollo(mtbColrToUpdate.getSerCollo())
                 .setGestione(mtbColrToUpdate.getGestione())
                 .setMtbColr(new ObservableArrayList<>());
@@ -682,7 +682,7 @@ public class PickingResiViewModel {
 
                 MtbColt mtbColt = new MtbColt()
                         .setNumCollo(mtbColrToDelete.getNumCollo())
-                        .setDataCollo(mtbColrToDelete.getDataColloS())
+                        .setDataCollo(mtbColrToDelete.getDataColloLD())
                         .setSerCollo(mtbColrToDelete.getSerCollo())
                         .setGestione(mtbColrToDelete.getGestione())
                         .setMtbColr(new ObservableArrayList<>());

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java

@@ -102,7 +102,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingResiListModel.isActive() ? View.VISIBLE : View.GONE);

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java

@@ -11,7 +11,6 @@ import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.fragment.app.Fragment;
 
-import com.annimon.stream.Stream;
 import com.ravikoradiya.liveadapter.LiveAdapter;
 import com.ravikoradiya.liveadapter.Type;
 
@@ -56,6 +55,7 @@ import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbiso
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
 import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
+import kotlin.Unit;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -119,20 +119,39 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
     @Override
     public void onStart() {
         super.onStart();
-        mViewModel.init();
+
+        this.onLoadingStarted();
+        executorService.execute(() -> {
+            try {
+                mViewModel.init();
+                this.onLoadingEnded();
+            } catch (Exception ex) {
+                this.onError(ex);
+            }
+        });
+
     }
 
     private void initRecyclerView() {
         mViewModel.getOrdiniList().observe(getViewLifecycleOwner(), data -> {
-            mBindings.emptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
 
             this.onLoadingStarted();
-            this.initMtbGrupsCache(() -> {
-                this.initJtbComtCache(this::onLoadingEnded);
+
+            executorService.execute(() -> {
+                try {
+                    this.initMtbGrupsCache();
+                    this.initJtbComtCache();
+                    this.onLoadingEnded();
+
+                    handler.post(() -> {
+                        mFilterViewModel.init(mViewModel.getOrdiniList().getValue());
+                        this.refreshList(null);
+                    });
+                } catch (Exception ex) {
+                    this.onError(ex);
+                }
             });
 
-            mFilterViewModel.init(mViewModel.getOrdiniList().getValue());
-            this.refreshList(null);
         });
 
         var itemTypeHeader = new Type<GroupTitleModel, FragmentProdFabbisognoLineeTitleItemBinding>(R.layout.fragment_prod_fabbisogno_linee_title_item, BR.item);
@@ -142,13 +161,13 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
             var item = x.getBinding().getItem();
             item.getSelected().set(!item.getSelected().get());
 
-            Stream.of(mProdFabbisognoItemModel)
+            mProdFabbisognoItemModel.stream()
                     .filter(y -> y instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) y).getOrdineLavorazioneDTO().getCodJfas().equals(item.getTitle()))
                     .forEach(y -> {
                         ((ProdFabbisognoLineeItemModelDto) y).getSelected().set(item.selected.get());
                     });
 
-            fabVisible.set(Stream.of(mProdFabbisognoItemModel)
+            fabVisible.set(mProdFabbisognoItemModel.stream()
                     .filter(y -> y instanceof ProdFabbisognoLineeItemModelDto)
                     .anyMatch(y -> ((ProdFabbisognoLineeItemModelDto) y).getSelected().get()));
 
@@ -159,7 +178,7 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
             var item = x.getBinding().getItem();
             item.getSelected().set(!item.getSelected().get());
 
-            fabVisible.set(Stream.of(mProdFabbisognoItemModel)
+            fabVisible.set(mProdFabbisognoItemModel.stream()
                     .filter(y -> y instanceof ProdFabbisognoLineeItemModelDto)
                     .anyMatch(y -> ((ProdFabbisognoLineeItemModelDto) y).getSelected().get()));
 
@@ -169,6 +188,10 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         new LiveAdapter(mProdFabbisognoItemModel)
                 .map(GroupTitleModel.class, itemTypeHeader)
                 .map(ProdFabbisognoLineeItemModelDto.class, itemType)
+                .onNoData(noData -> {
+                    mBindings.emptyView.setVisibility(noData ? View.VISIBLE : View.GONE);
+                    return Unit.INSTANCE;
+                })
                 .into(this.mBindings.inventarioList);
     }
 
@@ -191,10 +214,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
     private List<Object> convertDataModelToListModel(List<ProdFabbisognoLineeItemModelDto> itemModel) {
 
-        Stream.of(itemModel)
-                .sorted(Comparator.comparing(x -> x.getOrdineLavorazioneDTO().getCodJfas()))
-                .toList();
-
         List<Object> listaFinale = new ArrayList<>();
         String currentGroup = null;
 
@@ -224,10 +243,10 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         mFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(onPredicateChanged);
         mFilterViewModel.getCurrentGruppoMercPredicate().addOnPropertyChangedCallback(onPredicateChanged);
 
-        List<FilterChipDTO> filterList = Stream.of(ProdFabbisognoLineeProdBindings.AVAILABLE_FILTERS.entrySet())
+        List<FilterChipDTO> filterList = ProdFabbisognoLineeProdBindings.AVAILABLE_FILTERS.entrySet().stream()
                 .map(Map.Entry::getValue)
-                .sortBy(FilterChipDTO::getPosizione)
-                .toList();
+                .sorted(Comparator.comparing(FilterChipDTO::getPosizione))
+                .collect(Collectors.toList());
 
         for (FilterChipDTO filterChipDTO : filterList) {
 
@@ -303,11 +322,11 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                             .setAllNumOrds(mFilterViewModel.getAllNumOrds())
                             .setAvailableNumOrds(mFilterViewModel.getAvailableNumOrds())
                             .setOnFilterApplied(mFilterViewModel::setNumOrdFilter)
-                            .setPreSelectedNumOrds(Stream.of(Objects.requireNonNull(mViewModel.getOrdiniList().getValue()))
+                            .setPreSelectedNumOrds(Objects.requireNonNull(mViewModel.getOrdiniList().getValue()).stream()
                                     .filter(mFilterViewModel.getCurrentNumOrdsPredicate().get() == null ?
                                             x -> false : Objects.requireNonNull(mFilterViewModel.getCurrentNumOrdsPredicate().get()))
                                     .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
-                                    .toList());
+                                    .collect(Collectors.toList()));
 
             case ProdFabbisognoLineeProdBindings.MGRP_FILTER_ID ->
                     ((FilterGruppoMercLayoutView) filterLayoutView)
@@ -322,42 +341,36 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
     }
 
-    private void initMtbGrupsCache(Runnable onComplete) {
-        var codMgrpArts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrdiniList().getValue()))
-                .flatMap(x -> Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc() != null ?
-                        x.getOrdineLavorazioneDTO().getAvailableClassMerc() : new ArrayList<>()))
+    private void initMtbGrupsCache() throws Exception {
+        var codMgrpArts = Objects.requireNonNull(this.mViewModel.getOrdiniList().getValue()).stream()
+                .flatMap(x ->
+                        (x.getOrdineLavorazioneDTO().getAvailableClassMerc() != null ?
+                                x.getOrdineLavorazioneDTO().getAvailableClassMerc() : new ArrayList<OrdineLavorazioneDTO.AvailableClassMerc>()).stream())
                 .map(OrdineLavorazioneDTO.AvailableClassMerc::getCodMgrp)
-                .withoutNulls()
+                .filter(Objects::nonNull)
                 .distinct()
-                .toList();
+                .collect(Collectors.toList());
 
-        this.mArticoloRESTConsumer.getArtsGroups(codMgrpArts, mtbGrupCache -> {
-            this.mtbGrupCache = mtbGrupCache;
-            onComplete.run();
-        }, this::onError);
+        this.mtbGrupCache = this.mArticoloRESTConsumer.getArtsGroupsSynchronized(codMgrpArts);
     }
 
-    private void initJtbComtCache(Runnable onComplete) {
+    private void initJtbComtCache() throws Exception {
         if (this.mViewModel.getOrdiniList().getValue() == null) {
             this.jtbComtCache = new ArrayList<>();
-            onComplete.run();
             return;
         }
-        var jtbComts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrdiniList().getValue()))
-                .flatMap(x -> Stream.of(x.getOrdineLavorazioneDTO().getCodJcom()))
-                .distinct().withoutNulls()
-                .toList();
+        var jtbComts = Objects.requireNonNull(this.mViewModel.getOrdiniList().getValue()).stream()
+                .map(x -> x.getOrdineLavorazioneDTO().getCodJcom())
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toList());
 
         if (jtbComts.isEmpty()) {
             this.jtbComtCache = new ArrayList<>();
-            onComplete.run();
             return;
         }
 
-        this.mCommessaRESTConsumer.getJtbComts(jtbComts, jtbComtCache -> {
-            this.jtbComtCache = jtbComtCache;
-            onComplete.run();
-        }, this::onError);
+        this.jtbComtCache = this.mCommessaRESTConsumer.getJtbComtsSynchronized(jtbComts);
     }
 
     @Override
@@ -383,27 +396,34 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                 .map(x -> String.valueOf(((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd()))
                 .collect(Collectors.toList()));
 
-        LocalDate dataInizio = Stream.of(mProdFabbisognoItemModel)
+        LocalDate dataInizio = mProdFabbisognoItemModel.stream()
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
                 .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getDataOrd())
                 .min(Comparator.naturalOrder())
                 .orElse(null);
 
-        LocalDate dataFine = Stream.of(mProdFabbisognoItemModel)
+        LocalDate dataFine = mProdFabbisognoItemModel.stream()
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
                 .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getDataOrd())
                 .max(Comparator.naturalOrder())
                 .orElse(null);
 
-        List<MtbGrup> listMtbGrup = Stream.of(mProdFabbisognoItemModel)
+        List<MtbGrup> listMtbGrup = mProdFabbisognoItemModel.stream()
                 .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
-                .flatMap(x -> Stream.of(((ProdFabbisognoLineeItemModelDto) x).getSelectedMtbGrup()))
-                .toList();
+                .flatMap(x -> ((ProdFabbisognoLineeItemModelDto) x).getSelectedMtbGrup().stream())
+                .collect(Collectors.toList());
 
-        this.mViewModel.loadFabbisogno(ordini, codMdep, dataInizio, dataFine, onCompleteData -> {
-            startPickingActivity(listMtbGrup, onCompleteData);
+        executorService.execute(() -> {
+            try {
+                onLoadingStarted();
+                var fabbisognoData = this.mViewModel.loadFabbisogno(ordini, codMdep, dataInizio, dataFine);
+                onLoadingEnded();
+
+                startPickingActivity(listMtbGrup, fabbisognoData);
+            } catch (Exception e) {
+                this.onError(e);
+            }
         });
-
     }
 
     private void startPickingActivity(List<MtbGrup> listMtbGrup, List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
@@ -414,10 +434,10 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                 .map(x -> String.valueOf(((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd()))
                 .collect(Collectors.toList()));
 
-        Stream<ProdFabbisognoLineeProdDTO> streamSitArtOrd = Stream.of(fabbisognoList);
+        java.util.stream.Stream<ProdFabbisognoLineeProdDTO> streamSitArtOrd = fabbisognoList.stream();
 
         streamSitArtOrd = listMtbGrup != null && !listMtbGrup.isEmpty() ?
-                streamSitArtOrd.filter(x -> Stream.of(listMtbGrup).anyMatch(y -> y.getCodMgrp().equalsIgnoreCase(x.getCodMgrp()))) :
+                streamSitArtOrd.filter(x -> listMtbGrup.stream().anyMatch(y -> y.getCodMgrp().equalsIgnoreCase(x.getCodMgrp()))) :
                 streamSitArtOrd;
 
         List<SitArtOrdDTO> sitArtOrdDTOS = streamSitArtOrd.map(x -> {
@@ -439,7 +459,7 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
                     return sitArtOrdDTO;
                 })
-                .toList();
+                .collect(Collectors.toList());
 
         boolean divideByGrpMerc = SettingsManager.iDB().isGroupPoductionByCommodityGroup();
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java

@@ -3,14 +3,12 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -35,47 +33,41 @@ public class ProdFabbisognoLineeProdViewModel {
         this.mMesRESTConsumer = mesRESTConsumer;
     }
 
-    public void init() {
+    public void init() throws Exception {
         loadData();
     }
 
-    public void loadData() {
-        this.sendOnLoadingStarted();
+    public void loadData() throws Exception {
 
-        this.mMesRESTConsumer.getOrdiniLavorazione("I", ordini -> {
+        var ordini = this.mMesRESTConsumer.getOrdiniLavorazioneSynchronized("I");
 
-            List<ProdFabbisognoLineeItemModelDto> itemModel = Stream.of(ordini)
-                    .filter(x -> x.getCodMdep().equals(SettingsManager.i().getUserSession().getDepo().getCodMdep()))
-                    .map(ord -> new ProdFabbisognoLineeItemModelDto()
-                            .setOrdineLavorazioneDTO(ord)
-                    )
-                    .sorted(Comparator.comparing(x -> x.getOrdineLavorazioneDTO().getCodJfas()))
-                    .toList();
+        List<ProdFabbisognoLineeItemModelDto> itemModel = ordini.stream()
+                .filter(x -> x.getCodMdep().equals(SettingsManager.i().getUserSession().getDepo().getCodMdep()))
+                .map(ord ->
+                        new ProdFabbisognoLineeItemModelDto()
+                                .setOrdineLavorazioneDTO(ord)
+                )
+                .sorted(Comparator.comparing(x -> x.getOrdineLavorazioneDTO().getCodJfas()))
+                .collect(Collectors.toList());
 
-            ordiniList.postValue(itemModel);
-            this.sendOnLoadingEnded();
-        }, this::sendError);
+        ordiniList.postValue(itemModel);
     }
 
     public LiveData<List<ProdFabbisognoLineeItemModelDto>> getOrdiniList() {
         return ordiniList;
     }
 
-    public void loadFabbisogno(String ordini, String codMdep, LocalDate dataInizio, LocalDate dataFine, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
-        this.sendOnLoadingStarted();
+    public List<ProdFabbisognoLineeProdDTO> loadFabbisogno(String ordini, String codMdep, LocalDate dataInizio, LocalDate dataFine) throws Exception {
 
-        this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(ordini, codMdep, jtbFasi -> {
-            if (jtbFasi == null) jtbFasi = new ArrayList<>();
+        var jtbFasi = this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisognoSynchronized(ordini, codMdep);
+        if (jtbFasi == null) jtbFasi = new ArrayList<>();
 
-            Stream.of(jtbFasi)
-                    .forEach(x -> {
-                        x.setDataInizio(dataInizio);
-                        x.setDataFine(dataFine);
-                    });
+        jtbFasi.forEach(x -> {
+            x.setDataInizio(dataInizio);
+            x.setDataFine(dataFine);
+        });
 
-            this.sendOnLoadingEnded();
-            onComplete.run(jtbFasi);
-        }, this::sendError);
+        return jtbFasi;
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/filters/ProdFabbisognoLineeProdFilterViewModel.java

@@ -3,12 +3,11 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.filters;
 import androidx.databinding.ObservableField;
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-import com.annimon.stream.function.Predicate;
-
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import it.integry.integrywmsnative.core.model.MtbGrup;
@@ -45,9 +44,11 @@ public class ProdFabbisognoLineeProdFilterViewModel {
             this.selectedMtbGrup = new ArrayList<>();
         } else {
             this.selectedMtbGrup = mtbGrupList;
-            var mtbGrups = Stream.of(mtbGrupList).map(MtbGrup::getCodMgrp).toList();
+            var mtbGrups = mtbGrupList.stream()
+                    .map(MtbGrup::getCodMgrp)
+                    .collect(Collectors.toList());
 
-            currentGruppoMercPredicate.set(x -> Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc())
+            currentGruppoMercPredicate.set(x -> x.getOrdineLavorazioneDTO().getAvailableClassMerc().stream()
                     .anyMatch(y -> mtbGrups.contains(y.getCodMgrp())));
         }
     }
@@ -59,16 +60,19 @@ public class ProdFabbisognoLineeProdFilterViewModel {
                 currentGruppoMercPredicate.get() == null) {
             returnList = this.initialList;
         } else {
-            returnList = Stream.of(this.initialList)
+            returnList = this.initialList.stream()
                     .filter(x -> (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))) &&
                             (currentGruppoMercPredicate.get() == null || (currentGruppoMercPredicate.get().test(x)))
-                    ).map(x -> x.setSelectedMtbGrup(this.selectedMtbGrup)).toList();
+                    )
+                    .map(x -> x.setSelectedMtbGrup(this.selectedMtbGrup))
+                    .collect(Collectors.toList());
+            ;
         }
 
         this.currentList.setValue(returnList);
     }
 
-    public ObservableField<Predicate<ProdFabbisognoLineeItemModelDto>> getCurrentNumOrdsPredicate() {
+    public ObservableField<java.util.function.Predicate<ProdFabbisognoLineeItemModelDto>> getCurrentNumOrdsPredicate() {
         return currentNumOrdsPredicate;
     }
 
@@ -87,11 +91,11 @@ public class ProdFabbisognoLineeProdFilterViewModel {
     public List<Integer> getAvailableNumOrds() {
         if (currentGruppoMercPredicate.get() == null) return getAllNumOrds();
         else {
-            return Stream.of(this.initialList)
+            return this.initialList.stream()
                     .filter(x -> (currentGruppoMercPredicate.get() == null || (currentGruppoMercPredicate.get().test(x))))
                     .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
                     .distinct()
-                    .toList();
+                    .collect(Collectors.toList());
         }
     }
 
@@ -100,43 +104,41 @@ public class ProdFabbisognoLineeProdFilterViewModel {
     }
 
     public List<MtbGrup> getAllGruppoMerc(List<MtbGrup> mtbGrupFullList) {
-        var codMgrp = Stream.of(initialList)
+        var codMgrp = initialList.stream()
                 .flatMap(x ->
-                        Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc() != null ?
+                        (x.getOrdineLavorazioneDTO().getAvailableClassMerc() != null ?
                                 x.getOrdineLavorazioneDTO().getAvailableClassMerc() :
-                                new ArrayList<>()))
+                                new ArrayList<OrdineLavorazioneDTO.AvailableClassMerc>()).stream())
                 .map(OrdineLavorazioneDTO.AvailableClassMerc::getCodMgrp)
-                .withoutNulls()
+                .filter(Objects::nonNull)
                 .distinct()
-                .toList();
+                .collect(Collectors.toList());
 
-        return Stream.of(Objects.requireNonNull(mtbGrupFullList))
-                .filter(x -> codMgrp.contains(x.getCodMgrp()))
+        return Objects.requireNonNull(mtbGrupFullList).stream()
+                .filter(x -> x != null && codMgrp.contains(x.getCodMgrp()))
                 .distinct()
-                .withoutNulls()
-                .sortBy(MtbGrup::getDescrizione)
-                .toList();
+                .sorted(Comparator.comparing(MtbGrup::getDescrizione))
+                .collect(Collectors.toList());
     }
 
-    public List<MtbGrup> getAvailableGruppoMerc(List<MtbGrup> mtbGrupFullList){
-        if (currentNumOrdsPredicate.get() == null){
+    public List<MtbGrup> getAvailableGruppoMerc(List<MtbGrup> mtbGrupFullList) {
+        if (currentNumOrdsPredicate.get() == null) {
             return getAllGruppoMerc(mtbGrupFullList);
         } else {
-            List<String> availableCodMgrups = Stream.of(this.initialList)
+            List<String> availableCodMgrups = this.initialList.stream()
                     .filter(x ->
                             (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x)))
                     )
-                    .flatMap(x -> Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc()))
+                    .flatMap(x -> x.getOrdineLavorazioneDTO().getAvailableClassMerc().stream())
                     .map(OrdineLavorazioneDTO.AvailableClassMerc::getCodMgrp)
                     .distinct()
                     .toList();
 
-            return Stream.of(Objects.requireNonNull(mtbGrupFullList))
-                    .filter(x -> availableCodMgrups.contains(x.getCodMgrp()))
+            return Objects.requireNonNull(mtbGrupFullList).stream()
+                    .filter(x -> x != null && availableCodMgrups.contains(x.getCodMgrp()))
                     .distinct()
-                    .withoutNulls()
-                    .sortBy(MtbGrup::getDescrizione)
-                    .toList();
+                    .sorted(Comparator.comparing(MtbGrup::getDescrizione))
+                    .collect(Collectors.toList());
         }
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java

@@ -1,26 +1,21 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest;
 
-import androidx.annotation.NonNull;
-
-import com.google.gson.reflect.TypeToken;
+import com.google.common.reflect.TypeToken;
 
 import java.lang.reflect.Type;
+import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
-import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
-import retrofit2.Call;
-import retrofit2.Response;
 
 @Singleton
 public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
@@ -28,32 +23,25 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
     private final RESTBuilder restBuilder;
     private final SystemRESTConsumer systemRESTConsumer;
 
+    @Inject
     public ProdFabbisognoLineeProdRESTConsumer(RESTBuilder restBuilder, SystemRESTConsumer systemRESTConsumer) {
         this.restBuilder = restBuilder;
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
 
-    public void loadFabbisogno(String numOrd, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<ProdFabbisognoLineeProdDTO> loadFabbisognoSynchronized(String numOrd, String codMdep) throws Exception {
         ProdFabbisognoLineeProdRESTConsumerService prodFabbisognoLineeProdRESTConsumerService = restBuilder.getService(ProdFabbisognoLineeProdRESTConsumerService.class);
-        prodFabbisognoLineeProdRESTConsumerService.loadFabbisogno(numOrd, codMdep)
-                .enqueue(new ManagedErrorCallback<>() {
-                    @Override
-                    public void onResponse(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call,
-                                           Response<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> response) {
-                        analyzeAnswer(response, "retrieveFabbisogno", onComplete, onFailed);
-                    }
+        var response = prodFabbisognoLineeProdRESTConsumerService.loadFabbisogno(numOrd, codMdep)
+                .execute();
 
-                    @Override
-                    public void onFailure(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call, @NonNull final Exception e) {
-                        onFailed.run(e);
-                    }
-                });
+        var data = analyzeAnswer(response, "approvvigionamento/retrieveFabbisogno");
+        return data;
     }
 
 
-    public void loadFabbisogno(String codMart, String ordini, Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        String sql = "SELECT DISTINCT cod_jfas\n" +
+    public ArrayList<JtbFasi> loadCodJfasOfFabbisognoSynchronized(String codMart, String ordini, LocalDate startDate, LocalDate endDate, String codMdep) throws Exception {
+        String sql = "SELECT DISTINCT jtb_fasi.cod_jfas, jtb_fasi.descrizione\n" +
                 "FROM (SELECT DENSE_RANK() OVER (PARTITION BY dtb_ordt.gestione, dtb_ordt.data_ord, dtb_ordt.num_ord ORDER BY dtb_ord_steps.data_iniz DESC) AS row_n,\n" +
                 "             dtb_ord_steps.*\n" +
                 "      FROM dtb_ord_steps\n" +
@@ -71,11 +59,12 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
                 "        AND dtb_ordt.num_ord IN ( " + ordini + " )\n" +
                 "        AND dtb_ordt.data_ord BETWEEN " + UtilityDB.valueToString(startDate) + " AND " + UtilityDB.valueToString(endDate) + "\n" +
                 "        AND dtb_ordr.cod_mart = " + UtilityDB.valueToString(codMart) + ") t\n" +
+                "INNER JOIN jtb_fasi ON t.cod_jfas = jtb_fasi.cod_jfas\n" +
                 "WHERE t.row_n = 1";
 
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
-        this.systemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
+        Type typeOfObjectsList = new TypeToken<ArrayList<JtbFasi>>() {}.getType();
+        return this.systemRESTConsumer.processSqlSynchronized(sql, typeOfObjectsList);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java

@@ -18,6 +18,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -30,6 +31,7 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 
 public class ProdRecuperoMaterialeViewModel {
 
+    private final BarcodeRESTConsumer mBarcodeRESTConsumer;
     private final ProdRecuperoMaterialeRESTConsumer mProdRecuperoMaterialeRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
     private final PrinterRESTConsumer mPrinterRESTConsumer;
@@ -44,11 +46,13 @@ public class ProdRecuperoMaterialeViewModel {
 
 
     @Inject
-    public ProdRecuperoMaterialeViewModel(ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer,
+    public ProdRecuperoMaterialeViewModel(BarcodeRESTConsumer barcodeRESTConsumer,
+                                          ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer,
                                           ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
                                           PrinterRESTConsumer printerRESTConsumer,
                                           MaterialiRESTConsumer materialiRESTConsumer,
                                           ExecutorService executorService) {
+        this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mProdRecuperoMaterialeRESTConsumer = prodRecuperoMaterialeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mPrinterRESTConsumer = printerRESTConsumer;
@@ -78,29 +82,37 @@ public class ProdRecuperoMaterialeViewModel {
 
     public void processBarcodeDTO(BarcodeScanDTO data) {
         if (UtilityBarcode.isEtichettaAnonima(data) || UtilityBarcode.isEtichetta128(data)) {
-            this.executeEtichettaLU(data.getStringValue());
+            this.executeEtichettaLU(data);
 
         }
     }
 
-    private void executeEtichettaLU(String sscc) {
+    private void executeEtichettaLU(BarcodeScanDTO barcodeScanDTO) {
         this.sendOnLoadingStarted();
+        this.mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
 
-        this.mColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> {
-            this.sendOnLoadingEnded();
+            if(ean128Model == null || ean128Model.Sscc == null) {
+                this.sendError(new NoLUFoundException());
+                this.sendOnLoadingEnded();
+                return;
+            }
+
+            this.mColliMagazzinoRESTConsumer.getBySSCC(ean128Model.Sscc, true, false, mtbColt -> {
+                this.sendOnLoadingEnded();
+
+                if (mtbColt != null) {
+                    HistoryVersamentoProdULDTO historyVersamentoProdULRestDTO = this.getHistoryElementFromMtbColt(mtbColt);
+                    if (historyVersamentoProdULRestDTO != null) {
+                        this.dispatchItem(historyVersamentoProdULRestDTO, mtbColt);
+                    } else {
+                        this.sendError(new NoLUFoundException());
+                    }
 
-            if (mtbColt != null) {
-                HistoryVersamentoProdULDTO historyVersamentoProdULRestDTO = this.getHistoryElementFromMtbColt(mtbColt);
-                if (historyVersamentoProdULRestDTO != null) {
-                    this.dispatchItem(historyVersamentoProdULRestDTO, mtbColt);
                 } else {
                     this.sendError(new NoLUFoundException());
                 }
 
-            } else {
-                this.sendError(new NoLUFoundException());
-            }
-
+            }, this::sendError);
         }, this::sendError);
     }
 
@@ -181,7 +193,7 @@ public class ProdRecuperoMaterialeViewModel {
                     .setNumColloRif(item.getNumColloRif())
                     .setOrdini(ordiniRequest);
 
-            if(mtbColt != null) {
+            if (mtbColt != null) {
                 request.setMtbColtCarico(mtbColt);
             } else {
                 request.setMtbColtCarico(sourceMtbColt);

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java

@@ -40,14 +40,17 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderDetailBinding;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
+import it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdDTO;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdView;
 import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCView;
+import it.integry.integrywmsnative.view.dialogs.versamento_automatico_ul_done.DialogVersamentoAutomaticoULDoneView;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -268,6 +271,19 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
 
     }
 
+    @Override
+    public void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete) {
+        DialogAskShouldVersamentoAutomaticoULView.newInstance(onComplete).show(requireActivity().getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
+
+        handler.post(() -> {
+            DialogVersamentoAutomaticoULDoneView.newInstance(versamentoAutomaticoULResponseDTO, onComplete).show(requireActivity().getSupportFragmentManager(), "tag");
+        });
+
+    }
 
     public void addULButtonClick() {
         this.onLoadingStarted();
@@ -355,7 +371,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
     public void deleteMtbColr(MtbColr mtbColr) {
         MtbColt mtbColt = new MtbColt()
                 .setGestione(mtbColr.getGestione())
-                .setDataCollo(mtbColr.getDataColloS())
+                .setDataCollo(mtbColr.getDataColloLD())
                 .setSerCollo(mtbColr.getSerCollo())
                 .setNumCollo(mtbColr.getNumCollo());
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java

@@ -25,6 +25,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ProduzioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.produzione.CaricoProdFinDTO;
 import it.integry.integrywmsnative.core.rest.model.produzione.CaricoProdFinProdottoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -173,13 +174,39 @@ public class ProdRientroMerceOrderDetailViewModel {
                 }, this::sendError);
             } else {
                 synchronized (this.mtbColtsOfOrder) {
-                    this.sendOnLoadingEnded();
-                    this.mListener.onDataSaved(mtbColtSaved);
+                    Runnable onVersamentoCompleted = () -> {
+                        this.sendOnLoadingEnded();
+                        this.mListener.onDataSaved(mtbColtSaved);
+                    };
+
+                    if (SettingsManager.iDB().isFlagProduzioneSkipAskVersamentoAutomatico()) {
+                        versaAutomaticamenteUL(mtbColtSaved, onVersamentoCompleted);
+                    } else {
+                        sendVersamentoAutomaticoULRequest(response -> {
+                            if (response) {
+                                versaAutomaticamenteUL(mtbColtSaved, onVersamentoCompleted);
+                            } else {
+                                onVersamentoCompleted.run();
+                            }
+                        });
+                    }
                 }
             }
         }, this::sendError);
     }
 
+    private void versaAutomaticamenteUL(MtbColt mtbColt, Runnable onComplete) {
+        if (mtbColt == null) return;
+
+        colliMagazzinoRESTConsumer.versamentoAutomaticoUL(mtbColt, versamentoResult -> {
+            this.notifyVersamentoAutomaticoResult(versamentoResult, onComplete);
+        }, this::sendError);
+    }
+
+    private void notifyVersamentoAutomaticoResult(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
+        if (this.mListener != null)
+            mListener.onULVersata(versamentoAutomaticoULResponseDTO, onComplete);
+    }
 
     public void deleteLU(MtbColt mtbColt) {
         this.sendOnLoadingStarted();
@@ -251,11 +278,17 @@ public class ProdRientroMerceOrderDetailViewModel {
                 this::sendError);
     }
 
+    private void sendVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete) {
+        if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete);
+    }
+
     public interface Listener extends ILoadingListener {
+        void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete);
 
         void onDataSaved(MtbColt mtbColt);
 
         void onError(Exception ex);
 
+        void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete);
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java

@@ -68,7 +68,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                         mtbColrList) {
                     HashMap<String, Object> parm = new HashMap<>();
 
-                    parm.put("data_collo", mtbcolr.getDataColloD());
+                    parm.put("data_collo", mtbcolr.getDataColloLD());
                     parm.put("gestione", mtbcolr.getGestione());
                     parm.put("ser_collo", mtbcolr.getSerCollo());
                     parm.put("num_collo", mtbcolr.getNumCollo());
@@ -90,7 +90,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                         ObservableArrayList<MtbColr> mtbColrsRoAdd = new ObservableArrayList<>();
                         mtbColrsRoAdd.addAll(Stream.of(mtbColrList)
                                 .filter(x -> x.getNumCollo().equals(mtbColt.getNumCollo()) &&
-                                        x.getDataColloD().compareTo(mtbColt.getDataColloD()) == 0 &&
+                                        x.getDataColloLD().isEqual(mtbColt.getDataColloLD()) &&
                                         x.getGestione().equals(mtbColt.getGestione()) &&
                                         x.getSerCollo().equals(mtbColt.getSerCollo()))
                                 .toList());

app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdViewModel.java

@@ -143,7 +143,7 @@ public class ProdRiposizionamentoDaProdViewModel {
             this.sendError(new ScannedPositionNotExistException());
         } else {
             if (mtbColt != null) {
-                mColliMagazzinoRESTConsumer.spostaUL(mtbColt, mtbDepoPosizione, () -> {
+                mColliMagazzinoRESTConsumer.spostaUL(mtbColt, mtbDepoPosizione.getCodMdep(), mtbDepoPosizione.getPosizione(), true, false, () -> {
                     List<MvwSitArtUdcDetInventario> mvwSitArtUdcDetInventarioList = mMvwSitArtUdcDetInventarioLiveData.getValue();
 
                     if (mvwSitArtUdcDetInventarioList != null) {

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java

@@ -117,7 +117,7 @@ public class ProdVersamentoMaterialeViewModel {
         } else if (mtbColtList.size() == 1) {
             var mtbColt = this.mColliMagazzinoRESTConsumer.getByTestataSynchronized(mtbColtList.get(0), true, false);
 
-            boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
+            boolean codMdepIsValid = SettingsManager.iDB().getAvailableDepos().stream()
                     .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
 
             if (codMdepIsValid) {
@@ -133,7 +133,7 @@ public class ProdVersamentoMaterialeViewModel {
     private void executeEtichettaLU(String sscc) throws Exception {
         var mtbColt = this.mColliMagazzinoRESTConsumer.getBySsccSynchronized(sscc, true, false);
 
-        boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
+        boolean codMdepIsValid = SettingsManager.iDB().getAvailableDepos().stream()
                 .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
 
         if (codMdepIsValid) {

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java

@@ -13,6 +13,7 @@ import com.ravikoradiya.liveadapter.Type;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -38,6 +39,7 @@ import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemD
 import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditView;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_deposito.DialogAskDepositoView;
+import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
@@ -91,7 +93,6 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
     }
 
     private void init() {
-
         executorService.execute(() -> {
 
             boolean recoveredSession = false;
@@ -129,7 +130,6 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
 
             try {
                 this.onLoadingStarted();
-                mViewModel.loadDeposito(codMdep);
 
                 if (!recoveredSession) mViewModel.createNew(codMdep);
 
@@ -162,7 +162,6 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
         CountDownLatch countDownLatch = new CountDownLatch(1);
         AtomicReference<String> codMdepAtomic = new AtomicReference<>();
 
-
         DialogAskDepositoView.newInstance(codMdep -> {
                     codMdepAtomic.set(codMdep);
                     countDownLatch.countDown();
@@ -173,7 +172,6 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
         return codMdepAtomic.get();
     }
 
-
     private void initRecyclerView() {
         var itemType = new Type<VerificaGiacenzeRowEntity, ListaVerificaGiacenzePickedItemListModelBinding>(R.layout.lista_verifica_giacenze_picked_item_list_model, BR.item);
 
@@ -213,13 +211,12 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
                 this.mViewModel.processBarcodeDTO(data);
             } catch (Exception e) {
                 this.onError(e);
+            } finally {
+                handler.post(this::onLoadingEnded);
             }
         });
-
-        this.onLoadingEnded();
     };
 
-
     private void openItemAction(VerificaGiacenzeRowEntity item) {
         var anagrafica = mViewModel.searchAnagraficaByCodMart(item.getCodMart());
 
@@ -261,7 +258,6 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
         });
     }
 
-
     public PickedQuantityDTO onItemDispatched(MtbAart mtbAart,
                                               BigDecimal initialNumCnf,
                                               BigDecimal initialQtaCnf,
@@ -338,7 +334,6 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
         });
     }
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -350,4 +345,10 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         titleText.setText(R.string.verifica_giacenze_menu);
     }
+
+    @Override
+    public void onChooseArtRequest(List<MtbAart> artsList, RunnableArgs<MtbAart> onComplete) {
+        DialogChooseArtFromListaArtsView.newInstance(true, artsList, onComplete)
+                .show(requireActivity().getSupportFragmentManager(), "dialog-choose-art");
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java

@@ -16,8 +16,8 @@ import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 public class VerificaGiacenzeModule {
 
     @Provides
-    VerificaGiacenzeViewModel providesVerificaGiacenzeViewModel(ExecutorService executorService, Handler handler, VerificaGiacenzeRowMapper verificaGiacenzeRowMapper, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        return new VerificaGiacenzeViewModel(executorService, handler, verificaGiacenzeRowMapper, giacenzaPvRESTConsumer, verificaGiacenzeRepository, verificaGiacenzeRowRepository, articoloRESTConsumer);
+    VerificaGiacenzeViewModel providesVerificaGiacenzeViewModel(Handler handler, VerificaGiacenzeRowMapper verificaGiacenzeRowMapper, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new VerificaGiacenzeViewModel(handler, verificaGiacenzeRowMapper, giacenzaPvRESTConsumer, verificaGiacenzeRepository, verificaGiacenzeRowRepository, articoloRESTConsumer);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java

@@ -11,8 +11,8 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.ExecutorService;
-import java.util.stream.Collectors;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.inject.Inject;
 
@@ -22,8 +22,8 @@ import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRow
 import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository;
 import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository;
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
-import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
 import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
@@ -31,7 +31,6 @@ import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO;
-import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
@@ -39,8 +38,6 @@ import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 
 public class VerificaGiacenzeViewModel {
-
-    private final ExecutorService executorService;
     private final Handler handler;
     private final VerificaGiacenzeRowMapper verificaGiacenzeRowMapper;
     private final GiacenzaPvRESTConsumer giacenzaPvRESTConsumer;
@@ -50,21 +47,17 @@ public class VerificaGiacenzeViewModel {
 
     private Listener listener;
 
-    private MutableLiveData<VerificaGiacenzeEntity> currentVerifica = new MutableLiveData<>();
+    private final MutableLiveData<VerificaGiacenzeEntity> currentVerifica = new MutableLiveData<>();
     private final MutableLiveData<List<VerificaGiacenzeRowEntity>> currentVerificaRows = new MutableLiveData<>(new ArrayList<>());
-
-    private List<GiacenzaPvDTO> currentLoadedGiacenza = null;
-    private List<MtbAart> currentLoadedAnagrafiche = null;
+    private List<MtbAart> currentLoadedAnagrafiche = new ArrayList<>();
 
     @Inject
-    public VerificaGiacenzeViewModel(ExecutorService executorService,
-                                     Handler handler,
+    public VerificaGiacenzeViewModel(Handler handler,
                                      VerificaGiacenzeRowMapper verificaGiacenzeRowMapper,
                                      GiacenzaPvRESTConsumer giacenzaPvRESTConsumer,
                                      VerificaGiacenzeRepository verificaGiacenzeRepository,
                                      VerificaGiacenzeRowRepository verificaGiacenzeRowRepository,
                                      ArticoloRESTConsumer articoloRESTConsumer) {
-        this.executorService = executorService;
         this.handler = handler;
         this.verificaGiacenzeRowMapper = verificaGiacenzeRowMapper;
         this.giacenzaPvRESTConsumer = giacenzaPvRESTConsumer;
@@ -87,8 +80,7 @@ public class VerificaGiacenzeViewModel {
         currentVerifica.postValue(null);
         currentVerificaRows.postValue(new ArrayList<>());
 
-        currentLoadedGiacenza = null;
-        currentLoadedAnagrafiche = null;
+        currentLoadedAnagrafiche = new ArrayList<>();
     }
 
     public LiveData<VerificaGiacenzeEntity> getCurrentVerifica() {
@@ -99,60 +91,6 @@ public class VerificaGiacenzeViewModel {
         return currentVerificaRows;
     }
 
-    public void loadDeposito(String codMdep) throws Exception {
-        currentLoadedGiacenza = this.giacenzaPvRESTConsumer.retrieveGiacenzeSynchronized(codMdep);
-
-        if (currentLoadedGiacenza == null) {
-            throw new Exception("Errore nel recupero delle giacenze");
-        }
-
-        var codMartsToRetrieve = currentLoadedGiacenza.parallelStream()
-                .map(GiacenzaPvDTO::getCodMart)
-                .collect(Collectors.toUnmodifiableList());
-
-        currentLoadedAnagrafiche = this.articoloRESTConsumer.getByCodMartsSynchronized(codMartsToRetrieve);
-
-        if (currentLoadedAnagrafiche == null) {
-            throw new Exception("Errore nel recupero delle anagrafiche");
-        }
-
-        currentLoadedAnagrafiche.forEach(x -> x.setFlagTracciabilita("N"));
-    }
-
-    public void randomizeElements(int elementsCount) {
-
-        for (int i = 0; i < elementsCount; i++) {
-            var randomIndex = (int) (Math.random() * currentLoadedAnagrafiche.size());
-            var randomAnagrafica = currentLoadedAnagrafiche.get(randomIndex);
-
-            var foundGiacenza = currentLoadedGiacenza.parallelStream()
-                    .filter(x -> x.getCodMart().equalsIgnoreCase(randomAnagrafica.getCodMart()))
-                    .findFirst()
-                    .orElse(null);
-            var qtaGiacenza = foundGiacenza != null ? foundGiacenza.getQtaInv() : BigDecimal.ZERO;
-
-            var rowToInsert = new VerificaGiacenzeRowEntity();
-            rowToInsert.setParentId(currentVerifica.getValue().getId());
-            rowToInsert.setCodMart(randomAnagrafica.getCodMart());
-            rowToInsert.setDescrizione(randomAnagrafica.getDescrizione());
-            rowToInsert.setScanCodBarre(randomAnagrafica.getBarCode());
-            rowToInsert.setNumConf(BigDecimal.valueOf((int) (Math.random() * 100)));
-            rowToInsert.setQtaConf(randomAnagrafica.getQtaCnf());
-            rowToInsert.setQta(UtilityBigDecimal.multiply(rowToInsert.getNumConf(), randomAnagrafica.getQtaCnf()));
-            rowToInsert.setQtaInGiacenza(qtaGiacenza);
-
-
-            insertRow(rowToInsert);
-
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-    }
-
     public void createNew(String codMdep) {
         var verificaGiacenzeEntity = new VerificaGiacenzeEntity();
         verificaGiacenzeEntity.setCodMdep(codMdep);
@@ -172,7 +110,7 @@ public class VerificaGiacenzeViewModel {
     }
 
     public void close() throws Exception {
-        if (currentVerificaRows.getValue().isEmpty()) {
+        if (currentVerificaRows.getValue() == null || currentVerificaRows.getValue().isEmpty()) {
             delete();
             return;
         }
@@ -187,32 +125,52 @@ public class VerificaGiacenzeViewModel {
     }
 
     public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) throws Exception {
-
         if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
             var ean13 = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
             this.loadArticolo(ean13.getPrecode());
-
         } else {
             this.loadArticolo(barcodeScanDTO.getStringValue());
         }
     }
 
+    private void loadArticolo(String barcodeProd) throws Exception {
+        var mtbAartList = this.articoloRESTConsumer.searchByBarcodeSynchronized(barcodeProd);
 
-    private void loadArticolo(String barcodeProd) throws NoArtsFoundException, CloneNotSupportedException {
-        var foundMtbAart = searchAnagraficaByBarcode(barcodeProd);
+        if (mtbAartList != null && !mtbAartList.isEmpty()) {
+            MtbAart loadedArticolo;
 
-        if (foundMtbAart == null)
-            throw new NoArtsFoundException();
+            if (mtbAartList.size() == 1) loadedArticolo = mtbAartList.get(0);
+            else loadedArticolo = this.sendChooseArtRequest(mtbAartList);
 
-        loadArticolo(foundMtbAart);
+            if (loadedArticolo == null) return;
+            loadedArticolo.setFlagTracciabilita("N");
+
+            this.updateCurrentAnagrafiche(loadedArticolo);
+            this.loadArticolo(loadedArticolo);
+        } else throw new NoArtsFoundException();
     }
 
-    public void loadArticolo(MtbAart mtbAart) throws NoArtsFoundException, CloneNotSupportedException {
-        var foundGiacenza = currentLoadedGiacenza.parallelStream()
-                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
+    private void updateCurrentAnagrafiche(MtbAart loadedArticolo) {
+        MtbAart mtbAart = currentLoadedAnagrafiche.stream()
+                .filter(x -> x.getCodMart().equalsIgnoreCase(loadedArticolo.getCodMart()))
                 .findFirst()
                 .orElse(null);
 
+        if (mtbAart != null) currentLoadedAnagrafiche.remove(mtbAart);
+
+        currentLoadedAnagrafiche.add(loadedArticolo);
+    }
+
+    public void loadArticolo(MtbAart mtbAart) throws Exception {
+        var foundGiacenzaList = giacenzaPvRESTConsumer.retrieveGiacenzeSynchronized(
+                Objects.requireNonNull(currentVerifica.getValue()).getCodMdep(),
+                mtbAart.getCodMart()
+        );
+
+        if (foundGiacenzaList == null || foundGiacenzaList.isEmpty() || foundGiacenzaList.stream().count() > 1)
+            throw new Exception("Errore nel recupero delle giacenze");
+        var foundGiacenza = foundGiacenzaList.get(0);
+
         var numCnfGiacenza = foundGiacenza != null ? UtilityBigDecimal.divide(foundGiacenza.getQtaInv(), mtbAart.getQtaCnf()) : BigDecimal.ZERO;
         var qtaCnfGiacenza = mtbAart.getQtaCnf();
         var qtaGiacenza = foundGiacenza != null ? foundGiacenza.getQtaInv() : BigDecimal.ZERO;
@@ -226,7 +184,7 @@ public class VerificaGiacenzeViewModel {
 
         boolean isNewRow = false;
 
-        var rowToSave = currentVerificaRows.getValue().parallelStream()
+        var rowToSave = Objects.requireNonNull(currentVerificaRows.getValue()).parallelStream()
                 .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
                 .findFirst()
                 .orElse(null);
@@ -235,7 +193,7 @@ public class VerificaGiacenzeViewModel {
             isNewRow = true;
 
             rowToSave = new VerificaGiacenzeRowEntity();
-            rowToSave.setParentId(currentVerifica.getValue().getId());
+            rowToSave.setParentId(Objects.requireNonNull(currentVerifica.getValue()).getId());
             rowToSave.setCodMart(mtbAart.getCodMart());
             rowToSave.setPartitaMag(null);
             rowToSave.setDescrizione(mtbAart.getDescrizione());
@@ -246,21 +204,18 @@ public class VerificaGiacenzeViewModel {
             initialQtaTot = rowToSave.getQta();
         }
 
-        var pickedQuantity = this.sendOnItemDispatched(mtbAart,
+        var pickedQuantity = this.sendOnItemDispatched(
+                mtbAart,
                 initialNumCnf,
                 qtaCnfGiacenza,
                 initialQtaTot,
                 numCnfGiacenza,
                 qtaGiacenza,
                 incomingNumCnf,
-                incomingQta,
-                null,
-                null
+                incomingQta
         );
 
-        if (pickedQuantity == null)
-            return;
-
+        if (pickedQuantity == null) return;
 
         rowToSave.setNumConf(pickedQuantity.getNumCnf());
         rowToSave.setQtaConf(pickedQuantity.getQtaCnf());
@@ -272,7 +227,6 @@ public class VerificaGiacenzeViewModel {
         } else {
             updateRow(rowToSave);
         }
-
     }
 
     public MtbAart searchAnagraficaByCodMart(String codMart) {
@@ -282,24 +236,6 @@ public class VerificaGiacenzeViewModel {
                 .orElse(null);
     }
 
-    public MtbAart searchAnagraficaByBarcode(String barcode) {
-        MtbAart mtbAart = currentLoadedAnagrafiche.parallelStream()
-                .filter(x -> barcode.equals(x.getBarCode()))
-                .findFirst()
-                .orElse(null);
-
-        if (mtbAart == null) {
-            mtbAart = currentLoadedAnagrafiche.parallelStream()
-                    .filter(x -> x.getMtbAartBarCode() != null &&
-                            x.getMtbAartBarCode().stream()
-                                    .anyMatch(y -> barcode.equals(y.getCodBarre())))
-                    .findFirst()
-                    .orElse(null);
-        }
-
-        return mtbAart;
-    }
-
     public void insertRow(VerificaGiacenzeRowEntity rowEntity) {
         this.sendOnLoadingStarted();
 
@@ -316,7 +252,7 @@ public class VerificaGiacenzeViewModel {
 
         verificaGiacenzeRowRepository.insert(rowEntity, insertedData -> {
             handler.post(() -> {
-                currentVerificaRows.getValue().add(insertedData);
+                Objects.requireNonNull(currentVerificaRows.getValue()).add(insertedData);
                 notifyRowChanged();
             });
         }, this::sendError);
@@ -339,7 +275,7 @@ public class VerificaGiacenzeViewModel {
         var indexInList = -1;
 
         List<VerificaGiacenzeRowEntity> value = currentVerificaRows.getValue();
-        for (int i = 0; i < value.size(); i++) {
+        for (int i = 0; i < Objects.requireNonNull(value).size(); i++) {
             VerificaGiacenzeRowEntity entity = value.get(i);
 
             if (Objects.equals(entity.getId(), rowEntity.getId())) {
@@ -374,7 +310,7 @@ public class VerificaGiacenzeViewModel {
         verificaGiacenzeRowRepository.delete(rowEntity, () -> {
 
             handler.post(() -> {
-                currentVerificaRows.getValue().remove(rowEntity);
+                Objects.requireNonNull(currentVerificaRows.getValue()).remove(rowEntity);
                 notifyRowChanged();
             });
 
@@ -386,6 +322,25 @@ public class VerificaGiacenzeViewModel {
         this.sendOnLoadingEnded();
     }
 
+    private MtbAart sendChooseArtRequest(List<MtbAart> mtbAarts) {
+        final CountDownLatch latch = new CountDownLatch(1);
+        AtomicReference<MtbAart> result = new AtomicReference<>();
+
+        listener.onChooseArtRequest(mtbAarts, data -> {
+            result.set(data);
+            latch.countDown();
+        });
+
+        try {
+            latch.await();
+            return result.get();
+        } catch (InterruptedException e) {
+            this.sendError(e);
+        }
+
+        return null;
+    }
+
     private PickedQuantityDTO sendOnItemDispatched(MtbAart mtbAart,
                                                    BigDecimal initialNumCnf,
                                                    BigDecimal initialQtaCnf,
@@ -393,15 +348,13 @@ public class VerificaGiacenzeViewModel {
                                                    BigDecimal inWarehouseNumCnf,
                                                    BigDecimal inWarehouseQtaTot,
                                                    BigDecimal incomingNumCnf,
-                                                   BigDecimal incomingQtaTot,
-                                                   String partitaMag,
-                                                   LocalDate dataScad) {
+                                                   BigDecimal incomingQtaTot) {
         if (listener != null)
-            return this.listener.onItemDispatched(mtbAart,
-                    initialNumCnf, initialQtaCnf, initialQtaTot,
-                    inWarehouseNumCnf, inWarehouseQtaTot,
-                    incomingNumCnf, incomingQtaTot,
-                    partitaMag, dataScad);
+            return this.listener.onItemDispatched(
+                    mtbAart, initialNumCnf, initialQtaCnf,
+                    initialQtaTot, inWarehouseNumCnf, inWarehouseQtaTot,
+                    incomingNumCnf, incomingQtaTot, null, null
+            );
         return null;
     }
 
@@ -435,5 +388,7 @@ public class VerificaGiacenzeViewModel {
                                            LocalDate dataScad);
 
         void onError(Exception ex);
+
+        void onChooseArtRequest(List<MtbAart> artsList, RunnableArgs<MtbAart> onComplete);
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java

@@ -366,7 +366,7 @@ public class RettificaGiacenzeViewModel {
         mtbColr
                 .setQtaCol(BigDecimal.ZERO)
                 .setNumCnf(BigDecimal.ZERO)
-                .setDataCollo(mCurrentMtbColt.getDataColloS())
+                .setDataCollo(mCurrentMtbColt.getDataColloLD())
                 .setNumCollo(mCurrentMtbColt.getNumCollo())
                 .setGestione(mCurrentMtbColt.getGestione())
                 .setSerCollo(mCurrentMtbColt.getSerCollo());

app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java

@@ -253,7 +253,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
     private void checkUpdates() {
         Snackbar.make(getView(), R.string.checking_updates, Snackbar.LENGTH_SHORT)
                 .show();
-        updatesManager.executeCheck(getContext(), true);
+        updatesManager.executeCheck(getContext(), getParentFragmentManager(), true);
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java

@@ -119,6 +119,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     private boolean mFlagShowCodForn;
     private boolean mDivideByGrpMerc;
     private boolean mEnableQuantityReset;
+    private boolean mIsApprovLinee;
     private int mBarcodeScannerInstanceID = -1;
 
     private ArrayList<SitArtOrdDTO> mSitArtOrd;

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -128,6 +128,7 @@ public class SpedizioneViewModel {
     private boolean mEnableQuantityReset;
     private boolean mUseQtaOrd;
     private boolean mUseColliPedana;
+    private boolean mIsApprovLinee = false;
     private boolean mIsOrdTrasf = false;
 
     private MtbColt mCurrentMtbColt = null;
@@ -187,7 +188,19 @@ public class SpedizioneViewModel {
     }
 
 
-    public void init(String codMdep, boolean enableGiacenza, boolean enableCheckPartitaMag, boolean shouldAskPesoLU, boolean canOverflowOrderQuantity, List<SitArtOrdDTO> pickingList, List<OrdineUscitaInevasoDTO> testateOrdini, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, boolean enableQuantityReset, boolean useQtaOrd, boolean useColliPedana) {
+    public void init(String codMdep,
+                     boolean enableGiacenza,
+                     boolean enableCheckPartitaMag,
+                     boolean shouldAskPesoLU,
+                     boolean canOverflowOrderQuantity,
+                     List<SitArtOrdDTO> pickingList,
+                     List<OrdineUscitaInevasoDTO> testateOrdini,
+                     GestioneEnum gestioneCol,
+                     int segnoCol,
+                     Integer defaultCausaleUL,
+                     boolean enableQuantityReset,
+                     boolean useQtaOrd,
+                     boolean useColliPedana) {
         this.sendOnLoadingStarted();
 
         this.mDefaultCodMdep = codMdep;
@@ -221,6 +234,8 @@ public class SpedizioneViewModel {
         this.mDefaultSegnoCol = segnoCol;
 
         this.initDefaultVars();
+
+        this.mIsApprovLinee = this.mColliScaricoRESTConsumer instanceof ColliLavorazioneRESTConsumer && mDefaultSegnoCol == 1;
     }
 
     private void getPartitaMagList(List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<MtbPartitaMag>> onComplete) {
@@ -652,7 +667,7 @@ public class SpedizioneViewModel {
             }
         } else {
 
-            boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep()
+            boolean codMdepIsValid = SettingsManager.iDB().getAvailableDepos()
                     .stream()
                     .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
 
@@ -695,7 +710,7 @@ public class SpedizioneViewModel {
 
         if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
 
-            boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
+            boolean codMdepIsValid = SettingsManager.iDB().getAvailableDepos().stream()
                     .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
 
             if (codMdepIsValid) {
@@ -714,7 +729,7 @@ public class SpedizioneViewModel {
             if (mtbColt.getSegno() != -1) {
 
                 boolean codMdepMatchPreviousPick = mCurrentMtbColt == null || mCurrentMtbColt.getMtbColr().isEmpty() || mCurrentMtbColt.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep());
-                boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
+                boolean codMdepIsValid = SettingsManager.iDB().getAvailableDepos().stream()
                         .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
 
                 if (codMdepIsValid && codMdepMatchPreviousPick) {
@@ -860,7 +875,7 @@ public class SpedizioneViewModel {
                         if (pickingObjectDTO.getMtbColts().stream()
                                 .anyMatch(x ->
                                         Objects.equals(x.getNumCollo(), scannedUL.getNumCollo()) &&
-                                                x.getDataColloS().equals(scannedUL.getDataColloS()) &&
+                                                x.getDataColloLD().isEqual(scannedUL.getDataColloLD()) &&
                                                 x.getSerCollo().equalsIgnoreCase(scannedUL.getSerCollo()) &&
                                                 (scannedUL.getGestioneEnum() == GestioneEnum.ACQUISTO || scannedUL.getGestioneEnum() == GestioneEnum.LAVORAZIONE))) {
 
@@ -874,7 +889,10 @@ public class SpedizioneViewModel {
 
             for (PickingObjectDTO pickingObject : pickingList) {
                 //Da verificare se il controllo per partita deve essere sempre effettuato
-                if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) && UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) && (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) {
+                if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) &&
+                        UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) &&
+                        UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) &&
+                        (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) {
 
                     if (!matchPickingObject.contains(pickingObject)) {
                         matchPickingObject.add(pickingObject);
@@ -1015,7 +1033,7 @@ public class SpedizioneViewModel {
                 if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() == null)) {
                     tmp.addAll(availableBatchLots.stream()
                             .filter(x -> x.getDataScad() == null)
-                            .sorted(Comparator.comparing(x -> UtilityString.isNull(x.getPartitaMag(), "")))
+                            .sorted(Comparator.comparing(x -> x.getPartitaMag() == null ? "" : x.getPartitaMag()))
                             .collect(Collectors.toList()));
                 }
 
@@ -1467,7 +1485,7 @@ public class SpedizioneViewModel {
     private MtbColt loadRifULFromMtbColr(MtbColr mtbColr) throws Exception {
         //Se ho dei riferimenti ad una UL devo leggere la QTA ancora disponibile sulla Ul
         if (mtbColr != null && !UtilityString.isNullOrEmpty(mtbColr.getGestioneRif()) && !UtilityString.isNullOrEmpty(mtbColr.getSerColloRif()) && !UtilityString.isNullOrEmpty(mtbColr.getDataColloRifS()) && mtbColr.getNumColloRif() != null) {
-            return mColliMagazzinoRESTConsumer.getByChiaveColloSynchronized(mtbColr.getGestioneRifEnum(), mtbColr.getNumColloRif(), mtbColr.getDataColloRifS(), mtbColr.getSerColloRif(), true, false);
+            return mColliMagazzinoRESTConsumer.getByChiaveColloSynchronized(mtbColr.getGestioneRifEnum(), mtbColr.getNumColloRif(), mtbColr.getDataColloRifLD(), mtbColr.getSerColloRif(), true, false);
         }
         return null;
     }
@@ -1581,7 +1599,7 @@ public class SpedizioneViewModel {
                 }
 
                 refMtbColr.setNumCollo(refMtbColt.getNumCollo())
-                        .setDataCollo(refMtbColt.getDataColloS())
+                        .setDataCollo(refMtbColt.getDataColloLD())
                         .setSerCollo(refMtbColt.getSerCollo())
                         .setGestione(refMtbColt.getGestione());
             }
@@ -1614,7 +1632,7 @@ public class SpedizioneViewModel {
         String newCodMdep = shouldChangeCodMdep ? refMtbColt.getCodMdep() : null;
 
         if (shouldChangeCodMdep) {
-            mColliMagazzinoRESTConsumer.spostaUlSynchronized(mCurrentMtbColt, newCodMdep, null, false);
+            mColliMagazzinoRESTConsumer.spostaUlSynchronized(mCurrentMtbColt, newCodMdep, null, false, false);
             mCurrentMtbColt.setCodMdep(newCodMdep);
         }
     }
@@ -1743,9 +1761,11 @@ public class SpedizioneViewModel {
 
             var filledMtbColts = this.mColliMagazzinoRESTConsumer.fillMtbAartsOfMtbColtsSynchronized(generatedMtbColts);
 
-            var positionedMtbColts = this.askPositionChange(filledMtbColts);
 
-            this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts);
+            List<MtbColt> positionedMtbColts = this.askPositionChange(filledMtbColts);
+
+            if (!mIsApprovLinee)
+                this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts);
 
             postCloseOperations(positionedMtbColts);
 
@@ -1770,7 +1790,7 @@ public class SpedizioneViewModel {
                 //.setPrintSSCC(shouldPrint)
                 .setOrderCodMdep(codMdep);
 
-        if (this.mColliScaricoRESTConsumer instanceof ColliLavorazioneRESTConsumer && !mIsOrdTrasf) {
+        if (this.mColliScaricoRESTConsumer instanceof ColliLavorazioneRESTConsumer && !mIsOrdTrasf && !mIsApprovLinee) {
             closeUDSRequestDto.setCriterioDistribuzione(CriterioDistribuzioneEnum.FASE);
 
             var codAnag = mTestateOrdini.stream()
@@ -2021,7 +2041,7 @@ public class SpedizioneViewModel {
                 cloneMtbColr.setRiga(null)
                         .setNumCollo(null)
                         .setGestione((String) null)
-                        .setDataCollo((String) null)
+                        .setDataCollo((LocalDate) null)
                         .setSerCollo(null)
                         .setCausale(MtbColr.Causale.VERSAMENTO);
 
@@ -2080,7 +2100,7 @@ public class SpedizioneViewModel {
                         Optional<MtbColr> optionalMtbColrReference = pickingObjectDTO.getMtbColts().stream()
                                 .filter(y -> withdrawMtbColr.getRefMtbColr() != null &&
                                         withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) &&
-                                        withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) &&
+                                        withdrawMtbColr.getRefMtbColr().getDataColloLD().isEqual(y.getDataColloLD()) &&
                                         withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) &&
                                         withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) &&
                                         UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && !y.getMtbColr().isEmpty() ? y.getMtbColr().get(0).getCodMart() : null) &&

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/prod_fabbisogno_linee_prod/DialogRowInfoProdFabbisognoLineeProdView.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,19 +16,20 @@ import androidx.databinding.DataBindingUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.DialogRowInfoProdFabbisognoLineeProdBinding;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
-import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListModel;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
+import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListModel;
 
 public class DialogRowInfoProdFabbisognoLineeProdView extends BaseDialogRowInfoView implements DialogRowInfoProdFabbisognoLineeProdViewModel.Listener {
 
@@ -35,6 +37,9 @@ public class DialogRowInfoProdFabbisognoLineeProdView extends BaseDialogRowInfoV
     @Inject
     DialogRowInfoProdFabbisognoLineeProdViewModel mViewModel;
 
+    @Inject
+    Handler handler;
+
     private Context mContext;
     private DialogRowInfoProdFabbisognoLineeProdBinding mBindings;
 
@@ -70,27 +75,45 @@ public class DialogRowInfoProdFabbisognoLineeProdView extends BaseDialogRowInfoV
 
         SitArtOrdDTO sitArtOrdDTO = getSpedizioneListModel().getOriginalModel().getSitArtOrdDTO();
 
-        this.mViewModel.getFabbisognoList().removeObservers(this);
-        this.mViewModel.getFabbisognoList().observe(this, this::onFabbisognoListLoaded);
+        this.mViewModel.getLineeProdList().removeObservers(this);
+        this.mViewModel.getLineeProdList().observe(this, this::onLineeProdLoaded);
+
+        this.onLoadingStarted();
+        executorService.execute(() -> {
+            try {
+                this.mViewModel.init(
+                        sitArtOrdDTO.getCodMart(),
+                        sitArtOrdDTO.getCodMdep(),
+                        (String) sitArtOrdDTO.getExtraInfo().get("ordini"),
+                        (LocalDate) sitArtOrdDTO.getExtraInfo().get("dataInizio"),
+                        (LocalDate) sitArtOrdDTO.getExtraInfo().get("dataFine"));
+
+                this.onLoadingEnded();
+            } catch (Exception e) {
+                this.onError(e);
+            }
+        });
 
-        this.mViewModel.init(
-                sitArtOrdDTO.getCodMart(),
-                sitArtOrdDTO.getCodMdep(),
-                (String) sitArtOrdDTO.getExtraInfo().get("ordini"),
-                (Date) sitArtOrdDTO.getExtraInfo().get("dataInizio"),
-                (Date) sitArtOrdDTO.getExtraInfo().get("dataFine"));
     }
 
-    private void onFabbisognoListLoaded(List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
+    private void onLineeProdLoaded(List<JtbFasi> fabbisognoList) {
         for (int i = 0; i < fabbisognoList.size(); i++) {
             String currentKey = fabbisognoList.get(i).getCodJfas();
 
             ViewGroup.LayoutParams lparams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            TextView tv = new TextView(this.mContext);
-            tv.setLayoutParams(lparams);
-            tv.setText(currentKey);
 
-            this.mBindings.contentView.addView(tv);
+            View inflatedLayout= getLayoutInflater().inflate(R.layout.dialog_row_info_prod_fabbisogno_linee_prod__linea_prod__list_item, null, false);
+
+            inflatedLayout.setLayoutParams(lparams);
+            inflatedLayout.setTag(currentKey);
+
+            TextView tvDescription = inflatedLayout.findViewById(R.id.description);
+            tvDescription.setText(fabbisognoList.get(i).getDescrizione());
+
+            TextView tvCode = inflatedLayout.findViewById(R.id.code);
+            tvCode.setText(fabbisognoList.get(i).getCodJfas());
+
+            this.mBindings.contentView.addView(inflatedLayout);
         }
     }
 
@@ -102,13 +125,17 @@ public class DialogRowInfoProdFabbisognoLineeProdView extends BaseDialogRowInfoV
 
     @Override
     public void onLoadingStarted() {
-        this.mBindings.loadingView.setVisibility(View.VISIBLE);
-        this.mBindings.contentView.setVisibility(View.GONE);
+        handler.post(() -> {
+            this.mBindings.loadingView.setVisibility(View.VISIBLE);
+            this.mBindings.contentView.setVisibility(View.GONE);
+        });
     }
 
     @Override
     public void onLoadingEnded() {
-        this.mBindings.loadingView.setVisibility(View.GONE);
-        this.mBindings.contentView.setVisibility(View.VISIBLE);
+        handler.post(() -> {
+            this.mBindings.loadingView.setVisibility(View.GONE);
+            this.mBindings.contentView.setVisibility(View.VISIBLE);
+        });
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/prod_fabbisogno_linee_prod/DialogRowInfoProdFabbisognoLineeProdViewModel.java

@@ -2,18 +2,18 @@ package it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbis
 
 import androidx.lifecycle.MutableLiveData;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
-import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 
 public class DialogRowInfoProdFabbisognoLineeProdViewModel {
 
     private final ProdFabbisognoLineeProdRESTConsumer mProdFabbisognoLineeProdRESTConsumer;
 
-    private final MutableLiveData<List<ProdFabbisognoLineeProdDTO>> mFabbisognoList = new MutableLiveData<>();
+    private final MutableLiveData<List<JtbFasi>> mLineeProdList = new MutableLiveData<>();
 
     private Listener mListener;
 
@@ -23,18 +23,15 @@ public class DialogRowInfoProdFabbisognoLineeProdViewModel {
     }
 
 
-    public void init(String codMart, String codMdep, String ordni, Date startDate, Date endDate) {
-        this.sendOnLoadingStarted();
+    public void init(String codMart, String codMdep, String ordni, LocalDate startDate, LocalDate endDate) throws Exception {
 
-        this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(codMart, ordni, startDate, endDate, codMdep, fabbisognoList -> {
-            this.mFabbisognoList.postValue(fabbisognoList);
-            this.sendOnLoadingEnded();
-        }, this::sendError);
+        var lineeProd = this.mProdFabbisognoLineeProdRESTConsumer.loadCodJfasOfFabbisognoSynchronized(codMart, ordni, startDate, endDate, codMdep);
+        this.mLineeProdList.postValue(lineeProd);
     }
 
 
-    public MutableLiveData<List<ProdFabbisognoLineeProdDTO>> getFabbisognoList() {
-        return mFabbisognoList;
+    public MutableLiveData<List<JtbFasi>> getLineeProdList() {
+        return mLineeProdList;
     }
 
     private void sendOnLoadingStarted() {

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java

@@ -30,6 +30,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupHeaderBinding;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupItemBinding;
@@ -123,9 +124,9 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         } else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
         } else if (position % 2 == 1) {
-            holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
+            holder.mBinding.getRoot().setBackgroundColor(0);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(UtilityResources.getColorResourceFromAttr(mContext, R.attr.colorLetturaFacilitataSurface));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
@@ -135,8 +136,10 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
-        holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
-
+        if(pickingObjectDTO.isDescrizionePresente())
+            holder.mBinding.descrizione.setTextColor(UtilityResources.getColorResourceFromAttr(mContext, android.R.attr.colorForeground));
+        else
+            holder.mBinding.descrizione.setTextColor(Color.GRAY);
 
         holder.mBinding.badge1.setText(pickingObjectDTO.getBadge1());
         holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());

app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java

@@ -10,12 +10,12 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import javax.inject.Inject;
 
@@ -76,7 +76,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main_versamento_merce, container, false);
+        mBindings = FragmentMainVersamentoMerceBinding.inflate(inflater, container, false);
 
         MainApplication.appComponent
                 .versamentoMerceComponent()
@@ -112,9 +112,9 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
             if (mtbColt == null) {
                 ((IPoppableActivity) getActivity()).pop();
             } else if ((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)) {
-                this.mViewModel.getCurrentMtbColt().postValue(mtbColt);
+                this.mViewModel.initUL(mtbColt);
             } else if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) {
-                this.mViewModel.getCurrentMtbColt().postValue(mtbColt);
+                this.mViewModel.initUL(mtbColt);
             } else {
                 DialogSimpleMessageView
                         .makeWarningDialog(new SpannableString(Html.fromHtml("Sono accettate solamente UL di <b>Acquisto</b> o <b>Lavorazione</b> di <b>CARICO</b>")),
@@ -136,8 +136,13 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
         this.onLoadingStarted();
 
-        this.mViewModel.processBarcodeDTO(data, () -> {
-            this.onLoadingEnded();
+        executorService.execute(() -> {
+            try {
+                this.mViewModel.processBarcodeDTO(data);
+                this.onLoadingEnded();
+            } catch (Exception e) {
+                this.onError(e);
+            }
         });
     };
 
@@ -213,12 +218,12 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
                 .setCanLUBeClosed(false);
 
         if (!mDialogInputQuantityV2View.isVisible())
-            this.requireActivity().runOnUiThread(() -> {
+            handler.post(() -> {
                 mDialogInputQuantityV2View
                         .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                         .setOnComplete(resultDTO -> {
 
-                            if(resultDTO == null || resultDTO.isAborted()) {
+                            if (resultDTO == null || resultDTO.isAborted()) {
                                 this.onLoadingEnded();
                                 return;
                             }
@@ -233,7 +238,6 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
                             onComplete.run(pickedQuantityDTO);
 
                         })
-                        .setOnAbort(this::onLoadingEnded)
                         .show(requireActivity().getSupportFragmentManager(), "tag");
             });
         else this.onLoadingEnded();
@@ -241,8 +245,22 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
 
     @Override
     public void onDataSaved() {
-        this.requireActivity().runOnUiThread(() -> {
-            DialogCommon.showDataSaved(requireActivity(), this::popMe);
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+
+        handler.post(() -> {
+            DialogCommon.showDataSaved(requireActivity(), () -> {
+                countDownLatch.countDown();
+            });
         });
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        mViewModel.resetAll();
+        this.openLU();
+
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceModule.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.versamento_merce;
 import dagger.Module;
 import dagger.Provides;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
@@ -11,11 +12,12 @@ import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 public class VersamentoMerceModule {
 
     @Provides
-    VersamentoMerceViewModel providesVersamentoMerceViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+    VersamentoMerceViewModel providesVersamentoMerceViewModel(ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
+                                                              ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
                                                               BarcodeRESTConsumer barcodeRESTConsumer,
                                                               PosizioniRESTConsumer posizioniRESTConsumer,
                                                               MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer) {
-        return new VersamentoMerceViewModel(colliMagazzinoRESTConsumer, barcodeRESTConsumer, posizioniRESTConsumer, magazzinoAutomaticoRESTConsumer);
+        return new VersamentoMerceViewModel(colliLavorazioneRESTConsumer, colliMagazzinoRESTConsumer, barcodeRESTConsumer, posizioniRESTConsumer, magazzinoAutomaticoRESTConsumer);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java

@@ -8,12 +8,15 @@ import com.annimon.stream.Stream;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
 import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
 import it.integry.integrywmsnative.core.exception.NoArtsInLUException;
@@ -28,12 +31,15 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPutItemsRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityPosizione;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -45,228 +51,226 @@ public class VersamentoMerceViewModel {
 
     private Listener mListener;
 
+    private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
     private final BarcodeRESTConsumer mBarcodeRESTConsumer;
     private final PosizioniRESTConsumer mPosizioniRESTConsumer;
     private final MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer;
 
     @Inject
-    public VersamentoMerceViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer) {
+    public VersamentoMerceViewModel(ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer) {
+        this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mPosizioniRESTConsumer = posizioniRESTConsumer;
         this.mMagazzinoAutomaticoRESTConsumer = mMagazzinoAutomaticoRESTConsumer;
     }
 
+    public void initUL(MtbColt response) {
+        this.mCurrentMtbColt.postValue(response);
+    }
 
-    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) throws Exception {
         if (UtilityBarcode.isEtichettaPosizione(barcodeScanDTO, false)) {
-            this.executeEtichettaPosizione(barcodeScanDTO, onComplete);
+            this.executeEtichettaPosizione(barcodeScanDTO);
+
         } else if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
-            this.executeEtichettaLU(barcodeScanDTO.getStringValue(), true, onComplete);
+            this.executeEtichettaLU(barcodeScanDTO.getStringValue(), true);
+
         } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
-            this.executeEtichettaEan128(barcodeScanDTO, onComplete);
-        } else {
-            onComplete.run();
+            this.executeEtichettaEan128(barcodeScanDTO);
         }
     }
 
 
-    private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
-        MtbDepoPosizione foundPosizione = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
+    private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO) throws Exception {
+        MtbDepoPosizione foundPosizione = SettingsManager.iDB().getAvailablePosizioni().stream()
                 .filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue()))
-                .single();
+                .findFirst()
+                .orElse(null);
 
 
         if (foundPosizione == null) {
             //Nessuna posizione trovata con questo barcode
-            this.sendError(new ScannedPositionNotExistException());
-            return;
+            throw new ScannedPositionNotExistException();
         }
 
-        if (foundPosizione.isMagazzinoAutomatico()) {
-            //La posizione è di un magazzino automatico
-            this.executePosizioneMagazzinoAutomatico(foundPosizione, onComplete);
+        this.executePosizione(foundPosizione);
+    }
 
-        } else if (foundPosizione.isFlagMonoCollo()) {
-            this.executePosizioneMonocollo(onComplete, foundPosizione);
+
+    public void executePosizione(MtbDepoPosizione mtbDepoPosizione) throws Exception {
+        if (mtbDepoPosizione.isMagazzinoAutomatico()) {
+            //La posizione è di un magazzino automatico
+            this.executePosizioneMagazzinoAutomatico(mtbDepoPosizione);
+
+        } else if (mtbDepoPosizione.isFlagMonoCollo()) {
+            this.executePosizioneMonocollo(mtbDepoPosizione);
         } else {
 
-            if (!UtilityString.equalsIgnoreCase(mCurrentMtbColt.getValue().getCodMdep(), foundPosizione.getCodMdep())) {
-                this.sendOnSpostamentoTraDepConfirmRequired(mCurrentMtbColt.getValue().getCodMdep(), foundPosizione.getCodMdep(), canContinue -> {
-                    onComplete.run();
-                    if (canContinue) {
-                        if (UtilityPosizione.isPosizioneWithLivello(foundPosizione)) {
-                            askLivelloPosizione(foundPosizione);
-                        } else {
-                            updatePosizione(foundPosizione);
-                        }
-                    }
-                });
-            } else {
-                onComplete.run();
-                if (UtilityPosizione.isPosizioneWithLivello(foundPosizione)) {
-                    askLivelloPosizione(foundPosizione);
+            boolean canContinue = true;
+
+            if (!UtilityString.equalsIgnoreCase(mCurrentMtbColt.getValue().getCodMdep(), mtbDepoPosizione.getCodMdep())) {
+                canContinue = this.sendOnSpostamentoTraDepConfirmRequired(mCurrentMtbColt.getValue().getCodMdep(), mtbDepoPosizione.getCodMdep());
+
+            }
+
+            if (canContinue) {
+                if (UtilityPosizione.isPosizioneWithLivello(mtbDepoPosizione)) {
+                    askLivelloPosizione(mtbDepoPosizione);
                 } else {
-                    updatePosizione(foundPosizione);
+                    updatePosizione(mtbDepoPosizione);
                 }
             }
 
         }
     }
 
-
-    private void executePosizioneMagazzinoAutomatico(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete) {
+    private void executePosizioneMagazzinoAutomatico(MtbDepoPosizione mtbDepoPosizione) throws Exception {
         var magazzinoAutomaticoPickRequest = new MagazzinoAutomaticoPutItemsRequestDTO()
                 .setInputMtbColt(this.mCurrentMtbColt.getValue());
 
-        mMagazzinoAutomaticoRESTConsumer.putItems(mtbDepoPosizione,
-                magazzinoAutomaticoPickRequest, () -> {
-                    onComplete.run();
-                    this.sendOnDataSaved();
-                }, this::sendError);
+        mMagazzinoAutomaticoRESTConsumer.makeSynchronousPutItemsRequest(mtbDepoPosizione, magazzinoAutomaticoPickRequest);
+
+        this.sendOnDataSaved();
     }
 
-    private void executePosizioneMonocollo(Runnable onComplete, MtbDepoPosizione foundPosizione) {
-        this.mPosizioniRESTConsumer.getBancaliInPosizione(foundPosizione, mtbColtList -> {
+    private void executePosizioneMonocollo(MtbDepoPosizione foundPosizione) throws Exception {
+        var barcodeUlInPosizioneList = this.mPosizioniRESTConsumer.getBancaliInPosizioneSynchronized(foundPosizione);
 
-            if (mtbColtList == null || mtbColtList.isEmpty()) {
-                this.sendError(new NoLUFoundException());
-            } else if (mtbColtList.size() == 1) {
-                mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
+        if (barcodeUlInPosizioneList == null || barcodeUlInPosizioneList.isEmpty()) {
+            throw new NoLUFoundException();
+        } else if (barcodeUlInPosizioneList.size() == 1) {
+            var mtbColt = mColliMagazzinoRESTConsumer.getByTestataSynchronized(
+                    barcodeUlInPosizioneList.get(0), true, false
+            );
 
-                    //TAKE HERE
-                    boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep())
-                            .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
+            //TAKE HERE
+            boolean codMdepIsValid = SettingsManager.iDB().getAvailableDepos().stream()
+                    .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
 
-                    if (codMdepIsValid) {
-                        pickMerceULtoUL(mtbColt, onComplete);
-                    } else this.sendError(new InvalidCodMdepException());
+            if (codMdepIsValid) {
+                pickMerceULtoUL(mtbColt);
+            } else throw new InvalidCodMdepException();
+
+        } else {
+            throw new TooManyLUFoundInMonoLUPositionException();
+        }
+    }
+
+
+    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO) throws Exception {
+        var ean128Model = this.mBarcodeRESTConsumer.decodeEan128Synchronized(barcodeScanDTO);
+
+
+        String barcodeProd = null;
+
+        if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
+        if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
+        if (!UtilityString.isNullOrEmpty(ean128Model.Content))
+            barcodeProd = ean128Model.Content;
+
+
+        if (!UtilityString.isNullOrEmpty(barcodeProd)) {
+
+            if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
+                this.executeEtichettaLU(ean128Model.Sscc, false);
 
-                }, this::sendError);
             } else {
-                this.sendError(new TooManyLUFoundInMonoLUPositionException());
+                throw new NoLUFoundException();
             }
-        }, this::sendError);
+
+
+        }
+
     }
 
 
-    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Runnable onBarcodeScanComplete) {
-        this.mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
+    private void executeEtichettaLU(String sscc, boolean isAnonima) throws Exception {
+        var mtbColt = this.mColliMagazzinoRESTConsumer.getBySsccSynchronized(
+                sscc, true, false
+        );
 
-            String barcodeProd = null;
-
-            if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
-            if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
-            if (!UtilityString.isNullOrEmpty(ean128Model.Content))
-                barcodeProd = ean128Model.Content;
-
-
-            if (!UtilityString.isNullOrEmpty(barcodeProd)) {
-
-                if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
-                    this.executeEtichettaLU(ean128Model.Sscc, false, onBarcodeScanComplete);
-                } else {
-                    this.sendError(new NoLUFoundException());
+        if (mtbColt == null && !isAnonima) {
+            throw new NoLUFoundException();
+        } else if (mtbColt != null && (/*mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO ||*/ mtbColt.getGestioneEnum() == GestioneEnum.VENDITA)) {
+            throw new InvalidLUGestioneException(GestioneEnum.VENDITA);
+        } else {
+            if (mtbColt == null) {
+                int numCollo = -1;
+                try {
+                    numCollo = UtilityBarcode.getNumColloFromULAnonima(sscc);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
                 }
+                var createUDCRequestDTO = new CreateUDCRequestDTO()
+                        .setNumCollo(numCollo)
+                        .setSerCollo(CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE)
+                        .setBarcodeUl(sscc);
 
+                var mtbColtAnonimo = this.mColliLavorazioneRESTConsumer.createUDCSynchronized(createUDCRequestDTO);
+                pickMerceULtoUL(mtbColtAnonimo);
 
             } else {
-                //EAN 128 non completo o comunque mancano i riferimenti al prodotto
-                onBarcodeScanComplete.run();
+                boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableDepos())
+                        .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
+
+                if (codMdepIsValid) {
+                    pickMerceULtoUL(mtbColt);
+                } else throw new InvalidCodMdepException();
             }
-        }, this::sendError);
+        }
     }
 
 
-    private void executeEtichettaLU(String sscc, boolean isAnonima, Runnable onComplete) {
-        this.mColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> {
-
-            if (mtbColt == null && !isAnonima) {
-                this.sendError(new NoLUFoundException());
-            } else if (mtbColt != null && (/*mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO ||*/ mtbColt.getGestioneEnum() == GestioneEnum.VENDITA)) {
-                this.sendError(new InvalidLUGestioneException(GestioneEnum.VENDITA));
-            } else {
-                if (mtbColt == null) {
-                    this.mColliMagazzinoRESTConsumer.createColloFromEtichettaAnonima(sscc, GestioneEnum.LAVORAZIONE, mtbColtAnonimo -> {
-                        pickMerceULtoUL(mtbColtAnonimo, onComplete);
-                    }, this::sendError);
-
-                } else {
-                    boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep())
-                            .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
-
-                    if (codMdepIsValid) {
-                        pickMerceULtoUL(mtbColt, onComplete);
-                    } else this.sendError(new InvalidCodMdepException());
-                }
-            }
-
-
-        }, this::sendError);
-    }
-
-
-    private void pickMerceULtoUL(MtbColt destMtbColt, Runnable onComplete) {
+    private void pickMerceULtoUL(MtbColt destMtbColt) throws Exception {
         this.sendOnLoadingStarted();
         MtbColt sourceMtbColt = mCurrentMtbColt.getValue();
 
-        if (!UtilityString.equalsIgnoreCase(sourceMtbColt.getCodMdep(), destMtbColt.getCodMdep())) {
-            this.sendError(new Exception("Impossibile spostare la merce tra UL di due depositi differenti"));
-            return;
-        }
+        if (!UtilityString.equalsIgnoreCase(sourceMtbColt.getCodMdep(), destMtbColt.getCodMdep()))
+            throw new Exception("Impossibile spostare la merce tra UL di due depositi differenti");
 
-        List<MtbColr> mtbColrsToPick = Stream.of(sourceMtbColt.getMtbColr())
-                .filter(x -> x.getQtaCol().floatValue() > 0)
-                .toList();
+        List<MtbColr> mtbColrsToPick = sourceMtbColt.getMtbColr().stream()
+                .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaCol(), BigDecimal.ZERO))
+                .collect(Collectors.toList());
 
         if (mtbColrsToPick.isEmpty()) {
-            this.sendError(new NoArtsInLUException());
-            return;
+            throw new NoArtsInLUException();
         }
 
         this.sendOnLoadingEnded();
-        this.sendOnArtsChooseRequired(mtbColrsToPick, pickedAarts -> {
-            List<MtbColr> destNewMtbColr = new ArrayList<>();
+        var pickedAarts = this.sendOnArtsChooseRequired(mtbColrsToPick);
 
-            askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
-                this.sendOnLoadingStarted();
-
-                MtbColt clonedSourceTestata = (MtbColt) sourceMtbColt.clone();
-                clonedSourceTestata.setMtbColr(new ObservableArrayList<>());
-                clonedSourceTestata.getMtbColr().addAll(destNewMtbColr);
-
-                this.mColliMagazzinoRESTConsumer.spostaArtsTraUL(
-                        clonedSourceTestata,
-                        destMtbColt,
-                        false,
-                        (generatedMtbColrs) -> {
-                            this.sendOnDataSaved();
-                            onComplete.run();
-                        },
-                        this::sendError
-                );
-
-            }, this::sendOnLoadingEnded);
-
-        }, this::sendOnLoadingEnded);
-    }
-
-
-    private void askQuantities(Iterator<MtbColr> sourceMtbColrs, List<MtbColr> destMtbColr, Runnable onComplete, Runnable onAbort) {
-
-        if (sourceMtbColrs.hasNext()) {
-            askSingleQuantity(sourceMtbColrs.next(), mtbColr -> {
-                destMtbColr.add(mtbColr);
-                askQuantities(sourceMtbColrs, destMtbColr, onComplete, onAbort);
-            }, onAbort);
-        } else {
-            onComplete.run();
+        if (pickedAarts == null || pickedAarts.isEmpty()) {
+            // User aborted the picking
+            return;
         }
+
+        List<MtbColr> destNewMtbColr = new ArrayList<>();
+
+        for (MtbColr pickedMtbColr : pickedAarts) {
+            var mtbColr = askSingleQuantity(pickedMtbColr);
+            destNewMtbColr.add(mtbColr);
+        }
+
+
+        this.sendOnLoadingStarted();
+        MtbColt clonedSourceTestata = (MtbColt) sourceMtbColt.clone();
+        clonedSourceTestata.setMtbColr(new ObservableArrayList<>());
+        clonedSourceTestata.getMtbColr().addAll(destNewMtbColr);
+
+        var generatedMtbColrs = this.mColliMagazzinoRESTConsumer.spostaArtsTraULSynchronized(
+                clonedSourceTestata,
+                destMtbColt,
+                false);
+
+        this.sendOnLoadingEnded();
+        this.sendOnDataSaved();
     }
 
-    private void askSingleQuantity(MtbColr mtbColr, RunnableArgs<MtbColr> onComplete, Runnable onAbort) {
-        this.sendOnItemDispatched(mtbColr.getMtbAart(),
+    private MtbColr askSingleQuantity(MtbColr mtbColr) {
+        var pickedQuantity = this.sendOnItemDispatched(mtbColr.getMtbAart(),
                 mtbColr.getNumCnf(),
                 mtbColr.getQtaCnf(),
                 mtbColr.getQtaCol(),
@@ -276,40 +280,42 @@ public class VersamentoMerceViewModel {
                 mtbColr.getPartitaMag(),
                 mtbColr.getDataScadPartita(),
                 false,
-                false,
-                pickedQuantity -> {
-                    mtbColr
-                            .setQtaCol(pickedQuantity.getQtaTot())
-                            .setQtaCnf(pickedQuantity.getQtaCnf())
-                            .setNumCnf(pickedQuantity.getNumCnf())
-                            .setDatetimeRow(UtilityDate.getDateInstance());
+                false);
 
-                    onComplete.run(mtbColr);
+        mtbColr
+                .setQtaCol(pickedQuantity.getQtaTot())
+                .setQtaCnf(pickedQuantity.getQtaCnf())
+                .setNumCnf(pickedQuantity.getNumCnf())
+                .setDatetimeRow(UtilityDate.toDateTime(UtilityDate.getNowTime()));
 
-                });
+        return mtbColr;
     }
 
 
-    public void askLivelloPosizione(MtbDepoPosizione mtbDepoPosizione) {
-        this.sendOnLivelloPosizioneRequired(mtbDepoPosizione, newPosizione -> {
-            if (newPosizione == null) {
-                askLivelloPosizione(mtbDepoPosizione);
-            } else {
-                updatePosizione(newPosizione);
-            }
+    public void askLivelloPosizione(MtbDepoPosizione mtbDepoPosizione) throws Exception {
+        var newPosizione = this.sendOnLivelloPosizioneRequired(mtbDepoPosizione);
+
+        if (newPosizione == null) {
+            askLivelloPosizione(mtbDepoPosizione);
+        } else {
+            updatePosizione(newPosizione);
+        }
 
-        });
     }
 
-    public void updatePosizione(MtbDepoPosizione mtbDepoPosizione) {
+    public void updatePosizione(MtbDepoPosizione mtbDepoPosizione) throws Exception {
         this.sendOnLoadingStarted();
-        mColliMagazzinoRESTConsumer.spostaUL(mCurrentMtbColt.getValue(), mtbDepoPosizione, () -> {
-            this.sendOnLoadingEnded();
-            this.sendOnDataSaved();
-        }, this::sendError);
+        mColliMagazzinoRESTConsumer.spostaUlSynchronized(mCurrentMtbColt.getValue(), mtbDepoPosizione, true);
+
+        this.sendOnLoadingEnded();
+        this.sendOnDataSaved();
     }
 
 
+    public void resetAll() {
+        this.mCurrentMtbColt.postValue(null);
+    }
+
     public MutableLiveData<MtbColt> getCurrentMtbColt() {
         return mCurrentMtbColt;
     }
@@ -323,33 +329,97 @@ public class VersamentoMerceViewModel {
         if (this.mListener != null) mListener.onDataSaved();
     }
 
-    private void sendOnLivelloPosizioneRequired(MtbDepoPosizione posizione, RunnableArgs<MtbDepoPosizione> onComplete) {
+    private MtbDepoPosizione sendOnLivelloPosizioneRequired(MtbDepoPosizione posizione) {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<MtbDepoPosizione> result = new AtomicReference<>();
+
         if (this.mListener != null)
-            mListener.onLivelloPosizioneRequired(posizione, onComplete);
+            mListener.onLivelloPosizioneRequired(posizione, data -> {
+                if (data != null) {
+                    result.set(data);
+                }
+                countDownLatch.countDown();
+            });
+
+        else {
+            // If no listener is set, we complete immediately with an empty list
+            result.set(null);
+            countDownLatch.countDown();
+        }
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        return result.get();
     }
 
-    private void sendOnArtsChooseRequired(List<MtbColr> mtbColrList, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
+    private List<MtbColr> sendOnArtsChooseRequired(List<MtbColr> mtbColrList) {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<List<MtbColr>> result = new AtomicReference<>();
+
         if (this.mListener != null)
-            mListener.onArtsChooseRequired(mtbColrList, onComplete, onAbort);
+            mListener.onArtsChooseRequired(mtbColrList, data -> {
+                if (data != null) {
+                    result.set(data);
+                }
+                countDownLatch.countDown();
+
+            }, countDownLatch::countDown);
+
+        else {
+            // If no listener is set, we complete immediately with an empty list
+            result.set(null);
+            countDownLatch.countDown();
+        }
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        return result.get();
     }
 
-    private void sendOnSpostamentoTraDepConfirmRequired(String sourceCodMdep, String destinationCodMdep, RunnableArgs<Boolean> onComplete) {
+    private Boolean sendOnSpostamentoTraDepConfirmRequired(String sourceCodMdep, String destinationCodMdep) {
+
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<Boolean> result = new AtomicReference<>();
+
         if (this.mListener != null)
-            mListener.onSpostamentoTraDepConfirmRequired(sourceCodMdep, destinationCodMdep, onComplete);
+            mListener.onSpostamentoTraDepConfirmRequired(sourceCodMdep, destinationCodMdep, data -> {
+                result.set(data);
+                countDownLatch.countDown();
+            });
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        return result.get();
     }
 
-    private void sendOnItemDispatched(MtbAart mtbAart,
-                                      BigDecimal initialNumCnf,
-                                      BigDecimal initialQtaCnf,
-                                      BigDecimal initialQtaTot,
-                                      BigDecimal totalQtaAvailable,
-                                      BigDecimal totalNumCnfAvailable,
-                                      BigDecimal qtaCnfAvailable,
-                                      String partitaMag,
-                                      LocalDate dataScad,
-                                      boolean canOverflowOrderQuantity,
-                                      boolean canBatchLotBeChanged,
-                                      RunnableArgs<PickedQuantityDTO> onComplete) {
+    private PickedQuantityDTO sendOnItemDispatched(MtbAart mtbAart,
+                                                   BigDecimal initialNumCnf,
+                                                   BigDecimal initialQtaCnf,
+                                                   BigDecimal initialQtaTot,
+                                                   BigDecimal totalQtaAvailable,
+                                                   BigDecimal totalNumCnfAvailable,
+                                                   BigDecimal qtaCnfAvailable,
+                                                   String partitaMag,
+                                                   LocalDate dataScad,
+                                                   boolean canOverflowOrderQuantity,
+                                                   boolean canBatchLotBeChanged) {
+
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AtomicReference<PickedQuantityDTO> result = new AtomicReference<>();
+
+
         if (this.mListener != null) mListener.onItemDispatched(
                 mtbAart,
                 initialNumCnf,
@@ -362,7 +432,20 @@ public class VersamentoMerceViewModel {
                 dataScad,
                 canOverflowOrderQuantity,
                 canBatchLotBeChanged,
-                onComplete);
+                pickedQuantityDTO -> {
+                    if (pickedQuantityDTO != null) {
+                        result.set(pickedQuantityDTO);
+                    }
+
+                    countDownLatch.countDown();
+                });
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return result.get();
     }
 
     private void sendOnLoadingStarted() {

app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java

@@ -91,7 +91,7 @@ public class BottomSheetFragmentLUContentListAdapter extends RecyclerView.Adapte
         holder.mViewDataBinding.executePendingBindings();
 
         if (position % 2 == 1)
-            holder.mViewDataBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mViewDataBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
 
         holder.mViewDataBinding.getRoot().setOnClickListener(new OnSingleClickListener() {
             @Override

app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java

@@ -44,7 +44,7 @@ public class BottomSheetFragmentLUContentViewModel {
         if (collo == null) return;
 
         ObservableMtbTcol tipoPedana = collo.getMtbTCol();
-        BigDecimal taraPedana = tipoPedana != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO;
+        BigDecimal taraPedana = tipoPedana != null && tipoPedana.getTaraKg() != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO;
         BigDecimal pesoNetto = BigDecimal.ZERO;
 
         for (MtbColr mtbColr : collo.getMtbColr()) {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_deposito/DialogAskDepositoViewModel.java

@@ -8,8 +8,8 @@ import androidx.lifecycle.MutableLiveData;
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.exception.InvalidCodMdepBarcodeException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -47,12 +47,12 @@ public class DialogAskDepositoViewModel {
             throw new InvalidCodMdepBarcodeException(barcodeScanDTO.getStringValue());
         }
 
-        AvailableCodMdepsDTO availableCodMdepsDTO = SettingsManager.iDB().getAvailableCodMdep().stream()
+        MtbDepo availableDepo = SettingsManager.iDB().getAvailableDepos().stream()
                 .filter(x -> x.getCodMdep().equalsIgnoreCase(ean128Model.Internal4))
                 .findFirst()
                 .orElse(null);
 
-        if (availableCodMdepsDTO == null) {
+        if (availableDepo == null) {
             throw new InvalidCodMdepBarcodeException(ean128Model.Internal4);
         }
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java

@@ -148,7 +148,7 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
             }
             case WARNING -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.yellow_600);
-                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_warning_white_24dp, null);
+                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_baseline_warning_24, null);
             }
             case ERROR -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.red_300);

app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogDeviceEndOfLifeComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogDeviceEndOfLifeComponent create();
+    }
+
+    void inject(DialogDeviceEndOfLifeView dialogDeviceEndOfLifeView);
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogDeviceEndOfLifeComponent.class)
+public class DialogDeviceEndOfLifeModule {
+
+    @Provides
+    DialogDeviceEndOfLifeViewModel providesDialogDeviceEndOfLifeViewModel() {
+        return new DialogDeviceEndOfLifeViewModel();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java

@@ -0,0 +1,77 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.databinding.DialogDeviceEndOfLifeBinding;
+
+public class DialogDeviceEndOfLifeView extends BaseDialogFragment {
+
+    @Inject
+    DialogDeviceEndOfLifeViewModel mViewModel;
+
+    private DialogDeviceEndOfLifeBinding mBindings;
+    private Context mContext;
+
+    private final Runnable onComplete;
+
+    //Pass here all external parameters
+    public static DialogDeviceEndOfLifeView newInstance(Runnable onComplete) {
+        return new DialogDeviceEndOfLifeView(onComplete);
+    }
+
+    private DialogDeviceEndOfLifeView(Runnable onComplete) {
+        super();
+
+        this.onComplete = onComplete;
+
+        MainApplication.appComponent
+                .dialogDeviceEndOfLifeComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogDeviceEndOfLifeBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+
+        setCancelable(false);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setPositiveButton(R.string.i_understand_action, (dialog, which) -> {
+                    if (onComplete != null) onComplete.run();
+                    dismiss();
+                })
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java

@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+public class DialogDeviceEndOfLifeViewModel {
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java

@@ -214,6 +214,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 }
             });
         }
+
+
         return mBindings.getRoot();
     }
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/switch_user_depo/DialogSwitchUserDepoView.java

@@ -23,7 +23,7 @@ import it.integry.integrywmsnative.core.di.binders.recyclerview.ItemBinder;
 import it.integry.integrywmsnative.core.di.binders.recyclerview.ItemBinderBase;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
+import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.databinding.DialogSwitchUserDepoBinding;
 
 public class DialogSwitchUserDepoView extends BaseDialogFragment {
@@ -34,15 +34,15 @@ public class DialogSwitchUserDepoView extends BaseDialogFragment {
     private DialogSwitchUserDepoBinding mBindings;
     private Context mContext;
 
-    private final List<AvailableCodMdepsDTO> availableCodMdeps;
-    private final RunnableArgs<AvailableCodMdepsDTO> onComplete;
+    private final List<MtbDepo> availableCodMdeps;
+    private final RunnableArgs<MtbDepo> onComplete;
 
     //Pass here all external parameters
-    public static DialogSwitchUserDepoView newInstance(List<AvailableCodMdepsDTO> availableCodMdeps, RunnableArgs<AvailableCodMdepsDTO> onComplete) {
+    public static DialogSwitchUserDepoView newInstance(List<MtbDepo> availableCodMdeps, RunnableArgs<MtbDepo> onComplete) {
         return new DialogSwitchUserDepoView(availableCodMdeps, onComplete);
     }
 
-    private DialogSwitchUserDepoView(List<AvailableCodMdepsDTO> availableCodMdeps, RunnableArgs<AvailableCodMdepsDTO> onComplete) {
+    private DialogSwitchUserDepoView(List<MtbDepo> availableCodMdeps, RunnableArgs<MtbDepo> onComplete) {
         super();
 
         this.availableCodMdeps = availableCodMdeps;
@@ -80,9 +80,9 @@ public class DialogSwitchUserDepoView extends BaseDialogFragment {
     public void onInit(DialogInterface dialogInterface) {
         super.onInit(dialogInterface);
 
-        ItemBinder<AvailableCodMdepsDTO> itemBinder = new ItemBinderBase<>(BR.item, R.layout.dialog_switch_user_depo__list_item);
+        ItemBinder<MtbDepo> itemBinder = new ItemBinderBase<>(BR.item, R.layout.dialog_switch_user_depo__list_item);
 
-        BindingRecyclerViewAdapter<AvailableCodMdepsDTO> adapter = new BindingRecyclerViewAdapter<>(itemBinder, availableCodMdeps);
+        BindingRecyclerViewAdapter<MtbDepo> adapter = new BindingRecyclerViewAdapter<>(itemBinder, availableCodMdeps);
         adapter.setClickHandler(data -> {
             onComplete.run(data);
             dismiss();

app/src/main/res/drawable/badge_round_corner.xml

@@ -7,7 +7,7 @@
 
             <padding
                 android:left="6dp"
-                android:right="6dp"
+                android:right="8dp"
                 android:top="1dp" />
 
             <corners android:radius="12dp" />

app/src/main/res/drawable/easter_egg__horror_blood.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="488.3dp"
-    android:height="168.7dp"
-    android:viewportWidth="488.3"
-    android:viewportHeight="168.7">
-  <path
-      android:pathData="M484.96,0c0.1,1.5 0.2,3.6 -0.3,6c-0.7,3.4 -2.1,5.8 -3.6,8.5c-0.9,1.7 -2,3.3 -3.5,5.2c-3.5,4.7 -7.2,17.7 -9.9,39.7s-1.3,59.4 1.5,72s-0.1,22.1 -4.6,26.3s0.9,2.1 -6.7,5.1c-7.6,3 -18.9,-5.4 -21.2,-17.7l0,0c-2.3,-12.3 -3.1,-9.1 -0.1,-21.5c3,-12.4 7.6,-24.9 7.7,-36.7c0.1,-11.8 -5.1,-34.2 -12.3,-38s-7,-2.7 -13.8,-3.1s-9.9,-0.1 -13.8,4.3c-3.9,4.4 -6.5,10.3 -7.9,19.7c-1.4,9.4 0,26.7 2.4,33.1c2.4,6.4 3.7,6.8 1,14.9c-2.7,8.1 -15.7,9.9 -20.5,2.9c-4.8,-7.1 -4.3,-17.9 -1.5,-34.7c2.8,-16.8 2.3,-14.6 2.2,-27.2c0,-12.6 1,-11.4 -1.3,-15.8c-2.3,-4.4 -9.7,-9.7 -16.9,-5.7c-7.2,4 -11.7,21.3 -12.6,28.1s-0.9,24.5 0.4,31c1.2,6.5 1.3,12.8 -0.6,17.5s-4,7.4 -7.2,8.6s-6.4,1.4 -10.1,-0.9c-3.7,-2.3 -8.2,-4.8 -8.7,-16.8c-0.5,-12 3.7,-39.8 2.1,-53.6c-1.2,-10.7 -3.7,-14.3 -9.2,-10.6c-3.9,2.6 -7.2,9.4 -4.9,16s2.8,8.4 2.7,13s-1.1,8 -4.4,11.6c-3.3,3.5 -8.3,5 -12.8,1.9c-4.5,-3.1 -6.7,-9.9 -4.3,-18.3c2.5,-8.4 10.1,-11.6 1.7,-19.2c-8.3,-7.6 -14.9,1.7 -15.1,15.6c-0.2,14 0.8,23 3.6,32.5c2.8,9.6 4.1,14.7 4.1,22.7s-5.1,16.1 -12.8,15.3s-12.7,-15.8 -14.7,-26.2c-2,-10.4 -1.8,-8.8 -2.5,-11.3s-1.3,-5 -1.6,-9.6c-1.8,-13 4.7,-26 4.8,-37.1c0,-6.6 0.8,-8.5 -2.8,-12.3s-19.3,6.1 -23.4,17.1s-3.9,10.9 -3.6,25.9s1.8,25.1 5.1,34.5c3.3,9.4 3.9,16.5 3.2,19.7c-0.6,3.3 -0.6,3.1 -1.3,8.3c-0.7,5.2 -3.9,10.8 -6.8,12.3c-3.9,2 -8.2,0.3 -10.5,-1.8c-2.4,-2.4 -5.4,-8.4 -6.7,-13.9s-1.3,-8.5 -1.3,-16s0.3,-14.8 0.7,-19.7c0.4,-4.9 0.8,-11.8 1.1,-25.1c0.3,-13.3 -0.4,-19.2 -3.6,-29.8s-3.5,-9.7 -7.1,-13.5s-5.6,-4.9 -8.6,-4.9c-2.9,0 -8.5,3 -11.3,5.9c-2.7,2.9 -5.6,8.2 -8,15.5s-2.7,9.4 0.3,22.8s3.5,16.2 1.4,27.5c-2,11.3 -7.2,16.8 -14.8,16.8s-12.2,-3.3 -14.5,-7.8s-3.7,-12.1 -3.4,-17.3s2,-15.6 2.8,-18.3c0.9,-2.6 2.8,-14.6 3.3,-20.7c0.5,-6.1 -0.4,-11 -3.4,-16.2s-4.6,-7.1 -6.5,-8.3c-4.8,-2.5 -9.5,2.4 -11.6,4.6c-3.8,3.9 -7.6,10.3 -9,14.7s-1,4.3 -0.3,12s0.8,8.5 -0.2,17s-1.6,11.8 -4.2,15.3s-4,4.7 -9.7,4.7s-12.5,-6.7 -13.7,-12.5s1.4,-15.6 3.1,-23.4s1,-20.1 -0.3,-24c-4,-13.1 -11.8,-9.2 -16.1,-1.2c-5.2,7.4 -5.5,31.2 -3.5,39.9s0.6,19.8 -0.4,24.8s-4.2,12.3 -7,15.4s-10.6,4.7 -14.7,2.4s-8.1,-6.9 -9.7,-11.6c-1.6,-4.7 -1.4,-13.4 0.3,-17.2c1.7,-3.8 7.6,-11.5 8.4,-23.2c0.9,-11.7 -4.8,-17 -5.4,-18.6c-0.6,-1.6 -2.5,-1.1 -4.5,1c-7.6,9.1 -5.7,19.2 -5.8,24.7c-0.4,14.7 3.9,39.6 4.1,49.4c0.2,9.8 -1.7,12.8 -3.5,17.6c-1.8,4.8 -3.4,7.4 -7.6,10s-10.2,5.3 -14.5,3.4c-4.3,-2 -5.1,0.1 -9.1,-11.3c-4,-11.4 1.5,-34 4.2,-42.1c2.7,-8.1 4.2,-11 5.3,-18.4s2.4,-20.6 2.4,-38c0,-17.3 0.6,-16.8 -1.5,-21.5c-3.1,-6.7 -5.1,-14.5 -1.9,-20.4c0.2,-0.4 0.6,-1.1 1.2,-1.8C171.66,0 328.26,0 484.96,0z"
-      android:fillColor="#D32F2F"/>
-</vector>

app/src/main/res/drawable/ic_filter_list_24dp_black.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#000000"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
 </vector>

app/src/main/res/drawable/ic_round_check_24.xml

@@ -1,4 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M9,16.17L5.53,12.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.18,4.18c0.39,0.39 1.02,0.39 1.41,0L20.29,7.71c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0L9,16.17z"/>
     

app/src/main/res/drawable/ic_warning_white_24dp.xml

@@ -1,5 +0,0 @@
-<vector android:height="76dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="76dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
-</vector>