Finish v1.43.01(466)

Refactoring del model MtbTcol, adesso è completamente observable.

.idea/appInsightsSettings.xml

@@ -4,6 +4,20 @@
     <option name="selectedTabId" value="Android Vitals" />
     <option name="tabSettings">
       <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="it.integry.ordify.dulciar" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
         <entry key="Firebase Crashlytics">
           <value>
             <InsightsFilterSettings>

.idea/deploymentTargetSelector.xml

@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-01-17T09:18:08.345092200Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.20" />
+    <option name="version" value="1.9.25" />
   </component>
 </project>

.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/runConfigurations/app.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS_Native.app.main" />
+    <module name="WMS.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />

app/build.gradle

@@ -5,13 +5,13 @@ if (!project.hasProperty("disable-performance-plugin")) {
 }
 
 apply plugin: 'com.google.firebase.crashlytics'
-apply plugin: 'kotlin-android'
+//apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 435
-    def appVersionName = '1.40.18'
+    def appVersionCode = 466
+    def appVersionName = '1.43.01'
 
     signingConfigs {
         release {
@@ -34,10 +34,10 @@ android {
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode appVersionCode
         versionName appVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
 
         javaCompileOptions {
@@ -75,47 +75,54 @@ android {
     build {
         doLast {
             delete "$projectDir/build/outputs/apk/release/version.txt"
-            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName
+            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName + '\n' + 'forced=true'
         }
     }
 
     gradle.projectsEvaluated {
-        tasks.withType(JavaCompile.class) {
-            options.compilerArgs << "-Xmaxerrs" << "10000"
+        tasks.withType(JavaCompile.class).tap {
+            configureEach {
+                options.compilerArgs << "-Xmaxerrs" << "10000"
+            }
         }
     }
     lint {
         abortOnError false
     }
     namespace 'it.integry.integrywmsnative'
-    compileSdk 34
+    compileSdk 35
+}
+
+configurations {
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+//    androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', {
+//        exclude group: 'com.android.support', module: 'support-annotations'
+//    })
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.github.lupaulus:logger:2.3.2'
 
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:32.8.1')
+    implementation platform('com.google.firebase:firebase-bom:33.8.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.3.0'
+    implementation 'com.google.android.gms:play-services-basement:18.5.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
 
     implementation('androidx.preference:preference-ktx:1.2.1') {
         exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
@@ -127,12 +134,12 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
 //    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.46.1'
+    def dagger2_version = '2.55'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -182,6 +189,9 @@ dependencies {
     // RxJava is also required.
     implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+
+    //Barcode generator
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.3'
 }
 
 repositories {

app/src/main/AndroidManifest.xml

@@ -24,8 +24,8 @@
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"

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

@@ -29,6 +29,8 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniE
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiModule;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariComponent;
@@ -124,6 +126,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.Di
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListModule;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
 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.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUModule;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
@@ -140,6 +144,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUModule;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoComponent;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoModule;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiComponent;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiModule;
 
@@ -186,6 +192,7 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         DialogSelectDocInfoModule.class,
         DocInterniEditFormModule.class,
         DialogSelectDocRowsModule.class,
+        DialogSelectLottiModule.class,
         DialogAskClienteModule.class,
         DialogEditArticoloModule.class,
         DialogPrintOrderSSCCListModule.class,
@@ -215,7 +222,9 @@ import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracc
         DialogInfoGiacenzaModule.class,
         ArticoliInGiacenzaModule.class,
         DialogTracciamentoImballiModule.class,
-        DialogAskVettoreModule.class
+        DialogAskVettoreModule.class,
+        DialogCreateNewArtModule.class,
+        DialogSwitchUserDepoModule.class
 })
 public interface MainApplicationComponent {
 
@@ -332,6 +341,7 @@ public interface MainApplicationComponent {
     DialogInfoSituazioneArticoloComponent.Factory dialogInfoSituazioneArticoloComponent();
 
     DialogSelectDocRowsComponent.Factory dialogSelectDocRowsNewComponent();
+    DialogSelectLottiComponent.Factory dialogSelectLottiComponent();
 
     DialogSelectArtToOrderComponent.Factory dialogSelectArtToOrderNewComponent();
 
@@ -361,6 +371,10 @@ public interface MainApplicationComponent {
 
     DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
 
+    DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
+
+    DialogSwitchUserDepoComponent.Factory dialogSwitchUserDepoComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

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

@@ -82,8 +82,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
-        return new SettingsManager(mApplication, systemRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
+    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, ImballiRESTConsumer imballiRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
+        return new SettingsManager(mApplication, systemRESTConsumer, imballiRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
     }
 
     @Provides

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

@@ -103,12 +103,12 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
     @Override
     public void onDBDataLoading(String item) {
-        mBinding.loadingInfoTextview.setText("Caricamento " + item);
+        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));
     }
 
     @Override
     public void onMenuLoading() {
-        mBinding.loadingInfoTextview.setText("Caricamento menù");
+        runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento menù"));
     }
 
     @Override

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
-public class BindableBigDecimal  implements Observable {
+public class BindableBigDecimal implements Observable {
 
     BigDecimal mValue;
 

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

@@ -105,6 +105,28 @@ public class Converters {
             view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
             view.addTextChangedListener(watcher);
         }
+        String newValue = observableField != null ? observableField.get() : "";
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
+    @BindingAdapter("binding")
+    public static void bindEditText(AppCompatTextView view, final ValidatableObservableField<String> observableField) {
+        Pair<ValidatableObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableField) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    if (observableField != null) observableField.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
+            view.addTextChangedListener(watcher);
+        }
         String newValue = observableField.get();
         if (!view.getText().toString().equals(newValue)) {
             view.setText(newValue);
@@ -156,6 +178,28 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindEditText(EditText view, final ValidatableObservableField<String> observableString) {
+        Pair<ValidatableObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableString) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    observableString.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableString, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableString.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindEditText(AutoCompleteTextView view, final ObservableField<String> observableString) {
         Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -260,6 +304,36 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindTextInputEditTextBigDecimal(EditText view, final ValidatableObservableField<BigDecimal> observableBigDecimal) {
+        Pair<ValidatableObservableField<BigDecimal>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableBigDecimal) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    BigDecimal value = null;
+                    String newValueString = s.toString().trim();
+
+                    if (!UtilityString.isNullOrEmpty(newValueString))
+                        value = new BigDecimal(newValueString);
+
+                    observableBigDecimal.set(value);
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableBigDecimal, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        BigDecimal newValue = observableBigDecimal.get();
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+
+        if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
+            view.setText(UtilityNumber.decimalToString(newValue));
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindTextInputEditTextBigDecimal(TextInputEditText view, final BindableBigDecimal bindableBigDecimal) {
         Pair<BindableBigDecimal, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -657,6 +731,30 @@ public class Converters {
         view.setChecked(newValue);
     }
 
+    @BindingAdapter("checked")
+    public static void bindCheckbox(AppCompatCheckBox view, final ObservableField<Boolean> bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+            view.setOnCheckedChangeListener((compoundButton, b) -> {
+                bindableBoolean.set(b);
+            });
+        }
+        Boolean newValue = bindableBoolean.get();
+        view.setChecked(newValue);
+    }
+
+    @BindingAdapter("checked")
+    public static void bindCheckbox(AppCompatCheckBox view, final ValidatableObservableField<Boolean> bindableBoolean) {
+        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
+            view.setTag(R.id.bound_observable, bindableBoolean);
+            view.setOnCheckedChangeListener((compoundButton, b) -> {
+                bindableBoolean.set(b);
+            });
+        }
+        Boolean newValue = bindableBoolean.get();
+        view.setChecked(newValue);
+    }
+
     @BindingAdapter("checked")
     public static void bindCheckbox(CheckBox view, final BindableBoolean bindableBoolean) {
         if (view.getTag(R.id.bound_observable) != bindableBoolean) {
@@ -721,10 +819,49 @@ public class Converters {
     }
 
 
+    @BindingAdapter("visibilityWhenNotNull")
+    public static void bindViewVisibilityWhenNotNull(View view, ObservableField<?> bindableObject) {
+        if(bindableObject == null) return;
+
+        if (view.getTag(R.id.bound_observable) != bindableObject) {
+            view.setTag(R.id.bound_observable, bindableObject);
+        }
+
+        bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE);
+            }
+        });
+
+        view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE);
+    }
+
+
+    @BindingAdapter("visibilityWhenNull")
+    public static void bindViewVisibilityWhenNull(View view, ObservableField<?> bindableObject) {
+
+        if (view.getTag(R.id.bound_observable_visibility) != bindableObject) {
+            view.setTag(R.id.bound_observable_visibility, bindableObject);
+        }
+
+        view.setVisibility(bindableObject == null || bindableObject.get() == null ? View.VISIBLE : View.GONE);
+
+        if(bindableObject == null) return;
+
+        bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+            @Override
+            public void onPropertyChanged(Observable sender, int propertyId) {
+                view.setVisibility(bindableObject.get() == null ? View.VISIBLE : View.GONE);
+            }
+        });
+    }
+
+
     @BindingAdapter({"reverse_visibility"})
     public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) {
-        if (view.getTag(R.id.bound_observable) != bindableBoolean) {
-            view.setTag(R.id.bound_observable, bindableBoolean);
+        if (view.getTag(R.id.bound_reverse_visibility) != bindableBoolean) {
+            view.setTag(R.id.bound_reverse_visibility, bindableBoolean);
         }
         bindableBoolean.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
             @Override

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

@@ -0,0 +1,65 @@
+package it.integry.integrywmsnative.core.di;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.core.di.validators.Validator;
+
+public class ValidatableObservableField<T> extends BaseObservable {
+    private T mValue;
+    private final List<Validator<T>> validators = new ArrayList<>();
+    public String errorMessage;
+
+    public ValidatableObservableField() {
+    }
+
+    public ValidatableObservableField(T value) {
+        mValue = value;
+    }
+
+    /**
+     * @return the stored value.
+     */
+    @Nullable
+    public T get() {
+        return mValue;
+    }
+
+    public void set(T value) {
+        if (value != mValue) {
+            mValue = value;
+            notifyChange();
+            validate();
+        }
+    }
+
+    public void addValidator(Validator<T> validator) {
+        validators.add(validator);
+    }
+
+    public boolean validate() {
+        for (Validator<T> validator : validators) {
+            if (!validator.isValid(mValue)) {
+                setErrorMessage(validator.getErrorMessage());
+                return false;
+            }
+        }
+        setErrorMessage(null);
+        return true;
+    }
+
+    @Bindable
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    private void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+        notifyPropertyChanged(BR.errorMessage); // Notifica il cambiamento di errorMessage
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java

@@ -2,5 +2,25 @@ package it.integry.integrywmsnative.core.di.binders;
 
 public class AutoCompleteTextViewBinders {
 
-
+//    @BindingAdapter("binding")
+//    public static void bindUntMisText(AppCompatAutoCompleteTextView view, ObservableField<MtbUntMis> untMisField) {
+//        Pair<ObservableField<MtbUntMis>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+//        if (pair == null || pair.first != untMisField) {
+//            if (pair != null) {
+//                view.removeTextChangedListener(pair.second);
+//            }
+//            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+//                @Override
+//                public void onTextChanged(CharSequence s, int start, int before, int count) {
+//                    if (untMisField != null) untMisField.set(s.toString());
+//                }
+//            };
+//            view.setTag(R.id.bound_observable, new Pair<>(untMisField, watcher));
+//            view.addTextChangedListener(watcher);
+//        }
+//        String newValue = untMisField != null && untMisField.get() != null ? Objects.requireNonNull(untMisField.get()).getUntMis() : "";
+//        if (!view.getText().toString().equals(newValue)) {
+//            view.setText(newValue);
+//        }
+//    }
 }

app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.di.binders;
 
 import androidx.databinding.BindingAdapter;
+
 import com.google.android.material.textfield.TextInputLayout;
 
 public class TextInputLayoutBinders {

app/src/main/java/it/integry/integrywmsnative/core/di/validators/GreaterThenValidator.java

@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+import java.math.BigDecimal;
+
+public class GreaterThenValidator  implements Validator<BigDecimal> {
+    private final String errorMessage;
+    private final BigDecimal greaterThanValue;
+
+    public GreaterThenValidator(BigDecimal greaterThanValue, String errorMessage) {
+        this.greaterThanValue = greaterThanValue;
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(BigDecimal value) {
+        return value != null && value.compareTo(greaterThanValue) > 0;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/MinLengthValidator.java

@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class MinLengthValidator implements Validator<String> {
+    private final int minLength;
+    private final String errorMessage;
+
+    public MinLengthValidator(int minLength, String errorMessage) {
+        this.minLength = minLength;
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(String value) {
+        return value != null && value.length() >= minLength;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotEmptyValidator.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class NotEmptyValidator implements Validator<String> {
+    private final String errorMessage;
+
+    public NotEmptyValidator(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(String value) {
+        return value != null && !value.trim().isEmpty();
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/NotNullValidator.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public class NotNullValidator<T> implements Validator<T>{
+    private final String errorMessage;
+
+    public NotNullValidator(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public boolean isValid(T value) {
+        return value != null;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/di/validators/Validator.java

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.di.validators;
+
+public interface Validator<T> {
+    boolean isValid(T value);
+
+    String getErrorMessage();
+}

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java

@@ -6,6 +6,8 @@ import android.view.KeyEvent;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
@@ -18,7 +20,8 @@ public class BaseActivity extends AppCompatActivity {
     @Inject
     public DialogProgressView mCurrentProgress;
 
-    private boolean progressOpened;
+    @Inject
+    public ExecutorService executorService;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -47,28 +50,19 @@ public class BaseActivity extends AppCompatActivity {
     }
 
 
+
     private void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
-            this.progressOpened = true;
-            runOnUiThread(() -> {
-                try {
-                    this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
-                } catch (IllegalStateException ise) {
-                    //ignored
-                }
-            });
-        }
+//        executorService.execute(() -> {
+            this.mCurrentProgress.show(getSupportFragmentManager());
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
-            this.progressOpened = false;
-            runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-            });
-        }
+//        executorService.execute(() -> {
+            mCurrentProgress.dismiss();
+//        });
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java

@@ -13,6 +13,8 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import java.util.concurrent.ExecutorService;
+
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
@@ -24,7 +26,9 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
 
     @Inject
     public DialogProgressView mCurrentProgress;
-    private boolean progressOpened;
+
+    @Inject
+    public ExecutorService executorService;
 
     private boolean mBarcodeListener = false;
 
@@ -70,28 +74,26 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo
         BarcodeManager.enable();
     }
 
+
     private void openProgress() {
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
-            this.progressOpened = true;
-            requireActivity().runOnUiThread(() -> {
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
+        BarcodeManager.disable();
+//        executorService.execute(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+//        });
     }
 
     private void closeProgress() {
-        if (progressOpened) {
-            this.progressOpened = false;
-            requireActivity().runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-            });
-        }
+        BarcodeManager.enable();
+//        executorService.execute(() -> {
+            mCurrentProgress.dismiss();
+//        });
     }
 
 
     public void onError(Exception ex) {
+        this.onLoadingEnded();
+
         requireActivity().runOnUiThread(() -> {
-            this.onLoadingEnded();
             UtilityExceptions.defaultException(requireActivity(), ex);
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java

@@ -33,7 +33,6 @@ public abstract class BaseFragment extends Fragment {
     protected ElevatedToolbar mToolbar;
 
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
-    private boolean progressOpened;
 
 
     public void setScrollToolbar(ElevatedToolbar toolbar) {
@@ -67,22 +66,16 @@ public abstract class BaseFragment extends Fragment {
 
     private void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
-            this.progressOpened = true;
-            executorService.execute(() -> {
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
+//        executorService.execute(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
+//        });
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
-            this.progressOpened = false;
-            executorService.execute(() -> {
-                mCurrentProgress.dismissAllowingStateLoss();
-            });
-        }
+//        executorService.execute(() -> {
+            mCurrentProgress.dismiss();
+//        });
     }
 
     public void onError(Exception ex) {

app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.core.helper;
+
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+
+public final class GestioneToTextConverter {
+
+    public static String convert(GestioneEnum gestioneEnum) {
+        return switch (gestioneEnum) {
+            case ACQUISTO -> "Acquisto";
+            case PRODUZIONE -> "Produzione";
+            case LAVORAZIONE -> "Lavorazione";
+            case VENDITA -> "Vendita";
+        };
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/mapper/InventarioRowMapper.java

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.mapper;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
 import it.integry.integrywmsnative.core.model.MtbInvenr;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 
 public class InventarioRowMapper extends BaseMapper<MtbInvenr, InventarioRowRoomDTO> {
 
@@ -32,6 +33,7 @@ public class InventarioRowMapper extends BaseMapper<MtbInvenr, InventarioRowRoom
         data.setDataOraInv(inputData.getDataOraInv());
         data.setScanCodBarre(inputData.getScanCodBarre());
         data.setZona(inputData.getZona());
+        data.setIdDisp(SettingsManager.i().getUserSession().getDeviceId());
         return data;
     }
 }

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

@@ -261,6 +261,11 @@ public class MtbColr extends EntityBase {
         return this;
     }
 
+    public MtbColr setDataColloRif(LocalDate dataColloRif) {
+        this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        return this;
+    }
+
     public BigDecimal getQtaCnf() {
         return qtaCnf;
     }

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

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.model;
 import android.text.TextUtils;
 
 import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableField;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
@@ -10,11 +11,13 @@ import com.annimon.stream.Stream;
 import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
@@ -63,7 +66,7 @@ public class MtbColt extends EntityBase {
     private BigDecimal altezzaCm;
     private String codJcom;
 
-    private MtbTCol mtbTCol;
+    private final ObservableField<ObservableMtbTcol> mtbTCol = new ObservableField<>();
 
     private Boolean disablePrint;
     private String ragSocCliente;
@@ -160,6 +163,10 @@ public class MtbColt extends EntityBase {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS());
     }
 
+    public LocalDate getDataColloLD() {
+        return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataColloS());
+    }
+
     public MtbColt setDataCollo(String dataCollo) {
         this.dataCollo = dataCollo;
         return this;
@@ -170,6 +177,11 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public MtbColt setDataCollo(LocalDate dataCollo) {
+        this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+        return this;
+    }
+
     public String getSerCollo() {
         return serCollo;
     }
@@ -248,6 +260,16 @@ public class MtbColt extends EntityBase {
 
     public MtbColt setCodTcol(String codTcol) {
         this.codTcol = codTcol;
+
+        if(!UtilityString.isNullOrEmpty(codTcol)) {
+            var fountMtbTcolObservable = SettingsManager.iDB().getInternalImballi().stream()
+                    .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol))
+                    .findFirst()
+                    .orElse(null);
+            this.setMtbTCol(fountMtbTcolObservable);
+        } else
+            this.setMtbTCol(null);
+
         return this;
     }
 
@@ -522,15 +544,19 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
-    public MtbTCol getMtbTCol() {
-        return mtbTCol;
+    public ObservableMtbTcol getMtbTCol() {
+        return mtbTCol.get();
     }
 
-    public MtbColt setMtbTCol(MtbTCol mtbTCol) {
-        this.mtbTCol = mtbTCol;
+    public MtbColt setMtbTCol(ObservableMtbTcol mtbTCol) {
+        this.mtbTCol.set(mtbTCol);
         return this;
     }
 
+    public ObservableField<ObservableMtbTcol> mtbTcolProperty() {
+        return mtbTCol;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";

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

@@ -1,5 +1,8 @@
 package it.integry.integrywmsnative.core.model;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MtbGrup extends EntityBase {
 
     private String codMgrp;
@@ -8,6 +11,7 @@ public class MtbGrup extends EntityBase {
     private String logoWeb;
     private String criterioVal;
     private String tipoMgrp;
+    private List<MtbSgrp> mtbSgrp = new ArrayList<>();
 
     public MtbGrup() {
         this.type = "mtb_grup";
@@ -66,4 +70,13 @@ public class MtbGrup extends EntityBase {
         this.tipoMgrp = tipoMgrp;
         return this;
     }
+
+    public List<MtbSgrp> getMtbSgrp() {
+        return mtbSgrp;
+    }
+
+    public MtbGrup setMtbSgrp(List<MtbSgrp> mtbSgrp) {
+        this.mtbSgrp = mtbSgrp;
+        return this;
+    }
 }

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

@@ -0,0 +1,49 @@
+package it.integry.integrywmsnative.core.model;
+
+public class MtbSfam extends EntityBase {
+
+    private String codMgrp;
+    private String codMsgr;
+    private String codMsfa;
+    private String descrizione;
+
+    public MtbSfam() {
+        this.type = "mtb_sfam";
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public MtbSfam setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+        return this;
+    }
+
+    public String getCodMsgr() {
+        return codMsgr;
+    }
+
+    public MtbSfam setCodMsgr(String codMsgr) {
+        this.codMsgr = codMsgr;
+        return this;
+    }
+
+    public String getCodMsfa() {
+        return codMsfa;
+    }
+
+    public MtbSfam setCodMsfa(String codMsfa) {
+        this.codMsfa = codMsfa;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public MtbSfam setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+}

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

@@ -0,0 +1,112 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MtbSgrp extends EntityBase {
+
+    private String codMgrp;
+    private String codMsgr;
+    private String descrizione;
+    private String inclInStat;
+    private String contoRimFin;
+    private Integer ordinamento;
+    private Boolean chkGiacenzaNeg;
+    private Boolean flagReso;
+    private String codCconWip;
+    private List<MtbSfam> mtbSfam = new ArrayList<>();
+
+    public MtbSgrp() {
+        this.type = "mtb_sgrp";
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public MtbSgrp setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+        return this;
+    }
+
+    public String getCodMsgr() {
+        return codMsgr;
+    }
+
+    public MtbSgrp setCodMsgr(String codMsgr) {
+        this.codMsgr = codMsgr;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public MtbSgrp setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getInclInStat() {
+        return inclInStat;
+    }
+
+    public MtbSgrp setInclInStat(String inclInStat) {
+        this.inclInStat = inclInStat;
+        return this;
+    }
+
+    public String getContoRimFin() {
+        return contoRimFin;
+    }
+
+    public MtbSgrp setContoRimFin(String contoRimFin) {
+        this.contoRimFin = contoRimFin;
+        return this;
+    }
+
+    public Integer getOrdinamento() {
+        return ordinamento;
+    }
+
+    public MtbSgrp setOrdinamento(Integer ordinamento) {
+        this.ordinamento = ordinamento;
+        return this;
+    }
+
+    public Boolean getChkGiacenzaNeg() {
+        return chkGiacenzaNeg;
+    }
+
+    public MtbSgrp setChkGiacenzaNeg(Boolean chkGiacenzaNeg) {
+        this.chkGiacenzaNeg = chkGiacenzaNeg;
+        return this;
+    }
+
+    public Boolean getFlagReso() {
+        return flagReso;
+    }
+
+    public MtbSgrp setFlagReso(Boolean flagReso) {
+        this.flagReso = flagReso;
+        return this;
+    }
+
+    public String getCodCconWip() {
+        return codCconWip;
+    }
+
+    public MtbSgrp setCodCconWip(String codCconWip) {
+        this.codCconWip = codCconWip;
+        return this;
+    }
+
+    public List<MtbSfam> getMtbSfam() {
+        return mtbSfam;
+    }
+
+    public MtbSgrp setMtbSfam(List<MtbSfam> mtbSfam) {
+        this.mtbSfam = mtbSfam;
+        return this;
+    }
+}

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

@@ -15,7 +15,7 @@ public class MtbTCol {
     private BigDecimal taraKg;
     private String descrizione;
     private String codMart;
-    private FlagUiUlEnum flagUIUL;
+    private FlagUiUlEnum flagUiUl;
     private String circuito;
 
     public String getCodTcol() {
@@ -90,12 +90,12 @@ public class MtbTCol {
         return this;
     }
 
-    public FlagUiUlEnum getFlagUIUL() {
-        return flagUIUL;
+    public FlagUiUlEnum getFlagUiUl() {
+        return flagUiUl;
     }
 
-    public void setFlagUIUL(FlagUiUlEnum flagUIUL) {
-        this.flagUIUL = flagUIUL;
+    public void setFlagUiUl(FlagUiUlEnum flagUiUl) {
+        this.flagUiUl = flagUiUl;
     }
 
     public String getCircuito() {

app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.model.mapper;
+
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
+
+public class MtbTcolMapper {
+
+    public static ObservableMtbTcol fromDTO(MtbTCol dto) {
+        ObservableMtbTcol mtbTcol = new ObservableMtbTcol();
+        mtbTcol.updateFromDTO(dto);
+        return mtbTcol;
+    }
+
+    public static ObservableList<ObservableMtbTcol> fromDTOList(List<MtbTCol> dto) {
+        ObservableList<ObservableMtbTcol> mtbTCols = new ObservableArrayList<>();
+
+        mtbTCols.addAll(dto.stream().map(MtbTcolMapper::fromDTO)
+                .collect(Collectors.toUnmodifiableList()));
+
+        return mtbTCols;
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java

@@ -0,0 +1,127 @@
+package it.integry.integrywmsnative.core.model.observable;
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.databinding.ObservableField;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class ObservableMtbTcol extends BaseObservable {
+
+    private final ObservableField<String> codTcol = new ObservableField<>();
+    private final ObservableField<BigDecimal> pesoKg = new ObservableField<>();
+    private final ObservableField<BigDecimal> lunghezzaCm = new ObservableField<>();
+    private final ObservableField<BigDecimal> larghezzaCm = new ObservableField<>();
+    private final ObservableField<BigDecimal> altezzaCm = new ObservableField<>();
+    private final ObservableField<BigDecimal> taraKg = new ObservableField<>();
+    private final ObservableField<String> descrizione = new ObservableField<>();
+    private final ObservableField<String> codMart = new ObservableField<>();
+    private final ObservableField<MtbTCol.FlagUiUlEnum> flagUIUL = new ObservableField<>();
+    private final ObservableField<String> circuito = new ObservableField<>();
+
+    @Bindable
+    public String getCodTcol() {
+        return codTcol.get();
+    }
+
+    @Bindable
+    public BigDecimal getPesoKg() {
+        return pesoKg.get();
+    }
+
+    @Bindable
+    public BigDecimal getLunghezzaCm() {
+        return lunghezzaCm.get();
+    }
+
+    @Bindable
+    public BigDecimal getLarghezzaCm() {
+        return larghezzaCm.get();
+    }
+
+    @Bindable
+    public BigDecimal getAltezzaCm() {
+        return altezzaCm.get();
+    }
+
+    @Bindable
+    public BigDecimal getTaraKg() {
+        return taraKg.get();
+    }
+
+    @Bindable
+    public String getDescrizione() {
+        return descrizione.get();
+    }
+
+    @Bindable
+    public String getCodMart() {
+        return codMart.get();
+    }
+
+    @Bindable
+    public MtbTCol.FlagUiUlEnum getFlagUIUL() {
+        return flagUIUL.get();
+    }
+
+    @Bindable
+    public String getCircuito() {
+        return circuito.get();
+    }
+
+
+    public ObservableField<String> codTcolProperty() {
+        return codTcol;
+    }
+
+    public ObservableField<BigDecimal> pesoKgProperty() {
+        return pesoKg;
+    }
+
+    public ObservableField<BigDecimal> lunghezzaCmProperty() {
+        return lunghezzaCm;
+    }
+
+    public ObservableField<BigDecimal> larghezzaCmProperty() {
+        return larghezzaCm;
+    }
+
+    public ObservableField<BigDecimal> altezzaCmProperty() {
+        return altezzaCm;
+    }
+
+    public ObservableField<BigDecimal> taraKgProperty() {
+        return taraKg;
+    }
+
+    public ObservableField<String> descrizioneProperty() {
+        return descrizione;
+    }
+
+    public ObservableField<String> codMartProperty() {
+        return codMart;
+    }
+
+    public ObservableField<MtbTCol.FlagUiUlEnum> flagUIULProperty() {
+        return flagUIUL;
+    }
+
+    public ObservableField<String> circuitoProperty() {
+        return circuito;
+    }
+
+    public void updateFromDTO(MtbTCol mtbTCol) {
+        codTcol.set(mtbTCol.getCodTcol());
+        pesoKg.set(mtbTCol.getPesoKg());
+        lunghezzaCm.set(mtbTCol.getLunghezzaCm());
+        larghezzaCm.set(mtbTCol.getLarghezzaCm());
+        altezzaCm.set(mtbTCol.getAltezzaCm());
+        taraKg.set(mtbTCol.getTaraKg());
+        descrizione.set(mtbTCol.getDescrizione());
+        codMart.set(mtbTCol.getCodMart());
+        flagUIUL.set(mtbTCol.getFlagUiUl());
+        circuito.set(mtbTCol.getCircuito());
+    }
+}

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

@@ -18,7 +18,10 @@ import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.articolo.ArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
@@ -36,6 +39,41 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
         this.systemRESTConsumer = systemRESTConsumer;
     }
 
+
+    public void retrieveAvailableUntMis(RunnableArgs<List<MtbUntMis>> onComplete, RunnableArgs<Exception> onFailed) {
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        articoloRESTConsumerService
+                .retrieveAvailableUntMis()
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<MtbUntMis>> call, Response<ServiceRESTResponse<MtbUntMis>> response) {
+                        analyzeAnswerList(response, "retrieveAvailableUntMis", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<MtbUntMis>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void retrieveAvailableGruppiMerceologici(RunnableArgs<List<MtbGrup>> onComplete, RunnableArgs<Exception> onFailed) {
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        articoloRESTConsumerService
+                .retrieveAvailableGruppiMerceologici()
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<MtbGrup>> call, Response<ServiceRESTResponse<MtbGrup>> response) {
+                        analyzeAnswerList(response, "retrieveAvailableGruppiMerceologici", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<MtbGrup>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
     public void searchByBarcode(String barcodeProd, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
         ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
 
@@ -205,4 +243,28 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                     }
                 });
     }
+
+
+    public void saveArticolo(ArticoloDTO articoloToSave, RunnableArgs<String> onComplete, RunnableArgs<Exception> onFailed) {
+        ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+
+        var request = new SaveArticoloRequestDTO()
+                .setArtToSave(articoloToSave);
+
+        articoloRESTConsumerService
+                .saveArticolo(request)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<SaveArticoloResponseDTO>> call, Response<ServiceRESTResponse<SaveArticoloResponseDTO>> response) {
+                        analyzeAnswer(response, "saveArticolo", data -> {
+                            onComplete.run(data.getCodMart());
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<SaveArticoloResponseDTO>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }

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

@@ -3,9 +3,13 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.articolo.RetrieveArticoloByCodMartRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.articolo.SaveArticoloResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.SearchArticoloByBarcodeResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.articolo.UpdateBarcodeImballoRequestDTO;
@@ -17,6 +21,13 @@ import retrofit2.http.Query;
 
 public interface ArticoloRESTConsumerService {
 
+
+    @GET("wms/articolo/availableUntMis")
+    Call<ServiceRESTResponse<MtbUntMis>> retrieveAvailableUntMis();
+
+    @GET("wms/articolo/availableGruppiMerceologici")
+    Call<ServiceRESTResponse<MtbGrup>> retrieveAvailableGruppiMerceologici();
+
     @POST("wms/articolo/searchByBarcode")
     Call<ServiceRESTResponse<SearchArticoloByBarcodeResponseDTO>> searchByBarcode(@Body() SearchArticoloByBarcodeRequestDTO searchArticoloByBarcodeRequest);
 
@@ -29,4 +40,7 @@ public interface ArticoloRESTConsumerService {
     @GET("getProductLotStatus")
     Call<ServiceRESTResponse<List<StatoArticoloDTO>>> getStatoPartita(@Query("codMart") String codMart, @Query("partitaMag") String partitaMag);
 
+    @POST("wms/articolo/saveArticolo")
+    Call<ServiceRESTResponse<SaveArticoloResponseDTO>> saveArticolo(@Body SaveArticoloRequestDTO saveArticoloRequest);
+
 }

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

@@ -114,4 +114,21 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
                 });
     }
 
+    public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.checkIfBarcodeUlAlreadyRegistered(barcodeUl)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "accettazione/checkIfBarcodeUlAlreadyRegistered", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
 }

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

@@ -12,7 +12,9 @@ import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 
 public interface ColliAccettazioneRESTConsumerService {
 
@@ -31,4 +33,7 @@ public interface ColliAccettazioneRESTConsumerService {
     @POST("wms/accettazione/deleteUDCRow")
     Call<ServiceRESTResponse<Void>> deleteUDCRow(@Body DeleteUDCRowRequestDTO deleteUDCRowRequestDTO);
 
+    @GET("wms/accettazione/checkIfBarcodeUlAlreadyRegistered")
+    Call<ServiceRESTResponse<Boolean>> checkIfBarcodeUlAlreadyRegistered(@Query("barcodeUl") String barcodeUl);
+
 }

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

@@ -11,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -31,6 +32,8 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
@@ -286,7 +289,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                 analyzeAnswer(response, "GetBySSCC", mtbColt -> {
 
-                    if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                    if (mtbColt != null && mtbColt.getMtbColr() != null && !mtbColt.getMtbColr().isEmpty()) {
                         List<MtbColt> mtbColtList = new ArrayList<>();
                         mtbColtList.add(mtbColt);
                         fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
@@ -404,11 +407,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void changePosizione(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-
-        String codMdep = posizione.getCodMdep();
-        String posizioneString = posizione.getPosizione();
-
+    public void spostaUL(MtbColt mtbColtToMove, String codMdep, String posizione, boolean createDocAutomatically, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToMoveClone = (MtbColt) mtbColtToMove.clone();
 
         for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
@@ -417,26 +416,66 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     .setMtbPartitaMag(null);
         }
 
+        SpostaULRequestDTO spostaUlRequestDTO = new SpostaULRequestDTO()
+                .setCodMdep(codMdep)
+                .setPosizione(posizione)
+                .setMtbColtsToMove(Collections.singletonList(mtbColtToMoveClone))
+                .setCreateDocAutomatically(createDocAutomatically);
+
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
         colliMagazzinoRESTConsumerService
-                .spostaULInPosizione(codMdep,
-                        posizioneString,
-                        mtbColtToMoveClone)
-                .enqueue(new Callback<ServiceRESTResponse<Object>>() {
+                .spostaUL(spostaUlRequestDTO)
+                .enqueue(new Callback<>() {
                     @Override
-                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
-                        analyzeAnswer(response, "changePosizione", mtbColts -> {
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "spostaUL", mtbColts -> {
                             onComplete.run();
                         }, onFailed);
                     }
 
                     @Override
-                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
                         if (onFailed != null) onFailed.run(new Exception(t));
                     }
                 });
     }
 
+    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 updateTipoUL(MtbColt mtbColt, String codTcol, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        MtbColt mtbColtClone = (MtbColt) mtbColt.clone();
+        mtbColtClone.setMtbColr(new ObservableArrayList<>());
+
+        UpdateTipoULRequestDTO updateTipoULRequest = new UpdateTipoULRequestDTO()
+                .setMtbColt(mtbColtClone)
+                .setCodTcol(codTcol);
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService
+                .updateTipoUL(updateTipoULRequest)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "updateTipoUL", mtbColts -> {
+                            onComplete.run();
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        if (onFailed != null) onFailed.run(new Exception(t));
+                    }
+                });
+
+    }
+
     public void updateDataFine(MtbColt mtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt cloneMtbColt = (MtbColt) mtbColt.clone();
@@ -517,14 +556,14 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
             colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new Callback<>() {
                 @Override
-                public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
                     analyzeAnswer(response, "spostaArtsTraUL", data -> {
                         onComplete.run();
                     }, onFailed);
                 }
 
                 @Override
-                public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
                     if (onFailed != null) onFailed.run(new Exception(t));
                 }
             });

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

@@ -7,6 +7,8 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CanULBeDeletedRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
@@ -31,11 +33,14 @@ public interface ColliMagazzinoRESTConsumerService {
     @POST("creaRettificaCollo")
     Call<ServiceRESTResponse<MtbColr>> creaRettificaCollo(@Query("codMdep") String codMdep, @Body RettificaULDTO rettificaULDTO);
 
-    @POST("wms/spostaULInPosizione")
-    Call<ServiceRESTResponse<Object>> spostaULInPosizione(@Query("codMdep") String codMdep, @Query("posizione") String posizione, @Body MtbColt mtbColtToMove);
+    @POST("wms/updateTipoUL")
+    Call<ServiceRESTResponse<Void>> updateTipoUL(@Body UpdateTipoULRequestDTO requestDto);
+
+    @POST("wms/spostaUL")
+    Call<ServiceRESTResponse<Void>> spostaUL(@Body SpostaULRequestDTO requestDto);
 
     @POST("wms/spostaArtsTraUL")
-    Call<ServiceRESTResponse<Object>> spostaArtsTraUL(@Body SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO);
+    Call<ServiceRESTResponse<Void>> spostaArtsTraUL(@Body SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO);
 
     @POST("wms/assegnaLottoSuColloScarico")
     Call<ServiceRESTResponse<MtbColt>> assegnaLottoSuColloScarico(@Body MtbColt mtbColt);

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

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -13,6 +15,8 @@ import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
@@ -113,4 +117,21 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
 
     }
 
+    public void duplicateUDS(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+
+        colliSpedizioneRESTConsumerService.duplicateUDS(duplicateUDSRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Response<ServiceRESTResponse<DuplicateUDSResponseDTO>> response) {
+                        analyzeAnswer(response, "spedizione/duplicateUDS", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception());
+                    }
+                });
+    }
+
 }

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

@@ -6,6 +6,8 @@ import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
@@ -35,4 +37,7 @@ public interface ColliSpedizioneRESTConsumerService {
     @POST("wms/spedizione/deleteUDSRow")
     Call<ServiceRESTResponse<Void>> deleteUDSRow(@Body DeleteUDSRowRequestDTO deleteUDSRowRequestDTO);
 
+    @POST("wms/spedizione/duplicateUDS")
+    Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> duplicateUDS(@Body DuplicateUDSRequestDTO duplicateUDSRequestDTO);
+
 }

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

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.annotation.NonNull;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -18,7 +19,7 @@ import retrofit2.Response;
 
 @Singleton
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
-    
+
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
         DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
@@ -50,8 +51,21 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void checkDocument(String fornitore, String numDoc, String dataDoc, String tipoDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+        var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        inventarioRESTConsumerService.checkDocument(fornitore, numDoc,tipoDoc, dataDoc)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "checkDocument", onComplete, onFailed);
+                    }
 
-
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 
     public void loadDocumentAvailableArts(String codDtip, String codMgrp, String codAnagForn, RunnableArgs<RetrieveDocumentoArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.DtbDoct;
@@ -20,8 +21,12 @@ public interface DocumentiRESTConsumerService {
     @POST("createDocFromColli")
     Call<ServiceRESTResponse<DtbDoct>> createDocFromColli(@Body LoadColliDTO listColli);
 
-
-
+    @GET("wms/documento/checkDoc")
+    Call<ServiceRESTResponse<Boolean>> checkDocument(
+            @Query("fornitore") String fornitore,
+            @Query("numDoc") String numDoc,
+            @Query("tipoDoc") String tipoDoc,
+            @Query("dataDoc") String dataDoc);
 
     @GET("wms/documento/arts")
     Call<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> retrieveArts(

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
@@ -7,6 +8,8 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.mapper.MtbTcolMapper;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
@@ -24,18 +27,20 @@ public class ImballiRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public List<MtbTCol> retrieveTipiColloSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
+    public List<ObservableMtbTcol> retrieveImballiSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
         ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
-        Response<ServiceRESTResponse<List<MtbTCol>>> response = service.retrieveTipiCollo(tipoImballo)
+        Response<ServiceRESTResponse<List<MtbTCol>>> response = service.retrieveImballi(tipoImballo)
                 .execute();
 
-        return analyzeAnswer(response, "retrieveTipiCollo");
+        List<MtbTCol> retrieveTipiCollo = analyzeAnswer(response, "retrieveTipiCollo");
+        retrieveTipiCollo = retrieveTipiCollo == null ? new ArrayList<>() : retrieveTipiCollo;
+        return MtbTcolMapper.fromDTOList(retrieveTipiCollo);
     }
 
-    public void retrieveTipiCollo(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveImballi(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs<List<ObservableMtbTcol>> onComplete, RunnableArgs<Exception> onFailed) {
         executorService.execute(() -> {
             try {
-                var response = retrieveTipiColloSyncronized(tipoImballo);
+                var response = retrieveImballiSyncronized(tipoImballo);
                 if (onComplete != null) onComplete.run(response);
             } catch (Exception ex) {
                 if (onFailed != null) onFailed.run(ex);

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

@@ -16,7 +16,7 @@ public interface ImballiRESTConsumerService {
 
 
     @GET("wms/imballi/retrieve/{tipo}")
-    Call<ServiceRESTResponse<List<MtbTCol>>> retrieveTipiCollo(@Path("tipo") MtbTCol.FlagUiUlEnum tipo);
+    Call<ServiceRESTResponse<List<MtbTCol>>> retrieveImballi(@Path("tipo") MtbTCol.FlagUiUlEnum tipo);
 
     @POST("wms/imballi/registraCarico")
     Call<ServiceRESTResponse<Void>> registraCarico(@Body RegistraCaricoImballiRequestDTO registraCaricoImballiRequest);

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

@@ -1,13 +1,19 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -59,4 +65,20 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
             }
         });
     }
+
+    public void retrieveAllPartitaMag(List<String> codMarts, Date dataScad, RunnableArgs<List<MtbPartitaMag>> onComplete, RunnableArgs<Exception> onFailed) {
+        MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
+        service.retrieveAllPartitaMag(codMarts, UtilityDate.formatDate(dataScad, UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<List<MtbPartitaMag>>> call, @NonNull Response<ServiceRESTResponse<List<MtbPartitaMag>>> response) {
+                        analyzeAnswer(response, "retrieveAllPartitaMag", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<MtbPartitaMag>>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }

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

@@ -3,14 +3,12 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
-import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface MagazzinoRESTConsumerService {
@@ -22,6 +20,7 @@ public interface MagazzinoRESTConsumerService {
     Call<ServiceRESTResponse<MtbPartitaMag>> retrievePartitaMag(@Query("codMart") String codMart,
                                                                 @Query("partitaMag") String partitaMag);
 
-
-
+    @POST("wms/partita-magazzino/retrieveAllPartitaMag")
+    Call<ServiceRESTResponse<List<MtbPartitaMag>>> retrieveAllPartitaMag(@Body List<String> codMarts,
+                                                                         @Query("dataScad") String dataScad);
 }

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

@@ -17,7 +17,6 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.core.utility.UtilityThread;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.OrdineDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
@@ -42,17 +41,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
-                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
-                                onSuccess.run(articoliOrdineWrapper);
-                            }, false);
+                            Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
+                            onSuccess.run(articoliOrdineWrapper);
                         }, onFailed);
                     }
 
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        Log.e("getArticoliListino_pv", t.toString());
-                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -66,17 +61,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Response<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
-                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
-                                onSuccess.run(articoliOrdineWrapper);
-                            }, false);
+                            Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
+                            onSuccess.run(articoliOrdineWrapper);
                         }, onFailed);
                     }
 
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<OrdiniAcquistoGrigliaDTO>> call, Throwable t) {
-                        Log.e("getArticoliListino_pv", t.toString());
-                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -105,7 +96,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         var startTime = new Date().getTime();
                         analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> {
-                            UtilityThread.executeParallel(() -> {
+//                            UtilityThread.executeParallel(() -> {
 //                                if (data == null) {
 //                                    onFailed.run(new Exception("Nessun ordine generato"));
 //                                    return;
@@ -117,7 +108,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 //                                ordine.setCodMdep(data.getCodMdep());
 //                                ordine.setNumOrd(data.getNumOrd());
                                 onSuccess.run(ordine);
-                            }, false);
+//                            }, false);
                         }, onFailed);
                     }
 

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

@@ -4,9 +4,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonParseException;
 import com.orhanobut.logger.Logger;
 
 import java.io.ByteArrayInputStream;
@@ -15,7 +12,6 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
 import java.net.ConnectException;
-import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -29,9 +25,9 @@ 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;
+import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
 import it.integry.integrywmsnative.core.rest.model.system.RegisterDeviceRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityGson;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
@@ -42,6 +38,23 @@ import retrofit2.Response;
 public class SystemRESTConsumer extends _BaseRESTConsumer {
 
 
+    public void retrieveUpdatesInfo(final RunnableArgs<LatestAppVersionInfoDTO> onSuccess, final RunnableArgs<Exception> onFailed) {
+        SystemRESTConsumerService systemRESTConsumerService = RESTBuilder.getService(SystemRESTConsumerService.class);
+        systemRESTConsumerService.retrieveUpdatesInfo()
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<LatestAppVersionInfoDTO> call, Response<LatestAppVersionInfoDTO> response) {
+                        analyzeAnswerGeneric(response, "updates", onSuccess, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<LatestAppVersionInfoDTO> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+
     public void registerDevice(final Runnable onSuccess, final RunnableArgs<Exception> onFailed) {
         RegisterDeviceRequestDTO registerDeviceRequestDTO = new RegisterDeviceRequestDTO()
                 .setApp("WMS");

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

@@ -6,6 +6,7 @@ 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;
+import it.integry.integrywmsnative.core.rest.model.system.LatestAppVersionInfoDTO;
 import it.integry.integrywmsnative.core.rest.model.system.RegisterDeviceRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -15,6 +16,9 @@ import retrofit2.http.Query;
 
 public interface SystemRESTConsumerService {
 
+    @GET("wms/currentVersion")
+    Call<LatestAppVersionInfoDTO> retrieveUpdatesInfo();
+
     @POST("device/register")
     Call<ServiceRESTResponse<Void>> registerDevice(@Body RegisterDeviceRequestDTO registerDeviceRequestDTO);
 

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

@@ -15,6 +15,32 @@ import retrofit2.Response;
 
 public abstract class _BaseRESTConsumer {
 
+
+    public static <T> void analyzeAnswerGeneric(Response<T> response, String logTitle, RunnableArgs<T> onComplete, RunnableArgs<Exception> onFailed) {
+        try {
+            var data = analyzeAnswerGeneric(response, logTitle);
+            onComplete.run(data);
+        } catch (Exception e) {
+            onFailed.run(e);
+        }
+    }
+
+    public static <T> T analyzeAnswerGeneric(Response<T> response, String logTitle) throws Exception {
+        if (response.isSuccessful()) {
+            return response.body();
+        } else {
+            if (response.code() == 404) {
+                Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url() + ")");
+                throw new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")");
+            } else if (response.code() == 550)
+                throw new InvalidLicenseException();
+            else {
+                Log.e(logTitle, "Status " + response.code() + ": " + response.message());
+                throw new Exception("Status " + response.code() + ": " + response.message());
+            }
+        }
+    }
+
     public static <T> T analyzeAnswer(Response<ServiceRESTResponse<T>> response, String logTitle) throws Exception {
         if (response.isSuccessful()) {
             if (response.body() != null) {

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

@@ -0,0 +1,61 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class SpostaULRequestDTO {
+
+    private String codMdep;
+    private String posizione;
+    private String annotazioni;
+    private boolean createDocAutomatically = true;
+    private List<MtbColt> mtbColtsToMove = new ArrayList<>();
+
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public SpostaULRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public SpostaULRequestDTO setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
+    public String getAnnotazioni() {
+        return annotazioni;
+    }
+
+    public SpostaULRequestDTO setAnnotazioni(String annotazioni) {
+        this.annotazioni = annotazioni;
+        return this;
+    }
+
+    public boolean isCreateDocAutomatically() {
+        return createDocAutomatically;
+    }
+
+    public SpostaULRequestDTO setCreateDocAutomatically(boolean createDocAutomatically) {
+        this.createDocAutomatically = createDocAutomatically;
+        return this;
+    }
+
+    public List<MtbColt> getMtbColtsToMove() {
+        return mtbColtsToMove;
+    }
+
+    public SpostaULRequestDTO setMtbColtsToMove(List<MtbColt> mtbColtsToMove) {
+        this.mtbColtsToMove = mtbColtsToMove;
+        return this;
+    }
+}

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

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class UpdateTipoULRequestDTO {
+
+    private MtbColt mtbColt;
+    private String codTcol;
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public UpdateTipoULRequestDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+
+    public String getCodTcol() {
+        return codTcol;
+    }
+
+    public UpdateTipoULRequestDTO setCodTcol(String codTcol) {
+        this.codTcol = codTcol;
+        return this;
+    }
+}

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

@@ -0,0 +1,257 @@
+package it.integry.integrywmsnative.core.rest.model.articolo;
+
+import java.math.BigDecimal;
+
+public class ArticoloDTO {
+
+    private String codMart;
+    private String descrizione;
+    private String untMis;
+    private String barcode;
+    private BigDecimal qtaCnf;
+    private String codAliq;
+    private String articoloComposto;
+    private String descrizioneEstesa;
+    private String note;
+    private String posizione;
+    private String codMgrp;
+    private String codMsfa;
+    private String codMsgr;
+    private String codMstp;
+    private String codMtip;
+    private boolean flagStato;
+    private String barcodeImballo;
+    private String diacod;
+    private boolean flagQtaCnfFissa;
+    private String idArtEqui;
+    private boolean flagKit;
+    private String precode;
+    private String gruppo;
+    private String sottoGruppo;
+    private String sottoFamiglia;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public ArticoloDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public ArticoloDTO setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public ArticoloDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public ArticoloDTO setBarcode(String barcode) {
+        this.barcode = barcode;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public ArticoloDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public String getCodAliq() {
+        return codAliq;
+    }
+
+    public ArticoloDTO setCodAliq(String codAliq) {
+        this.codAliq = codAliq;
+        return this;
+    }
+
+    public String getArticoloComposto() {
+        return articoloComposto;
+    }
+
+    public ArticoloDTO setArticoloComposto(String articoloComposto) {
+        this.articoloComposto = articoloComposto;
+        return this;
+    }
+
+    public String getDescrizioneEstesa() {
+        return descrizioneEstesa;
+    }
+
+    public ArticoloDTO setDescrizioneEstesa(String descrizioneEstesa) {
+        this.descrizioneEstesa = descrizioneEstesa;
+        return this;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public ArticoloDTO setNote(String note) {
+        this.note = note;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public ArticoloDTO setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public ArticoloDTO setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+        return this;
+    }
+
+    public String getCodMsfa() {
+        return codMsfa;
+    }
+
+    public ArticoloDTO setCodMsfa(String codMsfa) {
+        this.codMsfa = codMsfa;
+        return this;
+    }
+
+    public String getCodMsgr() {
+        return codMsgr;
+    }
+
+    public ArticoloDTO setCodMsgr(String codMsgr) {
+        this.codMsgr = codMsgr;
+        return this;
+    }
+
+    public String getCodMstp() {
+        return codMstp;
+    }
+
+    public ArticoloDTO setCodMstp(String codMstp) {
+        this.codMstp = codMstp;
+        return this;
+    }
+
+    public String getCodMtip() {
+        return codMtip;
+    }
+
+    public ArticoloDTO setCodMtip(String codMtip) {
+        this.codMtip = codMtip;
+        return this;
+    }
+
+    public boolean isFlagStato() {
+        return flagStato;
+    }
+
+    public ArticoloDTO setFlagStato(boolean flagStato) {
+        this.flagStato = flagStato;
+        return this;
+    }
+
+    public String getBarcodeImballo() {
+        return barcodeImballo;
+    }
+
+    public ArticoloDTO setBarcodeImballo(String barcodeImballo) {
+        this.barcodeImballo = barcodeImballo;
+        return this;
+    }
+
+    public String getDiacod() {
+        return diacod;
+    }
+
+    public ArticoloDTO setDiacod(String diacod) {
+        this.diacod = diacod;
+        return this;
+    }
+
+    public boolean isFlagQtaCnfFissa() {
+        return flagQtaCnfFissa;
+    }
+
+    public ArticoloDTO setFlagQtaCnfFissa(boolean flagQtaCnfFissa) {
+        this.flagQtaCnfFissa = flagQtaCnfFissa;
+        return this;
+    }
+
+    public String getIdArtEqui() {
+        return idArtEqui;
+    }
+
+    public ArticoloDTO setIdArtEqui(String idArtEqui) {
+        this.idArtEqui = idArtEqui;
+        return this;
+    }
+
+    public boolean isFlagKit() {
+        return flagKit;
+    }
+
+    public ArticoloDTO setFlagKit(boolean flagKit) {
+        this.flagKit = flagKit;
+        return this;
+    }
+
+    public String getPrecode() {
+        return precode;
+    }
+
+    public ArticoloDTO setPrecode(String precode) {
+        this.precode = precode;
+        return this;
+    }
+
+    public String getGruppo() {
+        return gruppo;
+    }
+
+    public ArticoloDTO setGruppo(String gruppo) {
+        this.gruppo = gruppo;
+        return this;
+    }
+
+    public String getSottoGruppo() {
+        return sottoGruppo;
+    }
+
+    public ArticoloDTO setSottoGruppo(String sottoGruppo) {
+        this.sottoGruppo = sottoGruppo;
+        return this;
+    }
+
+    public String getSottoFamiglia() {
+        return sottoFamiglia;
+    }
+
+    public ArticoloDTO setSottoFamiglia(String sottoFamiglia) {
+        this.sottoFamiglia = sottoFamiglia;
+        return this;
+    }
+}

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

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.rest.model.articolo;
+
+public class SaveArticoloRequestDTO {
+    private ArticoloDTO artToSave;
+
+    public ArticoloDTO getArtToSave() {
+        return artToSave;
+    }
+
+    public SaveArticoloRequestDTO setArtToSave(ArticoloDTO artToSave) {
+        this.artToSave = artToSave;
+        return this;
+    }
+}

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

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.rest.model.articolo;
+
+public class SaveArticoloResponseDTO {
+    private String codMart;
+
+    public String getCodMart() {
+        return codMart;
+    }
+}

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

@@ -0,0 +1,44 @@
+package it.integry.integrywmsnative.core.rest.model.system;
+
+public class LatestAppVersionInfoDTO {
+    private String latestVersion;
+    private int latestVersionCode;
+    private String url;
+    private boolean forced;
+
+    public String getLatestVersion() {
+        return latestVersion;
+    }
+
+    public LatestAppVersionInfoDTO setLatestVersion(String latestVersion) {
+        this.latestVersion = latestVersion;
+        return this;
+    }
+
+    public int getLatestVersionCode() {
+        return latestVersionCode;
+    }
+
+    public LatestAppVersionInfoDTO setLatestVersionCode(int latestVersionCode) {
+        this.latestVersionCode = latestVersionCode;
+        return this;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public LatestAppVersionInfoDTO setUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    public boolean isForced() {
+        return forced;
+    }
+
+    public LatestAppVersionInfoDTO setForced(boolean forced) {
+        this.forced = forced;
+        return this;
+    }
+}

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

@@ -0,0 +1,28 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class DuplicateUDSRequestDTO {
+
+    private MtbColt mtbColt;
+
+    private int numOfDuplicates;
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public DuplicateUDSRequestDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+
+    public int getNumOfDuplicates() {
+        return numOfDuplicates;
+    }
+
+    public DuplicateUDSRequestDTO setNumOfDuplicates(int numOfDuplicates) {
+        this.numOfDuplicates = numOfDuplicates;
+        return this;
+    }
+}

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

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class DuplicateUDSResponseDTO {
+
+    private List<MtbColt> mtbColtList;
+
+    public List<MtbColt> getMtbColtList() {
+        return mtbColtList;
+    }
+
+    public DuplicateUDSResponseDTO setMtbColtList(List<MtbColt> mtbColtList) {
+        this.mtbColtList = mtbColtList;
+        return this;
+    }
+}

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

@@ -1,11 +1,15 @@
 package it.integry.integrywmsnative.core.settings;
 
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.Azienda;
 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 {
@@ -16,6 +20,7 @@ public class DBSettingsModel {
 
     private Azienda datiAzienda = null;
     private List<InternalCodAnagsDTO> internalCodAnags = null;
+    private ObservableList<ObservableMtbTcol> internalImballi = new ObservableArrayList<>();
 
     private boolean enableCheckPartitaMagCheckPickingV;
     private boolean flagMultiClienteOrdV;
@@ -34,6 +39,7 @@ public class DBSettingsModel {
     private boolean flagSpedizioneCanSelectMultipleOrders;
     private List<String> notePerditaDocInterni = new ArrayList<>();
     private boolean flagSpedizioneUseQtaOrd;
+    private boolean flagSpedizioneUseColliPedana;
     private boolean flagOrdinaNuoviArticoliInGriglia;
     private boolean flagOrdinaArticoliOnScan;
     private boolean flagConsentiFuoriPianoLogistico;
@@ -75,9 +81,16 @@ public class DBSettingsModel {
     private boolean flagProduzioneShowInfo = false;
     private boolean flagAccettazioneBollaUseQtaOrd = true;
     private boolean flagWarningNewPartitaMag = false;
-
     private boolean flagTracciamentoImballiCaricoEnabled = false;
     private boolean flagTracciamentoImballiScaricoEnabled = false;
+    private boolean flagPickingLiberoEnableScanArt = false;
+    private boolean flagAskDuplicateUDSSpedizione = false;
+    private boolean suggestDataScad = false;
+    private boolean flagPositionChangeRequest = false;
+    private String docInterniRequestNumDoc;
+    private boolean flagEnableArtCreation;
+    private List<String> allowedCodMgrpForArtCreation;
+    private boolean flagAccettazioneGroupListForn = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -124,6 +137,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public ObservableList<ObservableMtbTcol> getInternalImballi() {
+        return internalImballi;
+    }
+
+    public DBSettingsModel setInternalImballi(ObservableList<ObservableMtbTcol> internalImballi) {
+        this.internalImballi = internalImballi;
+        return this;
+    }
+
     public List<AvailableCodMdepsDTO> getAvailableCodMdep() {
         return availableCodMdep;
     }
@@ -268,6 +290,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagSpedizioneUseColliPedana() {
+        return flagSpedizioneUseColliPedana;
+    }
+
+    public DBSettingsModel setFlagSpedizioneUseColliPedana(boolean flagSpedizioneUseColliPedana) {
+        this.flagSpedizioneUseColliPedana = flagSpedizioneUseColliPedana;
+        return this;
+    }
+
     public DBSettingsModel setFlagOrdinaNuoviArticoliInGriglia(boolean flagOrdinaNuoviArticoliInGriglia) {
         this.flagOrdinaNuoviArticoliInGriglia = flagOrdinaNuoviArticoliInGriglia;
         return this;
@@ -654,4 +685,75 @@ public class DBSettingsModel {
         this.flagTracciamentoImballiScaricoEnabled = flagTracciamentoImballiScaricoEnabled;
         return this;
     }
+
+    public boolean isFlagPickingLiberoEnableScanArt() {
+        return flagPickingLiberoEnableScanArt;
+    }
+
+    public DBSettingsModel setFlagPickingLiberoEnableScanArt(boolean flagPickingLiberoEnableScanArt) {
+        this.flagPickingLiberoEnableScanArt = flagPickingLiberoEnableScanArt;
+        return this;
+    }
+
+    public boolean isFlagAskDuplicateUDSSpedizione() {
+        return flagAskDuplicateUDSSpedizione;
+    }
+
+    public DBSettingsModel setFlagAskDuplicateUDSSpedizione(boolean flagAskDuplicateUDSSpedizione) {
+        this.flagAskDuplicateUDSSpedizione = flagAskDuplicateUDSSpedizione;
+        return this;
+    }
+
+    public boolean isSuggestDataScad() {
+        return suggestDataScad;
+    }
+
+    public DBSettingsModel setSuggestDataScad(boolean suggestDataScad) {
+        this.suggestDataScad = suggestDataScad;
+        return this;
+    }
+
+    public String getDocInterniRequestNumDoc() {
+        return docInterniRequestNumDoc;
+    }
+
+    public DBSettingsModel setDocInterniRequestNumDoc(String docInterniRequestNumDoc) {
+        this.docInterniRequestNumDoc = docInterniRequestNumDoc;
+        return this;
+    }
+
+    public List<String> getAllowedCodMgrpForArtCreation() {
+        return allowedCodMgrpForArtCreation;
+    }
+
+    public DBSettingsModel setAllowedCodMgrpForArtCreation(List<String> allowedCodMgrpForArtCreation) {
+        this.allowedCodMgrpForArtCreation = allowedCodMgrpForArtCreation;
+        return this;
+    }
+
+    public boolean isFlagEnableArtCreation() {
+        return flagEnableArtCreation;
+    }
+
+    public DBSettingsModel setFlagEnableArtCreation(boolean flagEnableArtCreation) {
+        this.flagEnableArtCreation = flagEnableArtCreation;
+        return this;
+    }
+
+    public boolean isFlagPositionChangeRequest() {
+        return flagPositionChangeRequest;
+    }
+
+    public DBSettingsModel setFlagPositionChangeRequest(boolean flagPositionChangeRequest) {
+        this.flagPositionChangeRequest = flagPositionChangeRequest;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneGroupListForn() {
+        return flagAccettazioneGroupListForn;
+    }
+
+    public void setFlagAccettazioneGroupListForn(boolean flagAccettazioneGroupListForn) {
+        this.flagAccettazioneGroupListForn = flagAccettazioneGroupListForn;
+    }
 }

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

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.settings;
 
 import android.content.Context;
 
+import androidx.databinding.ObservableArrayList;
+
 import com.google.firebase.perf.metrics.Trace;
 import com.google.gson.reflect.TypeToken;
 
@@ -16,9 +18,12 @@ 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.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer;
 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;
@@ -38,17 +43,20 @@ public class SettingsManager {
 
     private static Context mContext;
     private static SystemRESTConsumer mSystemRESTConsumer;
+    private static ImballiRESTConsumer mImballiRESTConsumer;
     private static AziendaRESTConsumer mAziendaRESTConsumer;
     private static GestSetupRESTConsumer mGestSetupRESTConsumer;
     private static PosizioniRESTConsumer mPosizioniRESTConsumer;
 
     public SettingsManager(Context context,
                            SystemRESTConsumer systemRESTConsumer,
+                           ImballiRESTConsumer imballiRESTConsumer,
                            AziendaRESTConsumer aziendaRESTConsumer,
                            GestSetupRESTConsumer gestSetupRESTConsumer,
                            PosizioniRESTConsumer posizioniRESTConsumer) {
         mContext = context;
         mSystemRESTConsumer = systemRESTConsumer;
+        mImballiRESTConsumer = imballiRESTConsumer;
         mAziendaRESTConsumer = aziendaRESTConsumer;
         mGestSetupRESTConsumer = gestSetupRESTConsumer;
         mPosizioniRESTConsumer = posizioniRESTConsumer;
@@ -124,12 +132,31 @@ public class SettingsManager {
                 loadGestSetupValues(() -> {
 
                     onProgress.run("dati azienda");
-                    loadDatiAzienda(tmpOnComplete, tmpOnFailed);
+                    loadDatiAzienda(() -> {
+
+                        loadTipiCollo(tmpOnComplete, tmpOnFailed);
+
+                    }, tmpOnFailed);
                 }, tmpOnFailed);
             }, tmpOnFailed);
         }, tmpOnFailed);
     }
 
+    private static void loadTipiCollo(Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UL, tipiColloUl -> {
+            mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UI, tipiColloUi -> {
+
+                var imballiList = new ObservableArrayList<ObservableMtbTcol>();
+                imballiList.addAll(tipiColloUi);
+                imballiList.addAll(tipiColloUl);
+
+                SettingsManager.iDB().setInternalImballi(imballiList);
+                onComplete.run();
+            }, onFailed);
+        }, onFailed);
+
+    }
+
     private static void loadDatiAzienda(Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         mAziendaRESTConsumer.retrieveAzienda(datiAzienda -> {
@@ -243,6 +270,11 @@ public class SettingsManager {
                 .setSection("ACCETTAZIONE")
                 .setKeySection("FLAG_AUTO_OPEN_NEW_UL")
                 .setSetter(dbSettingsModelIstance::setFlagCanAutoOpenNewULAccettazione));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE")
+                .setKeySection("FLAG_GROUP_LIST_FORN")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneGroupListForn));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE")
@@ -315,6 +347,11 @@ public class SettingsManager {
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_USE_QTA_ORD")
                 .setSetter(dbSettingsModelIstance::setFlagSpedizioneUseQtaOrd));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_USE_COLLI_PEDANA")
+                .setSetter(dbSettingsModelIstance::setFlagSpedizioneUseColliPedana));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Integer.class)
                 .setGestName("PICKING")
                 .setSection("SETUP")
@@ -388,6 +425,11 @@ public class SettingsManager {
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_ASK_INFO_AGGIUNTIVE")
                 .setSetter(dbSettingsModelIstance::setFlagAskInfoAggiuntiveSpedizione));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_ASK_DUPLICATE_UDS")
+                .setSetter(dbSettingsModelIstance::setFlagAskDuplicateUDSSpedizione));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -446,6 +488,12 @@ public class SettingsManager {
                 .setKeySection("GENERA_DOC")
                 .setSetter(dbSettingsModelIstance::setFlagGeneraDocumentoSpedizione)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("SUGGEST_DATA_SCAD")
+                .setSetter(dbSettingsModelIstance::setSuggestDataScad)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
@@ -518,6 +566,18 @@ public class SettingsManager {
                 .setKeySection("FLAG_WARNING_NEW_PARTITA_MAG")
                 .setSetter(dbSettingsModelIstance::setFlagWarningNewPartitaMag)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("ENABLE_SCAN_ART")
+                .setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt)
+                .setDefaultValue(true));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ENABLE_POSITION_CHANGE_REQUEST")
+                .setSetter(dbSettingsModelIstance::setFlagPositionChangeRequest)
+                .setDefaultValue(true));
 
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
@@ -535,6 +595,27 @@ public class SettingsManager {
                     dbSettingsModelIstance.setFlagTracciamentoImballiScaricoEnabled(!UtilityString.isNullOrEmpty(data));
                 }));
 
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("PVM")
+                .setSection("DOC_INTERNI")
+                .setKeySection("REQUEST_NUM_DOC")
+                .setSetter(dbSettingsModelIstance::setDocInterniRequestNumDoc));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ENABLE_ART_CREATION")
+                .setSetter(dbSettingsModelIstance::setFlagEnableArtCreation));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ENABLE_ART_CREATION_GRP_MERC")
+                .setSetter(data -> {
+                    if (data != null)
+                        dbSettingsModelIstance.setAllowedCodMgrpForArtCreation(Arrays.asList(data.split("\\|")));
+                }));
+
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
 

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

@@ -15,16 +15,19 @@ import java.io.File;
 
 import javax.inject.Singleton;
 
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.FileDownloader;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 @Singleton
 public class UpdatesManager {
 
+
     private AppCompatActivity mContext;
 
-    public void init(AppCompatActivity activityContext) {
+    public void init(AppCompatActivity activityContext, SystemRESTConsumer systemRESTConsumer) {
         this.mContext = activityContext;
 
         final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
@@ -34,15 +37,22 @@ public class UpdatesManager {
         final String currentDownloadUrl = baseEndpoint + "/ems-api/wms/android-release.apk";
 
 
-        AppUpdater appUpdater = new AppUpdater(mContext)
-                .setDisplay(Display.DIALOG)
-                .setUpdateFrom(UpdateFrom.JSON)
-                .setUpdateJSON(currentVersionUrl)
-                .setButtonDoNotShowAgain(null)
-                .setButtonUpdateClickListener((dialog, which) -> {
-                    installAPK(currentDownloadUrl);
-                });
-        appUpdater.start();
+        systemRESTConsumer.retrieveUpdatesInfo(latestData -> {
+
+            AppUpdater appUpdater = new AppUpdater(mContext)
+                    .setDisplay(Display.DIALOG)
+                    .setUpdateFrom(UpdateFrom.JSON)
+                    .setUpdateJSON(currentVersionUrl)
+                    .setButtonDoNotShowAgain(null)
+                    .setButtonUpdateClickListener((dialog, which) -> {
+                        installAPK(currentDownloadUrl);
+                    });
+
+            if(latestData.isForced())
+                appUpdater.setButtonDismiss(null);
+
+            appUpdater.start();
+        }, ex -> UtilityExceptions.defaultException(mContext, ex));
     }
 
 
@@ -67,6 +77,11 @@ public class UpdatesManager {
                     mContext.runOnUiThread(() -> {
                         progressDialogBuilder.dismiss();
 
+                        if (!destination.exists()) {
+                            UtilityExceptions.defaultException(mContext, new Exception("Errore durante il download dell'aggiornamento"));
+                            return;
+                        }
+
                         Uri fileLoc;
                         Intent intent;
 
@@ -93,7 +108,8 @@ public class UpdatesManager {
             try {
                 fileDownloader.download();
             } catch (Exception e) {
-                e.printStackTrace();
+                progressDialogBuilder.dismissAllowingStateLoss();
+                UtilityExceptions.defaultException(mContext, e);
             }
         }).start();
     }

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

@@ -61,6 +61,8 @@ public class FileDownloader {
             }
 
         } catch (Exception e) {
+            if(downloadFile != null && downloadFile.exists())
+                downloadFile.delete();
             throw e;
 
         } finally {

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

@@ -1,6 +1,12 @@
 package it.integry.integrywmsnative.core.utility;
 
+import android.graphics.Bitmap;
+import android.graphics.Color;
+
 import com.annimon.stream.Stream;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.common.BitMatrix;
 
 import java.util.Calendar;
 
@@ -109,12 +115,12 @@ public class UtilityBarcode {
     }
 
 
-    public static String convertITF14toEAN13(String barcodeITF14) {
+    public static String convertITF14toEAN13(String barcodeITF14) throws Exception {
         String barcodeEAN13 = null;
 
         if (barcodeITF14.length() == 14) {
             barcodeEAN13 = barcodeITF14.substring(1, barcodeITF14.length() - 1).trim();
-            barcodeEAN13 += getEAN13CheckDigit(barcodeEAN13);
+            barcodeEAN13 += calculateEAN13CheckDigit(barcodeEAN13);
         }
 
         return barcodeEAN13;
@@ -131,18 +137,69 @@ public class UtilityBarcode {
     }
 
 
-    private static String getEAN13CheckDigit(String ean) {
-
-        if (ean.length() != 12) {
-            UtilityLogger.error(new Exception("Please provide an input string of 12 chars. Current lenght: " + ean.length()));
-            return null;
+    public static boolean isValidEan13(String ean13) {
+        // Verifica che il codice sia lungo esattamente 13 cifre
+        if (ean13.length() != 13 || !ean13.matches("\\d+")) {
+            return false;
         }
-        long tot = 0;
 
-        for (int i = 0; i < 12; i++) {
-            tot = tot + (Long.parseLong(String.valueOf(ean.charAt(i))) * (i % 2 == 0 ? 1 : 3));
-        }
-        return tot % 10 == 0 ? "0" : "" + (10 - (tot % 10));
+        // Calcola il check digit dalle prime 12 cifre
+        int calculatedCheckDigit = calculateEAN13CheckDigit(ean13.substring(0, 12));
+        int providedCheckDigit = Character.getNumericValue(ean13.charAt(12));
+
+        // Confronta il check digit calcolato con quello fornito
+        return calculatedCheckDigit == providedCheckDigit;
     }
 
+    private static int calculateEAN13CheckDigit(String ean12) {
+        int sum = 0;
+        for (int i = 0; i < ean12.length(); i++) {
+            int digit = Character.getNumericValue(ean12.charAt(i));
+            sum += (i % 2 == 0) ? digit : digit * 3;
+        }
+        return (10 - (sum % 10)) % 10;
+    }
+
+    public static Bitmap generateBarcodeImage(String barcode, int width, int height) throws Exception {
+        if(barcode == null) return null;
+
+        BarcodeType barcodeType;
+
+        if(barcode.length() == 8)
+            barcodeType = BarcodeType.EAN8;
+        else if(barcode.length() == 13)
+            barcodeType = BarcodeType.EAN13;
+        else if(barcode.length() == 14)
+            barcodeType = BarcodeType.INTERLEAVED_2OF5;
+        else throw new Exception("Barcode " + barcode + " non valido");
+
+        return generateBarcodeImage(barcode, barcodeType, width, height);
+    }
+
+    public static Bitmap generateBarcodeImage(String barcode, BarcodeType type, int width, int height) throws Exception {
+        // Genera la matrice del codice a barre
+        MultiFormatWriter writer = new MultiFormatWriter();
+
+        BarcodeFormat barcodeFormat = switch (type) {
+            case EAN8 -> BarcodeFormat.EAN_8;
+            case EAN13 -> BarcodeFormat.EAN_13;
+            case INTERLEAVED_2OF5 -> BarcodeFormat.ITF;
+            case CODE128 -> BarcodeFormat.CODE_128;
+            default -> throw new Exception("Barcode " + barcode + " non valido (tipo: " + type + ")");
+        };
+
+        BitMatrix bitMatrix = writer.encode(barcode, barcodeFormat, width, height);
+
+        // Crea un bitmap a partire dalla matrice
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                bitmap.setPixel(x, y, bitMatrix.get(x, y) ? Color.BLACK : Color.WHITE);
+            }
+        }
+
+        return bitmap;
+    }
+
+
 }

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

@@ -63,6 +63,8 @@ public class UtilityExceptions {
         if (!BuildConfig.DEBUG && !toIgnore) {
             if (sendEmail) UtilityLogger.error(ex);
             FirebaseCrashlytics.getInstance().recordException(ex);
+        } else {
+            ex.printStackTrace();
         }
     }
 

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

@@ -1,9 +1,16 @@
 package it.integry.integrywmsnative.core.utility;
 
 import androidx.databinding.Observable;
+import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
+import androidx.databinding.ObservableList;
 
+import java.util.stream.Collectors;
+
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgsWithReturn;
 
 public class UtilityObservable {
 
@@ -16,4 +23,36 @@ public class UtilityObservable {
         });
     }
 
+    public static <T, R> ObservableField<R> convertObservable(ObservableField<T> observableField, RunnableArgsWithReturn<T, R> dataConverter) {
+        ObservableField<R> returnObservable = new ObservableField<>();
+
+        observableField.addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                returnObservable.set(dataConverter.run(observableField.get()));
+            }
+        });
+
+        returnObservable.set(dataConverter.run(observableField.get()));
+
+        return returnObservable;
+    }
+
+    public static <T, R> ObservableArrayList<R> convertObservableArrayList(ObservableArrayList<T> observableField, RunnableArgsWithReturn<T, R> dataConverter) {
+        ObservableArrayList<R> returnObservable = new ObservableArrayList<>();
+
+        observableField.addOnListChangedCallback(new OnListGeneralChangedCallback<T>() {
+            @Override
+            public void onChanged(ObservableList<T> sender) {
+
+                returnObservable.clear();
+                returnObservable.addAll(sender.stream().map(dataConverter::run).collect(Collectors.toUnmodifiableList()));
+            }
+        });
+
+        returnObservable.addAll(observableField.stream().map(dataConverter::run).collect(Collectors.toUnmodifiableList()));
+
+        return returnObservable;
+    }
+
 }

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

@@ -25,6 +25,7 @@ import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.FragmentMainAccettazioneBollaBinding;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBollaAccettazioneDTO;
@@ -166,7 +167,7 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
 
         this.mBolleInevaseMutableData.clear();
 
-        if(tmpList != null)
+        if (tmpList != null)
             this.mBolleInevaseMutableData.addAll(convertDataModelToListModel(tmpList));
     }
 
@@ -182,33 +183,44 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
     }
 
 
-
-
-
     private List<MainAccettazioneBolleElencoListModel> convertDataModelToListModel(List<TestataBollaAccettazioneDTO> dataList) {
-        if(dataList == null)
-            return null;
+        boolean group = !SettingsManager.iDB().isFlagAccettazioneGroupListForn();
+        if (dataList == null) return null;
 
-        final Comparator<TestataBollaAccettazioneDTO> comparer = Comparator.comparing(TestataBollaAccettazioneDTO::getListino)
-                .thenComparing(TestataBollaAccettazioneDTO::getRagSoc)
-                .thenComparing(TestataBollaAccettazioneDTO::getNumDoc);
+        Stream<TestataBollaAccettazioneDTO> stream = Stream.of(dataList);
 
-        return Stream.of(dataList)
-                .sorted(comparer)
-                .map(x -> {
-                    MainAccettazioneBolleElencoListModel listModel = new MainAccettazioneBolleElencoListModel();
+        if (group) {
+            final Comparator<TestataBollaAccettazioneDTO> comparer = Comparator.comparing(TestataBollaAccettazioneDTO::getListino)
+                    .thenComparing(TestataBollaAccettazioneDTO::getRagSoc)
+                    .thenComparing(TestataBollaAccettazioneDTO::getNumDoc);
+            stream = stream.sorted(comparer);
+        } else {
+            stream = stream.sortBy(x -> x.getRagSoc() + UtilityDate.formatDate(x.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH));
+        }
 
-                    listModel.setOriginalModel(x);
-                    listModel.setGroupTitle(x.getListino() + " - " + x.getRagSoc());
-                    listModel.setDescription(String.format(getString(R.string.ord_acq_testata), x.getNumDoc(), UtilityDate.formatDate(x.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
+        return stream.map(x -> {
+            MainAccettazioneBolleElencoListModel listModel = new MainAccettazioneBolleElencoListModel();
+            listModel.setOriginalModel(x);
 
-                    listModel.setSubDescription(x.getDescrizioneListino());
-                    listModel.setRightDescription(x.getCodAnag());
-                    listModel.setRightSubDescription(x.getCodJcom());
+            if (group)
+                listModel.setGroupTitle(x.getListino() + " - " + x.getRagSoc());
+            else
+                listModel.setGroupTitle(x.getRagSoc());
 
-                    return listModel;
-                })
-                .toList();
+            listModel.setDescription(String.format(getString(R.string.ord_acq_testata),
+                    x.getNumDoc(),
+                    UtilityDate.formatDate(x.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
+
+            if (group)
+                listModel.setSubDescription(x.getDescrizioneListino());
+            else
+                listModel.setSubDescription(x.getListino() + " - " + x.getDescrizioneListino());
+
+            listModel.setRightDescription(x.getCodAnag());
+            listModel.setRightSubDescription(x.getCodJcom());
+
+            return listModel;
+        }).toList();
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java

@@ -22,6 +22,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -33,13 +35,14 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
@@ -54,11 +57,15 @@ import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBo
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.TestataBollaAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.AccettazioneBollaPickingOrderBy;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.filters.AccettazioneBollaPickingFilterViewModel;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui.AccettazioneBollaPickingListAdapter;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui.AccettazioneBollaPickingListModel;
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.filters.FilterDescrLayoutView;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView;
@@ -83,6 +90,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
+    private final AccettazioneBollaPickingFilterViewModel mAppliedFilterViewModel = new AccettazioneBollaPickingFilterViewModel();
 
     private final ObservableArrayList<AccettazioneBollaPickingListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
@@ -150,7 +158,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
-//        this.initFilters();
+        this.initFilters();
         this.initFab();
 
         boolean useQtaBolla = SettingsManager.iDB().isFlagAccettazioneBollaUseQtaOrd();
@@ -201,16 +209,85 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.mBindings.accettazionePickingList.setAdapter(adapter);
 
         this.mViewModel.getPickingList().observe(this, updatedData -> {
-//            mAppliedFilterViewModel.init(updatedData);
+            mAppliedFilterViewModel.init(updatedData);
 
             refreshList();
         });
 
+        adapter.setOnLongClickListener(clickedItem -> {
+            this.mViewModel.dispatchBollaRow(clickedItem, true);
+        });
+
         adapter.setOnItemClicked(clickedItem -> {
             this.mViewModel.dispatchBollaRow(clickedItem);
         });
     }
 
+    private void initFilters() {
+
+        var onPredicateChanged = new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                refreshList();
+            }
+        };
+
+        mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+
+        List<FilterChipDTO> filterList = Stream.of(AccettazioneBollaPickingBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
+
+        for (FilterChipDTO filterChipDTO : filterList) {
+
+            FilterChipView filterChipView = new FilterChipView(this, filterChipDTO.getFilterChipText(), v -> initBottomSheetDialogFilter(filterChipDTO));
+
+            if (filterChipDTO.getID() == AccettazioneBollaPickingBindings.DESCR_FILTER_ID) {
+                mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                    @Override
+                    public void run() {
+                        if (mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null) {
+                            mViewModel.resetMatchedRows();
+                            filterChipView.disableCloseIcon();
+
+                            mBindings.filterChipsGroup.removeView(filterChipView);
+                            mBindings.filterChipsGroup.addView(filterChipView);
+                            mBindings.filterChips.smoothScrollTo(0, 0);
+                        } else {
+                            filterChipView.enableCloseIcon();
+
+                            mBindings.filterChipsGroup.removeView(filterChipView);
+                            mBindings.filterChipsGroup.addView(filterChipView, 0);
+                            mBindings.filterChips.smoothScrollTo(0, 0);
+                        }
+                    }
+                });
+                filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentDescrPredicate().set(null));
+            }
+
+            this.mBindings.filterChipsGroup.addView(filterChipView);
+        }
+    }
+
+    private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
+
+        filterChipDTO.getFilterLayoutView().setFilterName(filterChipDTO.getFilterChipText()).setContext(this);
+
+        var filterLayoutView = filterChipDTO.getFilterLayoutView();
+
+        if (filterChipDTO.getID() == AccettazioneBollaPickingBindings.DESCR_FILTER_ID) {
+            ((FilterDescrLayoutView) filterLayoutView)
+                    .setAll(mAppliedFilterViewModel.getAllDescrs())
+                    .setAvailable(mAppliedFilterViewModel.getAvailableDescrs())
+                    .setOnFilterApplied(mAppliedFilterViewModel::setDescrFilter)
+                    .setPreselected(
+                            Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
+                                    .filter(mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null ? x -> false : Objects.requireNonNull(mAppliedFilterViewModel.getCurrentDescrPredicate().get()))
+                                    .map(x -> x.getMtbAart().getDescrizioneEstesa()).toList()
+                    );
+        }
+
+
+        if (!filterLayoutView.isAdded()) filterLayoutView.show(getSupportFragmentManager(), "TAG");
+    }
 
     private void initFab() {
         fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab,
@@ -246,13 +323,13 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         runOnUiThread(() -> {
             List<PickingObjectDTO> tmpList;
 
-//            if (mAppliedFilterViewModel != null) {
-//                mAppliedFilterViewModel.applyAllTests();
-//                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-//            } else {
-            tmpList = mViewModel.getPickingList().getValue();
-//            }
-//
+            if (mAppliedFilterViewModel != null) {
+                mAppliedFilterViewModel.applyAllTests();
+                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            } else {
+                tmpList = mViewModel.getPickingList().getValue();
+            }
+
             var list = convertDataModelToListModel(tmpList);
 
             this.mAccettazioneMutableData.clear();
@@ -387,6 +464,8 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                         .findFirstOrElse(null)
                         .isCanBeRecovered(),
 
+                false,
+
                 ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
 
         this.startActivityForResult(myIntent, PICK_UL_REQUEST);
@@ -467,6 +546,16 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.mViewModel.deleteRow(mtbColr);
     }
 
+    @Override
+    public void onRequestChangeMtbTcol(MtbColt mtbColt) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> {
+                    onLoadingStarted();
+                    mViewModel.updateTipoUl(mtbTcol, this::onLoadingEnded);
+                }, () -> {
+                })
+                .show(getSupportFragmentManager(), "dialog-note-aggiuntive");
+    }
+
     @Override
     public void onBottomSheetLUClose() {
         this.mViewModel.closeLU();
@@ -481,7 +570,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     }
 
     @Override
-    public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    public void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded)
                 .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingBindings.java

@@ -0,0 +1,22 @@
+package it.integry.integrywmsnative.gest.accettazione_bolla_picking;
+
+import java.util.HashMap;
+
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.filters.FilterDescrLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+
+public class AccettazioneBollaPickingBindings {
+
+    public static final int DESCR_FILTER_ID = 0;
+
+    public static final HashMap<Integer, FilterChipDTO> AVAILABLE_FILTERS = new HashMap<>() {
+        {
+
+            put(DESCR_FILTER_ID, new FilterChipDTO()
+                    .setID(DESCR_FILTER_ID)
+                    .setPosizione(1)
+                    .setFilterChipText("Descrizione articolo")
+                    .setFilterLayoutView(new FilterDescrLayoutView()));
+        }
+    };
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java

@@ -30,9 +30,9 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -409,7 +409,7 @@ public class AccettazioneBollaPickingViewModel {
         });
     }
 
-    private void manageInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    private void manageInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (!SettingsManager.iDB().isFlagAccettazioneBollaAskTipoCollo()) {
             onComplete.run(null, null);
             return;
@@ -443,7 +443,11 @@ public class AccettazioneBollaPickingViewModel {
         dispatchBollaRow(pickingObjectDTO);
     }
 
-    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO) {
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO){
+        dispatchBollaRow(pickingObjectDTO, false);
+    }
+
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO, boolean longClick) {
         if (this.mCurrentMtbColt == null) return;
 
         AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
@@ -540,10 +544,6 @@ public class AccettazioneBollaPickingViewModel {
             initialQtaCnf = qtaCnfDaPrelevare;
             initialQtaTot = qtaColDaPrelevare;
 
-        } else if (totalQtaDoc != null) {
-            initialNumCnf = totalNumCnfDoc;
-            initialQtaCnf = qtaCnfDoc;
-            initialQtaTot = totalQtaDoc;
         } else {
             initialNumCnf = BigDecimal.ONE;
             initialQtaCnf = mtbAart.getQtaCnf();
@@ -578,31 +578,42 @@ public class AccettazioneBollaPickingViewModel {
             }
         }
 
-        this.sendOnItemDispatched(
-                pickingObjectDTO,
-                pickingObjectDTO.getMtbAart(),
-                initialNumCnf, initialQtaCnf, initialQtaTot,
-                qtaDaEvadere,
-                numCnfDaEvadere,
-                qtaCnfDaEvadere,
-                qtaColDaPrelevare,
-                numCnfDaPrelevare,
-                qtaCnfDaPrelevare,
-                null,
-                null,
-                null,
-                partitaMag,
-                dataScad,
-                true,
-                (pickedQuantityDTO, shouldCloseLU) -> {
-                    this.saveNewRow(pickingObjectDTO,
-                            pickedQuantityDTO.getNumCnf(),
-                            pickedQuantityDTO.getQtaCnf(),
-                            pickedQuantityDTO.getQtaTot(),
-                            pickedQuantityDTO.getPartitaMag(),
-                            pickedQuantityDTO.getDataScad(),
-                            shouldCloseLU);
-                });
+        if (!longClick){
+            this.sendOnItemDispatched(
+                    pickingObjectDTO,
+                    pickingObjectDTO.getMtbAart(),
+                    initialNumCnf, initialQtaCnf, initialQtaTot,
+                    qtaDaEvadere,
+                    numCnfDaEvadere,
+                    qtaCnfDaEvadere,
+                    qtaColDaPrelevare,
+                    numCnfDaPrelevare,
+                    qtaCnfDaPrelevare,
+                    null,
+                    null,
+                    null,
+                    partitaMag,
+                    dataScad,
+                    true,
+                    (pickedQuantityDTO, shouldCloseLU) -> {
+                        this.saveNewRow(pickingObjectDTO,
+                                pickedQuantityDTO.getNumCnf(),
+                                pickedQuantityDTO.getQtaCnf(),
+                                pickedQuantityDTO.getQtaTot(),
+                                pickedQuantityDTO.getPartitaMag(),
+                                pickedQuantityDTO.getDataScad(),
+                                shouldCloseLU);
+                    });
+        } else {
+            this.saveNewRow(
+                    pickingObjectDTO,
+                    initialNumCnf,
+                    initialQtaCnf,
+                    initialQtaTot,
+                    partitaMag,
+                    dataScad,
+                    false);
+        }
 
     }
 
@@ -877,6 +888,13 @@ public class AccettazioneBollaPickingViewModel {
         this.mPickingList.postValue(this.mPickingList.getValue());
     }
 
+    public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> {
+            mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol());
+            onComplete.run();
+        }, this::sendError);
+    }
+
     private void addHistoryItem(@NonNull MtbColr mtbColr) {
         Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
                 .filter(x -> (x.getCodMart() != null && x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())) ||
@@ -924,7 +942,7 @@ public class AccettazioneBollaPickingViewModel {
         if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete);
     }
 
-    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete);
     }
 
@@ -1026,7 +1044,7 @@ public class AccettazioneBollaPickingViewModel {
 
         void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete);
 
-        void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete);
+        void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete);
 
         void onError(Exception ex);
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java

@@ -0,0 +1,75 @@
+package it.integry.integrywmsnative.gest.accettazione_bolla_picking.filters;
+
+import androidx.databinding.ObservableField;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+import com.annimon.stream.function.Predicate;
+
+import java.util.List;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO;
+
+public class AccettazioneBollaPickingFilterViewModel {
+    private final ObservableField<Predicate<PickingObjectDTO>> currentDescrPredicate = new ObservableField<>();
+
+    private List<PickingObjectDTO> initialOrderList;
+    private final MutableLiveData<List<PickingObjectDTO>> currentFilteredOrderList = new MutableLiveData<>();
+
+    public void init(List<PickingObjectDTO> initialList) {
+        this.initialOrderList = initialList;
+        this.currentFilteredOrderList.setValue(this.initialOrderList);
+    }
+
+    public MutableLiveData<List<PickingObjectDTO>> getMutableFilteredOrderList() {
+        return this.currentFilteredOrderList;
+    }
+
+
+    public void setDescrFilter(List<String> descrs) {
+        if (descrs == null || descrs.isEmpty()) currentDescrPredicate.set(null);
+        else {
+            currentDescrPredicate.set(o -> descrs.contains(o.getMtbAart().getDescrizione()));
+        }
+    }
+
+    public void applyAllTests() {
+
+        List<PickingObjectDTO> returnList;
+
+        if (currentDescrPredicate.get() == null) {
+            returnList = this.initialOrderList;
+        } else {
+            Stream<PickingObjectDTO> tmpStream = Stream.of(this.initialOrderList)
+                    .filter(x ->(currentDescrPredicate.get() == null || (currentDescrPredicate.get().test(x)))
+                    );
+
+            returnList = tmpStream.toList();
+        }
+
+        this.currentFilteredOrderList.setValue(returnList);
+    }
+
+    public ObservableField<Predicate<PickingObjectDTO>> getCurrentDescrPredicate() {
+        return currentDescrPredicate;
+    }
+
+    public List<String> getAllDescrs() {
+        return Stream
+                .of(Objects.requireNonNull(initialOrderList))
+                .filter(x -> x.getMtbAart().getDescrizioneEstesa() != null)
+                .sortBy(x -> x.getMtbAart().getDescrizioneEstesa())
+                .map(x -> x.getMtbAart().getDescrizioneEstesa() != null ? x.getMtbAart().getDescrizioneEstesa() : null)
+                .distinct()
+                .toList();
+    }
+
+    public List<String> getAvailableDescrs() {
+        return Stream.of(this.initialOrderList)
+                .map(x -> x.getMtbAart().getDescrizioneEstesa())
+                .distinct()
+                .toList();
+    }
+}

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

@@ -2,10 +2,12 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui;
 
 import android.content.Context;
 import android.graphics.Color;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.ObservableArrayList;
@@ -15,7 +17,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
@@ -33,6 +39,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
     private final List<AccettazioneBollaPickingListModel> mDataset = new ArrayList<>();
 
     private RunnableArgs<PickingObjectDTO> mOnItemClicked;
+    private RunnableArgs<PickingObjectDTO> mOnItemLongClicked;
 
     static class SubheaderHolder extends RecyclerView.ViewHolder {
 
@@ -61,10 +68,29 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         this.mShowSecondaryUntMis = showSecondaryUntMis;
 
         mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+            @RequiresApi(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
             @Override
             public void onChanged(ObservableList sender) {
+                List<AccettazioneBollaPickingListModel> listaOrdinata = new ArrayList<>();
+                if (!sender.isEmpty()) {
+                    listaOrdinata = new ArrayList<>(sender);
+
+                    Collections.sort(listaOrdinata, (a, b) -> {
+
+                        boolean condA = a.getQtaEvasa().subtract(a.getQtaTot()).floatValue() == 0;
+                        boolean condB = b.getQtaEvasa().subtract(b.getQtaTot()).floatValue() == 0;
+
+                        if (condA && !condB) {
+                            return -1;
+                        } else if (!condA && condB) {
+                            return 1;
+                        }
+                        return 0;
+                    });
+                }
+
                 mDataset.clear();
-                mDataset.addAll(sender);
+                mDataset.addAll(listaOrdinata);
                 notifyDataSetChanged();
                 notifyDataChanged();
             }
@@ -75,6 +101,9 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         this.mOnItemClicked = onItemClicked;
     }
 
+    public void setOnLongClickListener(RunnableArgs<PickingObjectDTO> onItemLongClicked){
+        this.mOnItemLongClicked = onItemLongClicked;
+    }
 
     @Override
     public AccettazioneBollaPickingListAdapter.SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
@@ -160,6 +189,12 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());
         });
+
+        holder.mBinding.getRoot().setOnLongClickListener(v -> {
+            if (this.mOnItemLongClicked != null)
+                this.mOnItemLongClicked.run(pickingObjectDTO.getOriginalModel());
+            return true;
+        });
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
 import android.view.Gravity;
 import android.view.Menu;
@@ -43,8 +44,8 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
@@ -713,6 +714,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         this.mViewModel.deleteRow(mtbColr);
     }
 
+    @Override
+    public void onRequestChangeMtbTcol(MtbColt mtbColt) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> {
+                    onLoadingStarted();
+                    mViewModel.updateTipoUl(mtbTcol, this::onLoadingEnded);
+                }, () -> {
+                })
+                .show(getSupportFragmentManager(), "dialog-note-aggiuntive");
+    }
+
     @Override
     public void onBottomSheetLUClose() {
         this.mViewModel.closeLU();
@@ -724,7 +735,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     }
 
     @Override
-    public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    public void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded).show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
 
@@ -741,6 +752,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         BarcodeManager.enable();
     }
 
+    @Override
+    public void onWarning(String warningText, Runnable action) {
+        this.runOnUiThread(() -> {
+            this.onLoadingEnded();
+            DialogSimpleMessageView
+                    .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
+                    .show(getSupportFragmentManager(), "tag");
+        });
+    }
+
     @Override
     public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, String customArtDescription, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO().setMtbAart(mtbAart).setInitialNumCnf(initialNumCnf).setInitialQtaCnf(initialQtaCnf).setInitialQtaTot(initialQtaTot).setTotalQtaOrd(totalQtaOrd).setTotalNumCnfOrd(totalNumCnfOrd).setQtaCnfOrd(qtaCnfOrd).setTotalQtaToBeTaken(totalQtaToBeTaken).setTotalNumCnfToBeTaken(totalNumCnfToBeTaken).setQtaCnfToBeTaken(qtaCnfToBeTaken).setTotalQtaAvailable(totalQtaAvailable).setTotalNumCnfAvailable(totalNumCnfAvailable).setQtaCnfAvailable(qtaCnfAvailable).setPartitaMag(partitaMag).setDataScad(dataScad).setCanPartitaMagBeChanged(canPartitaMagBeChanged).setCanLUBeClosed(true).setCanOverflowOrderQuantity(canOverflowQuantity).setCustomArtDescription(customArtDescription);

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

@@ -32,9 +32,9 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -247,8 +247,14 @@ public class AccettazioneOrdiniPickingViewModel {
         try {
             Ean128Model ean128Model = mEan128Service.decode(barcodeScanDTO);
 
-            //Nel caso trovo un SSCC lo aggiungo
-            this.processBarcodeNotOpenedLU(barcodeScanDTO, ean128Model.Sscc, onComplete);
+            mColliAccettazioneRESTConsumer.checkBarcodeUl(ean128Model.Sscc, result -> {
+                if (result){
+                    this.sendWarning("Barcode ul già registrato!", onComplete);
+                } else {
+                    //Nel caso trovo un SSCC lo aggiungo
+                    this.processBarcodeNotOpenedLU(barcodeScanDTO, ean128Model.Sscc, onComplete);
+                }
+            }, this::sendError);
 
         } catch (Exception e) {
             this.sendError(e);
@@ -550,7 +556,7 @@ public class AccettazioneOrdiniPickingViewModel {
 
         if (dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) {
             dataScad = UtilityDate.getNow();
-            dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita());
+            dataScad = dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita());
         }
 
         if (partitaMag == null && dataScad == null) {
@@ -872,6 +878,13 @@ public class AccettazioneOrdiniPickingViewModel {
         this.mPickingList.postValue(this.mPickingList.getValue());
     }
 
+    public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> {
+            mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol());
+            onComplete.run();
+        }, this::sendError);
+    }
+
     private void addHistoryItem(@NonNull MtbColr mtbColr) {
         Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
                 .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
@@ -925,7 +938,7 @@ public class AccettazioneOrdiniPickingViewModel {
         if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete);
     }
 
-    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
+    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete);
     }
 
@@ -933,6 +946,10 @@ public class AccettazioneOrdiniPickingViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    private void sendWarning(String warningText, Runnable action) {
+        if (this.mListener != null) mListener.onWarning(warningText, action);
+    }
+
     private void sendLUOpened(MtbColt mtbColt) {
         if (this.mListener != null) mListener.onLUOpened(mtbColt);
     }
@@ -1021,7 +1038,7 @@ public class AccettazioneOrdiniPickingViewModel {
 
         void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete);
 
-        void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete);
+        void onInfoAggiuntiveRequest(RunnableArgss<String, ObservableMtbTcol> onComplete);
 
         void onError(Exception ex);
 
@@ -1050,6 +1067,8 @@ public class AccettazioneOrdiniPickingViewModel {
 
         void onFilterPosizioneApplied(String posizioneToFilter);
 
+        void onWarning(String warningText, Runnable action);
+
         void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete);
 
     }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java

@@ -3,6 +3,8 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.SpannableString;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -37,6 +39,7 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniE
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListAdapter;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListModel;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class DocInterniFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, DocInterniViewModel.Listener {
 
@@ -120,10 +123,21 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
         this.openDocumentSelectionDialog();
     }
 
+    @Override
+    public void onWarning(String warningText, Runnable action) {
+        this.requireActivity().runOnUiThread(() -> {
+            this.onLoadingEnded();
+            DialogSimpleMessageView
+                    .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
+        });
+    }
+
     @Override
     public void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection) {
-        mViewModel.setSelectedDocDetails(selection);
-        mBinding.invalidateAll();
+        mViewModel.setSelectedDocDetails(selection, () -> {
+            mBinding.invalidateAll();
+        });
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
@@ -17,6 +18,8 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
@@ -76,6 +79,14 @@ public class DocInterniViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    private void sendWarning(String warningText, Runnable action) {
+        if (this.mListener != null) mListener.onWarning(warningText, action);
+    }
+
+    private void sendDocDetailsChanged(DialogSelectDocInfoResponseDTO selection){
+        if (this.mListener != null) mListener.onDocDetailsChanged(selection);
+    }
+
     public DocInterniViewModel setListeners(Listener listener) {
         this.mListener = listener;
         return this;
@@ -85,7 +96,7 @@ public class DocInterniViewModel {
         return mDocsList;
     }
 
-    public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection) {
+    public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection, Runnable action) {
         this.fornitore = selection.getFornitore();
         this.dtbTipi = selection.getTipoDoc();
 
@@ -94,10 +105,34 @@ public class DocInterniViewModel {
         this.numDoc = selection.getNumDoc() != null ? selection.getNumDoc().toString() : null;
         this.note = selection.getNote();
 
-        this.sendOnLoadingStarted();
-        fetchProducts(() -> {
-            fetchDocuments(this::sendOnLoadingEnded);
-        });
+        String codAnag = null;
+        if (fornitore != null){
+            codAnag = fornitore.getCodAnag();
+        }
+
+        String codDtip = null;
+        if (dtbTipi != null){
+            codDtip = dtbTipi.getCodDtip();
+        }
+
+        documentRESTConsumer.checkDocument(
+                codAnag,
+                numDoc,
+                UtilityDate.formatDate(dataDoc, "yyyy/MM/dd"),
+                codDtip,
+                data -> {
+                    if (!data) {
+                        this.sendWarning("Documento di riferimento non trovato!", this::init);
+                    } else {
+                        action.run();
+                        this.sendOnLoadingStarted();
+                        fetchProducts(() -> {
+                            fetchDocuments(this::sendOnLoadingEnded);
+                        });
+                    }
+                },
+                this::sendError
+        );
     }
 
     public void fetchProducts(Runnable onComplete) {
@@ -210,6 +245,8 @@ public class DocInterniViewModel {
 
         void onError(Exception ex);
 
+        void onWarning(String warningText, Runnable action);
+
         void onDocInterniSetupFetched(DocInterniSetupDTO docInterniSetupDTO);
 
         void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection);

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java

@@ -3,10 +3,14 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.exception.DocumentRequiredException;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.exception.FornitoreRequiredException;
@@ -33,9 +37,12 @@ public class DialogSelectDocInfoViewModel extends ViewModel {
     private final MutableLiveData<Boolean> noteRequired = new MutableLiveData<>(false);
 
     public DialogSelectDocInfoViewModel() {
+        String docInterniRequestNumDoc = SettingsManager.iDB().getDocInterniRequestNumDoc();
+        List<String> requestNumDocList = docInterniRequestNumDoc != null ? Arrays.asList(docInterniRequestNumDoc.split("\\|")) : new ArrayList<>();
+
         tipoDoc.observeForever(val -> fornitoreRequired.postValue(val != null && (val.getGestioneDoc().equals("T") || val.getGestioneDoc().equals("A") || (val.getGestioneDoc().equals("P") && !val.getGestione().equals("L")))));
 
-        tipoDoc.observeForever(val -> documentRequired.postValue(val != null && val.getGestioneDoc().equalsIgnoreCase("P") && !val.getGestione().equalsIgnoreCase("L")));
+        tipoDoc.observeForever(val -> documentRequired.postValue(val != null && (val.getGestioneDoc().equalsIgnoreCase("P") && !val.getGestione().equalsIgnoreCase("L")) || requestNumDocList.contains(Objects.requireNonNull(val).getCodDtip())));
 
         tipoDoc.observeForever(val -> noteRequired.postValue(val != null && val.getGestioneDoc().equals("P") && val.getGestione().equals("L")));
     }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
+
+import java.util.Date;
+
+public class RetrieveLottiDTO {
+
+    private String codProd;
+    private String partitaMag;
+    private Date dataScad;
+
+    public String getCodProd() {
+        return codProd;
+    }
+
+    public RetrieveLottiDTO setCodProd(String codProd) {
+        this.codProd = codProd;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public RetrieveLottiDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public Date getDataScad() {
+        return dataScad;
+    }
+
+    public RetrieveLottiDTO setDataScad(Date dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java

@@ -8,6 +8,7 @@ public class TipoDocDTO {
     private String gestioneDoc;
     private boolean flagChkTracciabilita;
     private boolean requireNote = false;
+    private boolean suggestLotti;
 
     public String getCodDtip() {
         return codDtip;
@@ -62,4 +63,13 @@ public class TipoDocDTO {
         this.flagChkTracciabilita = flagChkTracciabilita;
         return this;
     }
+
+    public boolean isSuggestLotti() {
+        return suggestLotti;
+    }
+
+    public TipoDocDTO setSuggestLotti(boolean suggestLotti) {
+        this.suggestLotti = suggestLotti;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java

@@ -42,6 +42,8 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDT
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipoDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsItemListModel;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsView;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiItemListModel;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti.DialogSelectLottiView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui.DocumentRowsListAdapter;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
@@ -302,6 +304,30 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                 .setFlagDig(isUntMisDig ? "S" : "N");
         mtbAart.setMtbUntMis(Collections.singletonList(mtbUntMis));
 
+        if (this.viewModel.getTipoDoc().isSuggestLotti()) {
+            this.viewModel.retrieveLotti(row.getCodMart(), lotti -> {
+                var dataSet =
+                        Stream.of(lotti)
+                                .map(x -> new DialogSelectLottiItemListModel<>()
+                                        .setPartitaMag(x.getPartitaMag())
+                                        .setDataScad(UtilityDate.toLocalDate(x.getDataScad()))
+                                        .setOriginalModel(x)
+                                )
+                                .toList();
+
+                DialogSelectLottiView.newInstance(dataSet, data -> {
+                    row.setPartitaMag(data.getPartitaMag());
+                    row.setDataScad(data.getDataScad());
+
+                    openInputQuantity(mtbAart, row, flagTracciabilita);
+                }, () -> {}).show(this.getSupportFragmentManager(), "dialogSelectLotti");;
+            });
+        } else {
+            openInputQuantity(mtbAart, row, flagTracciabilita);
+        }
+    }
+
+    private void openInputQuantity(MtbAart mtbAart, SqlMtbColr row, boolean flagTracciabilita) {
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
                 .setMtbAart(mtbAart)
                 .setInitialNumCnf(BigDecimal.valueOf(row.getNumCnf()))

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java

@@ -19,6 +19,7 @@ import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrDataSour
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.NoResultFromCodMartException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
@@ -32,6 +33,7 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dto.CheckFornitoreDTO
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ColloDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipoDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
@@ -126,7 +128,7 @@ public class DocInterniEditFormViewModel {
     }
 
     public void loadArticoloByCodMartOrBarcode(String codMart) {
-        if(productsList == null) {
+        if (productsList == null) {
             this.sendError(new NoResultFromCodMartException(codMart));
             return;
         }
@@ -372,6 +374,10 @@ public class DocInterniEditFormViewModel {
         }
     }
 
+    public void retrieveLotti(String codProd, RunnableArgs<List<RetrieveLottiDTO>> onComplete) {
+        docInterniRESTConsumer.retrieveLotti(codProd, onComplete, this::sendError);
+    }
+
     public void deleteRow(SqlMtbColr sqlMtbColr) {
         mtbColrRepository.delete(sqlMtbColr, this::fetchDocumentRows, this::sendError);
     }
@@ -397,6 +403,10 @@ public class DocInterniEditFormViewModel {
         return this;
     }
 
+    public TipoDocDTO getTipoDoc() {
+        return tipoDoc;
+    }
+
     public boolean isNotesMandatory() {
         return this.tipoDoc != null && this.tipoDoc.isRequireNote();
     }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogSelectLottiComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogSelectLottiComponent create();
+    }
+
+    void inject(DialogSelectLottiView dialogSelectLottiView);
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiItemListModel.java

@@ -0,0 +1,54 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import java.time.LocalDate;
+
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class DialogSelectLottiItemListModel<T> {
+
+    private String partitaMag;
+    private LocalDate dataScad;
+    private T originalModel;
+    private BindableBoolean checked = new BindableBoolean(false);
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public DialogSelectLottiItemListModel<T> setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public LocalDate getDataScad() {
+        return dataScad;
+    }
+
+    public String getDataScadText() {
+        return UtilityDate.formatDate(this.dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH);
+    }
+
+    public DialogSelectLottiItemListModel<T> setDataScad(LocalDate dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+
+    public T getOriginalModel() {
+        return originalModel;
+    }
+
+    public DialogSelectLottiItemListModel<T> setOriginalModel(T originalModel) {
+        this.originalModel = originalModel;
+        return this;
+    }
+
+    public BindableBoolean getChecked() {
+        return checked;
+    }
+
+    public DialogSelectLottiItemListModel<T> setChecked(BindableBoolean checked) {
+        this.checked = checked;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiModule.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogSelectLottiComponent.class)
+public class DialogSelectLottiModule {
+
+    @Provides
+    DialogSelectLottiViewModel providesDialogSelectLottiViewModel() {
+        return new DialogSelectLottiViewModel();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiView.java

@@ -0,0 +1,123 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.annimon.stream.Stream;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.BR;
+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.databinding.DialogSelectLottiBinding;
+import it.integry.integrywmsnative.databinding.DialogSelectLottiItemModelBinding;
+
+/**
+ * @noinspection rawtypes
+ */
+public class DialogSelectLottiView extends BaseDialogFragment {
+    @Inject
+    DialogSelectLottiViewModel mViewModel;
+
+    private DialogSelectLottiBinding mBindings;
+    private Context mContext;
+
+    private final List<DialogSelectLottiItemListModel<Object>> listLotti;
+    private final RunnableArgs<DialogSelectLottiItemListModel> onConfirm;
+    private final Runnable onAbort;
+
+    public static DialogSelectLottiView newInstance(List<DialogSelectLottiItemListModel<Object>> listLotti,
+                                                    RunnableArgs<DialogSelectLottiItemListModel> onConfirm,
+                                                    Runnable onAbort) {
+        return new DialogSelectLottiView(listLotti, onConfirm, onAbort);
+    }
+
+    private DialogSelectLottiView(List<DialogSelectLottiItemListModel<Object>> listLotti,
+                                  RunnableArgs<DialogSelectLottiItemListModel> onConfirm,
+                                  Runnable onAbort) {
+        super();
+
+        this.listLotti = listLotti;
+        this.onConfirm = onConfirm;
+        this.onAbort = onAbort;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogSelectLottiBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        MainApplication.appComponent
+                .dialogSelectLottiComponent()
+                .create()
+                .inject(this);
+
+        setCancelable(false);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setPositiveButton(R.string.confirm, (dialog, which) -> {
+                    final DialogSelectLottiItemListModel<Object> selectedItem = Stream.of(listLotti)
+                            .filter(x -> x.getChecked().get())
+                            .findFirstOrElse(null);
+                    if (selectedItem != null)
+                        this.onConfirm.run(selectedItem);
+                })
+                .setNegativeButton(R.string.abort, (dialog, which) -> {
+                    if (this.onAbort != null) this.onAbort.run();
+                })
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void onShow(DialogInterface dialogInterface) {
+        super.onShow(dialogInterface);
+
+        this.listLotti.get(0).getChecked().set(true);
+        this.initRecyclerView();
+    }
+
+    private void initRecyclerView() {
+        var itemType = new Type<DialogSelectLottiItemListModel, DialogSelectLottiItemModelBinding>(R.layout.dialog_select_lotti__item_model, BR.row);
+        itemType.areContentsTheSame(DialogSelectLottiItemListModel::equals);
+        itemType.onClick(x -> {
+            resetChecks();
+            x.getBinding().getRow().getChecked().set(true);
+
+            return null;
+        });
+
+        new LiveAdapter(listLotti)
+                .map(DialogSelectLottiItemListModel.class, itemType)
+                .into(this.mBindings.itemList);
+    }
+
+    private void resetChecks() {
+        for (var item : listLotti) {
+            item.getChecked().set(false);
+        }
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectLotti/DialogSelectLottiViewModel.java

@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectLotti;
+
+public class DialogSelectLottiViewModel {
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumer.java

@@ -1,5 +1,9 @@
 package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.exception.RestException;
@@ -9,6 +13,7 @@ import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -38,6 +43,21 @@ public class DocInterniRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void retrieveLotti(String codProd, RunnableArgs<List<RetrieveLottiDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        DocInterniRESTConsumerService service = RESTBuilder.getService(DocInterniRESTConsumerService.class);
+        service.retrieveLotti(codProd)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> call, @NonNull Response<ServiceRESTResponse<List<RetrieveLottiDTO>>> response) {
+                        analyzeAnswer(response, "retrieveLotti", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> call, @NonNull Throwable t) {
+                        onFailed.run(new RestException(t.getMessage()));
+                    }
+                });
+    }
 
     public void saveDoc(SaveDTO saveDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         magazzinoRESTConsumer.saveTerminalinoWMS(saveDTO, onComplete, onFailed);

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java

@@ -1,9 +1,14 @@
 package it.integry.integrywmsnative.gest.contab_doc_interni.rest;
 
+import java.util.List;
+
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.documento.RetrieveDocumentoArtsResponseDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.Query;
 
 
 public interface DocInterniRESTConsumerService {
@@ -11,4 +16,7 @@ public interface DocInterniRESTConsumerService {
     @GET("getDocInterniSetup")
     Call<ServiceRESTResponse<DocInterniSetupDTO>> getSetupDocInterni();
 
+    @GET("wms/documento/retrieveLotti")
+    Call<ServiceRESTResponse<List<RetrieveLottiDTO>>> retrieveLotti(
+            @Query("codProd") String codProd);
 }

app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java

@@ -88,6 +88,7 @@ public class ListaBancaliActivity extends BaseActivity implements ListaBancaliVi
                 .create()
                 .inject(this);
 
+        mViewModel.setListener(this);
 
         mCanRecoverUl = DataCache.retrieveItem(getIntent().getStringExtra(Key.CanRecoverUL));
         mReportName = DataCache.retrieveItem(getIntent().getStringExtra(Key.ReportName));

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

@@ -90,7 +90,7 @@ public class LoginViewModel {
         this.mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> {
             SettingsManager.iDB().setAvailableCodMdep(availableCodMdeps);
 
-            if (availableCodMdeps == null || availableCodMdeps.size() == 0) {
+            if (availableCodMdeps == null || availableCodMdeps.isEmpty()) {
                 this.sendError(new InvalidUserDepositException());
                 return;
             }

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

@@ -41,6 +41,7 @@ import it.integry.integrywmsnative.core.interfaces.ISearchableFragment;
 import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.menu.MenuService;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.core.utility.UtilityContext;
@@ -69,6 +70,9 @@ public class MainActivity extends BaseActivity
     @Inject
     UpdatesManager updatesManager;
 
+    @Inject
+    SystemRESTConsumer systemRESTConsumer;
+
     @Inject
     DialogProgressView mDialogProgressView;
 
@@ -85,7 +89,7 @@ public class MainActivity extends BaseActivity
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
-        updatesManager.init(this);
+        updatesManager.init(this, systemRESTConsumer);
         UtilityContext.initMainActivity(this);
 
         setSupportActionBar(mBinding.appBarMain.toolbar);

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

@@ -41,6 +41,7 @@ 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.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
@@ -51,6 +52,7 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.databinding.FragmentMainBinding;
 import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.switch_user_depo.DialogSwitchUserDepoView;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -153,6 +155,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         initSessionData();
 
         initRecuperoCollo();
+
+        mBindings.switchDepoButton.setVisibility(SettingsManager.iDB().getAvailableCodMdep().size() > 1 ? View.VISIBLE : View.GONE);
     }
 
     private void initSessionData() {
@@ -278,8 +282,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private void initGestMenu() {
         int menuSpanCount = 2;
-        if (UtilityDimension.getDisplayInchs(this.getActivity()) > 8) menuSpanCount = 4;
-        else if (UtilityDimension.getDisplayInchs(this.getActivity()) > 6.5) menuSpanCount = 3;
+        if (UtilityDimension.getDisplayInchs(this.requireActivity()) > 8) menuSpanCount = 4;
+        else if (UtilityDimension.getDisplayInchs(this.requireActivity()) > 6.5) menuSpanCount = 3;
 
         MenuConfiguration baseMenuConfiguration = new MenuConfiguration();
         List<MenuConfiguration.MenuGroup> menuGroups = baseMenuConfiguration.getGroups();
@@ -319,7 +323,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
 
             } catch (Exception exception) {
-                exception.printStackTrace();
+                UtilityExceptions.defaultException(requireActivity(), exception);
             }
         }
 
@@ -421,4 +425,14 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         colorFadeTitleTextColor.setDuration(animationTimeMillis);
         colorFadeTitleTextColor.start();
     }
+
+    public void changeUserDepo() {
+        DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableCodMdep(), this::onUserDepoChanged)
+                .show(getParentFragmentManager(), "switch-user-depo");
+    }
+
+    private void onUserDepoChanged(AvailableCodMdepsDTO newDepo) {
+        SettingsManager.i().getUserSession().setDepo(newDepo);
+        initSessionData();
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -60,7 +59,6 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterAutom
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterClienteLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterDepositoLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
-import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterPaeseLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterTermConsLayoutView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterVettoreLayoutView;
@@ -74,6 +72,7 @@ import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRo
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 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 it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, OrdiniUscitaElencoViewModel.Listener {
@@ -150,7 +149,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main_ordini_uscita, container, false);
+        mBindings = FragmentMainOrdiniUscitaBinding.inflate(inflater, container, false);
 
         MainApplication.appComponent
                 .prodOrdineLavorazioneElencoComponent()

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

@@ -14,6 +14,7 @@ import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
+import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException;
@@ -137,13 +138,15 @@ public class PickingLiberoViewModel {
             //Cerco tramite etichetta ean 128 (che può indicarmi una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
 
-        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
+        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO) && SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()) {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
 
-        } else {
+        } else if (SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()){
             //Cerco tramite ean13  un collo  in posizione mono ul definita in anagrafica articolo, altrimenti se abilitato procedo con picking manuale
             this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
+        } else {
+            this.sendError(new NoArtsFoundException());
         }
     }
 
@@ -269,18 +272,16 @@ public class PickingLiberoViewModel {
             if (!UtilityString.isNullOrEmpty(ean128Model.Content))
                 barcodeProd = ean128Model.Content;
 
-
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
 
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
-                } else if (!UtilityString.isNullOrEmpty(barcodeProd)) {
+                } else if (!UtilityString.isNullOrEmpty(barcodeProd) && SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()) {
                     this.loadArticolo(barcodeProd, ean128Model, onComplete);
                 } else {
                     this.sendError(new NoLUFoundException());
                 }
 
-
             } else {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
                 this.sendError(new NoLUFoundException());
@@ -326,11 +327,9 @@ public class PickingLiberoViewModel {
     private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, Runnable onComplete) {
         if (this.mFlagAskLineaProd) {
             this.sendLULineaProdRequired(response -> {
-                    createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
+                createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
 
-            }, () -> {
-                this.sendOnLoadingEnded();
-            });
+            }, this::sendOnLoadingEnded);
         } else {
             createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, null, onComplete);
         }

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

@@ -33,7 +33,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
@@ -50,11 +50,12 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGExcep
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
-import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUView;
 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;
 
 public class PickingResiActivity extends BaseActivity implements BottomSheetFragmentLUContentView.Listener, BottomSheetFragmentLUContentViewModel.Listener, PickingResiViewModel.Listener {
 
@@ -269,13 +270,23 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
         this.mViewmodel.deleteRow(mtbColr);
     }
 
+    @Override
+    public void onRequestChangeMtbTcol(MtbColt mtbColt) {
+        DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> {
+                    onLoadingStarted();
+                    mViewmodel.updateTipoUl(mtbTcol, this::onLoadingEnded);
+                }, () -> {
+                })
+                .show(getSupportFragmentManager(), "dialog-note-aggiuntive");
+    }
+
     @Override
     public void onBottomSheetLUClose() {
         this.mViewmodel.closeLU(true);
     }
 
     @Override
-    public void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
+    public void onInfoAggiuntiveRequired(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded)
                 .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
@@ -392,18 +403,22 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
     @Override
     public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
-        DialogAskShouldPrint.make(this, "Packing List", onComplete).show();
+        DialogYesNoView.newInstance(getString(R.string.action_print),
+                        String.format(getString(R.string.message_print_packing_list), "Packing List"),
+                        result -> {
+                            onComplete.run(result == DialogConsts.Results.YES);
+                        })
+                .show(getSupportFragmentManager(), "dialog-print");
     }
 
     @Override
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.onLoadingEnded();
-        DialogSimpleMessageView.makeErrorDialog(
-                new SpannableString(ex.getMessage()),
-                null,
-                null,
-                R.string.button_ignore_print,
-                onComplete)
+        DialogSimpleMessageView.makeErrorDialog(new SpannableString(ex.getMessage()),
+                        null,
+                        null,
+                        R.string.button_ignore_print,
+                        onComplete)
                 .show(getSupportFragmentManager(), "tag");
     }
 }

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

@@ -28,8 +28,8 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -716,6 +716,13 @@ public class PickingResiViewModel {
         });
     }
 
+    public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> {
+            mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol());
+            onComplete.run();
+        }, this::sendError);
+    }
+
     public void resetMatchedRows() {
         for (WithdrawableDtbDocr pickingObjectDTO : this.mPickingList.getValue()) {
             pickingObjectDTO
@@ -732,7 +739,7 @@ public class PickingResiViewModel {
         return mPickingList;
     }
 
-    private void sendOnInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
+    private void sendOnInfoAggiuntiveRequired(RunnableArgss<String, ObservableMtbTcol> onComplete) {
         if (this.mListener != null) this.mListener.onInfoAggiuntiveRequired(onComplete);
     }
 
@@ -808,9 +815,10 @@ public class PickingResiViewModel {
         return this;
     }
 
+
     public interface Listener extends ILUPrintListener, ILoadingListener, ILUBaseOperationsListener {
 
-        void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete);
+        void onInfoAggiuntiveRequired(RunnableArgss<String, ObservableMtbTcol> onComplete);
 
         void onError(Exception ex);
 

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

@@ -3,13 +3,12 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -93,14 +92,14 @@ public class ProdRecuperoMaterialeViewModel {
 
 
     private HistoryVersamentoProdULDTO getHistoryElementFromMtbColt(MtbColt mtbColt) {
-        List<HistoryVersamentoProdULDTO> filteredItems = Stream.of(this.mUlList.getValue())
+        List<HistoryVersamentoProdULDTO> filteredItems = this.mUlList.getValue().stream()
                 .filter(x -> Objects.equals(x.getNumColloRif(), mtbColt.getNumCollo()) &&
-                        x.getDataColloRif().equals(mtbColt.getDataColloS()) &&
+                        x.getDataColloRif().equals(mtbColt.getDataColloLD()) &&
                         x.getSerColloRif().equalsIgnoreCase(mtbColt.getSerCollo()) &&
                         x.getGestioneRif().equalsIgnoreCase(mtbColt.getGestione()))
-                .toList();
+                .collect(Collectors.toList());
 
-        if (filteredItems != null && filteredItems.size() > 0) {
+        if (!filteredItems.isEmpty()) {
             return filteredItems.get(0);
         }
 
@@ -196,6 +195,9 @@ public class ProdRecuperoMaterialeViewModel {
                 mtbColtScarico.getMtbColr().add(mtbColrScarico);
             }
         } else {
+
+
+
             BigDecimal qtaColToSave;
             BigDecimal numCnfToSave;
             if (SettingsManager.iDB().isFlagForceAllToColli() || (item.getMtbAart() != null && !item.getMtbAart().isFlagQtaCnfFissaBoolean())) {
@@ -267,7 +269,7 @@ public class ProdRecuperoMaterialeViewModel {
 
                 if (!Objects.equals(mtbColt.getNumCollo(), item.getNumColloRif()) ||
                         !Objects.equals(mtbColt.getSerCollo(), item.getSerColloRif()) ||
-                        !Objects.equals(mtbColt.getDataColloS(), item.getDataColloRif()) ||
+                        !Objects.equals(mtbColt.getDataColloLD(), item.getDataColloRif()) ||
                         !Objects.equals(mtbColt.getGestione(), item.getGestioneRif())) {
 
                     final MtbColt mtbColtCarico = mtbColt

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULDTO.java

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -11,7 +12,7 @@ import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 public class HistoryVersamentoProdULDTO {
 
     private String gestione;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String serCollo;
     private Integer numCollo;
     private String segno;
@@ -28,7 +29,7 @@ public class HistoryVersamentoProdULDTO {
     private String descrizioneArt;
     private String untMis;
     private String gestioneRif;
-    private String dataColloRif;
+    private LocalDate dataColloRif;
     private String serColloRif;
     private Integer numColloRif;
 
@@ -50,11 +51,11 @@ public class HistoryVersamentoProdULDTO {
         return this;
     }
 
-    public String getDataCollo() {
+    public LocalDate getDataCollo() {
         return dataCollo;
     }
 
-    public HistoryVersamentoProdULDTO setDataCollo(String dataCollo) {
+    public HistoryVersamentoProdULDTO setDataCollo(LocalDate dataCollo) {
         this.dataCollo = dataCollo;
         return this;
     }
@@ -203,11 +204,11 @@ public class HistoryVersamentoProdULDTO {
         return this;
     }
 
-    public String getDataColloRif() {
+    public LocalDate getDataColloRif() {
         return dataColloRif;
     }
 
-    public HistoryVersamentoProdULDTO setDataColloRif(String dataColloRif) {
+    public HistoryVersamentoProdULDTO setDataColloRif(LocalDate dataColloRif) {
         this.dataColloRif = dataColloRif;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdULRestDTO.java

@@ -1,16 +1,16 @@
 package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
-import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class HistoryVersamentoProdULRestDTO {
 
 
     private String gestione;
-    private String dataCollo;
+    private LocalDate dataCollo;
     private String serCollo;
     private Integer numCollo;
     private String segno;
@@ -27,7 +27,7 @@ public class HistoryVersamentoProdULRestDTO {
     private String descrizioneArt;
     private String untMis;
     private String gestioneRif;
-    private String dataColloRif;
+    private LocalDate dataColloRif;
     private String serColloRif;
     private Integer numColloRif;
 
@@ -55,11 +55,11 @@ public class HistoryVersamentoProdULRestDTO {
         return this;
     }
 
-    public String getDataCollo() {
+    public LocalDate getDataCollo() {
         return dataCollo;
     }
 
-    public HistoryVersamentoProdULRestDTO setDataCollo(String dataCollo) {
+    public HistoryVersamentoProdULRestDTO setDataCollo(LocalDate dataCollo) {
         this.dataCollo = dataCollo;
         return this;
     }
@@ -208,11 +208,11 @@ public class HistoryVersamentoProdULRestDTO {
         return this;
     }
 
-    public String getDataColloRif() {
+    public LocalDate getDataColloRif() {
         return dataColloRif;
     }
 
-    public HistoryVersamentoProdULRestDTO setDataColloRif(String dataColloRif) {
+    public HistoryVersamentoProdULRestDTO setDataColloRif(LocalDate dataColloRif) {
         this.dataColloRif = dataColloRif;
         return this;
     }