Finish v1.41.05(453)

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-09-13T09:26:42.884931500Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R52T60AZ93A" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

.idea/fileTemplates/Android Dialog.java

@@ -84,6 +84,11 @@ Create the following layout resource file [dialog_${dashName}.xml]
     
     private Dialog${NAME}View() {
         super();
+        
+        MainApplication.appComponent
+                .dialog${NAME}Component()
+                .create()
+                .inject(this);
     }
     
     
@@ -105,10 +110,6 @@ Create the following layout resource file [dialog_${dashName}.xml]
             [b] into interface body
             Dialog${NAME}Component.Factory dialog${NAME}Component();
         */
-        MainApplication.appComponent
-                .dialog${NAME}Component()
-                .create()
-                .inject(this);
                 
         setCancelable(false);
                 

.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.0" />
+    <option name="version" value="1.9.20" />
   </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

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 415
+    def appVersionCode = 453
-    def appVersionName = '1.39.02'
+    def appVersionName = '1.41.05'
 
     signingConfigs {
         release {
@@ -103,17 +103,16 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:29.1.0')
+    implementation platform('com.google.firebase:firebase-bom:32.8.1')
     implementation 'com.google.firebase:firebase-analytics'
-    implementation 'com.google.firebase:firebase-core'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.2.0'
+    implementation 'com.google.android.gms:play-services-basement:18.3.0'
 
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -128,7 +127,7 @@ 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.6.2'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
 //    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
 

app/src/main/AndroidManifest.xml

@@ -33,31 +33,25 @@
         android:requestLegacyExternalStorage="true">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.prod_dettaglio_linea.ProdDettaglioLineaActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.contab_doc_interni.edit_form.DocInterniEditFormActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.picking_resi.PickingResiActivity"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.main.MainActivity"
-            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing"
             android:exported="true">
             <intent-filter>
@@ -68,28 +62,23 @@
         </activity>
         <activity
             android:name=".gest.login.LoginActivity"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.accettazione_ordini_picking.AccettazioneOrdiniPickingActivity"
-            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustPan"
-            android:windowSoftInputMode="adjustNothing"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.lista_bancali.ListaBancaliActivity"
             android:label="@string/activity_lista_bancali_title"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.contenuto_bancale.ContenutoBancaleActivity"
             android:label="@string/activity_contenuto_bancale_title"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.inventario.picking.PickingInventarioActivity"
             android:label="@string/activity_picking_inventario_title"
             android:windowSoftInputMode="adjustNothing"
-            android:theme="@style/Light"
             android:configChanges="orientation|screenSize|keyboardHidden"/>
 
         <meta-data
@@ -110,8 +99,7 @@
 
         <activity
             android:name=".gest.accettazione_bolla_picking.AccettazioneBollaPickingActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:theme="@style/Light" />
 
         <provider
             android:name=".core.update.GenericFileProvider"

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

@@ -19,6 +19,8 @@ import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.MainAccettazi
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.MainAccettazioneOrdiniElencoModule;
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.AccettazioneOrdiniPickingComponent;
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.AccettazioneOrdiniPickingModule;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaComponent;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoComponent;
@@ -27,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;
@@ -112,6 +116,8 @@ import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaPro
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdModule;
 import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesModule;
+import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreModule;
 import it.integry.integrywmsnative.view.dialogs.bind_product_barcode_with_package.DialogBindProductBarcodeWithPackageComponent;
 import it.integry.integrywmsnative.view.dialogs.bind_product_barcode_with_package.DialogBindProductBarcodeWithPackageModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromMtbAartListComponent;
@@ -136,6 +142,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.tracciamento_imballi.DialogTracciamentoImballiComponent;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiModule;
 
 // Definition of the Application graph
 @Singleton
@@ -180,6 +188,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogSelectDocInfoModule.class,
         DocInterniEditFormModule.class,
         DialogSelectDocRowsModule.class,
+        DialogSelectLottiModule.class,
         DialogAskClienteModule.class,
         DialogEditArticoloModule.class,
         DialogPrintOrderSSCCListModule.class,
@@ -206,7 +215,10 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogInfoAggiuntiveLUModule.class,
         DialogAskLineaProdModule.class,
         ProdRiposizionamentoDaProdModule.class,
-        DialogInfoGiacenzaModule.class
+        DialogInfoGiacenzaModule.class,
+        ArticoliInGiacenzaModule.class,
+        DialogTracciamentoImballiModule.class,
+        DialogAskVettoreModule.class
 })
 public interface MainApplicationComponent {
 
@@ -323,6 +335,7 @@ public interface MainApplicationComponent {
     DialogInfoSituazioneArticoloComponent.Factory dialogInfoSituazioneArticoloComponent();
 
     DialogSelectDocRowsComponent.Factory dialogSelectDocRowsNewComponent();
+    DialogSelectLottiComponent.Factory dialogSelectLottiComponent();
 
     DialogSelectArtToOrderComponent.Factory dialogSelectArtToOrderNewComponent();
 
@@ -346,6 +359,12 @@ public interface MainApplicationComponent {
 
     DialogInfoGiacenzaComponent.Factory dialogInfoGiacenzaComponent();
 
+    ArticoliInGiacenzaComponent.Factory controlloGiacenzeComponent();
+
+    DialogTracciamentoImballiComponent.Factory dialogTracciamentoImballiComponent();
+
+    DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

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

@@ -32,6 +32,7 @@ import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoBufferRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
@@ -42,6 +43,7 @@ import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.VettoriRESTConsumer;
 import it.integry.integrywmsnative.core.services.inventario.InventarioService;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.sound.SoundAlertService;
@@ -172,8 +174,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(ExecutorService executorService, SystemRESTConsumer systemRESTConsumer) {
-        return new MagazzinoRESTConsumer(systemRESTConsumer);
+        return new MagazzinoRESTConsumer(executorService, systemRESTConsumer);
     }
 
     @Provides
@@ -247,8 +249,20 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
-        return new GiacenzaRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+        return new GiacenzaRESTConsumer(articoloRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    ImballiRESTConsumer provideImballiRESTConsumer(ExecutorService executorService) {
+        return new ImballiRESTConsumer(executorService);
+    }
+
+    @Provides
+    @Singleton
+    VettoriRESTConsumer provideVettoriRESTConsumer(ExecutorService executorService) {
+        return new VettoriRESTConsumer(executorService);
     }
 
     @Provides

app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java

@@ -5,6 +5,7 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.MainAccettazioneBollaElencoFragment;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.MainAccettazioneOrdiniElencoFragment;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaFragment;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniFragment;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariFragment;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
@@ -115,7 +116,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
                                 .setDrawerIcon(R.drawable.ic_black_external)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, SettingsManager.iDB().isFlagProduzioneShowInfo() ? DialogInfoSituazioneArticoloView.class : null)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_free_lav_picking)
@@ -218,6 +219,13 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setDrawerIcon(R.drawable.ic_black_empty_box)
                                         .setFragmentFactory(ElencoInventariFragment::newInstance))
 
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_articoli_in_giacenza)
+                                        .setCodMenu("MG070")
+                                        .setTitleText(R.string.articoli_in_giacenza_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_articoli_in_giacenza)
+                                        .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                        .setFragmentFactory(ArticoliInGiacenzaFragment::newInstance))
 
                 ).addGroup(
                         new MenuGroup()

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

@@ -22,6 +22,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.utility.UtilityGson;
 
 @Singleton
 public class ColliDataRecoverService {
@@ -108,7 +109,7 @@ public class ColliDataRecoverService {
 
     private void loadLocalFile() {
         InputStream inputStream;
-        Gson gson = new Gson();
+        Gson gson = UtilityGson.createObject();
 
         try {
             inputStream = mApplicationContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
@@ -130,7 +131,7 @@ public class ColliDataRecoverService {
     private void updateLocalFile() {
         FileOutputStream outputStream;
 
-        Gson gson = new Gson();
+        Gson gson = UtilityGson.createObject();
         String jsonText = gson.toJson(mtbColtsSessions);
 
         try {

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

@@ -211,16 +211,19 @@ public class Converters {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
                     BigDecimal value = null;
+
                     if (!UtilityString.isNullOrEmpty(s.toString()))
                         value = new BigDecimal(s.toString());
+
                     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().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -238,8 +241,11 @@ public class Converters {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
                     BigDecimal value = null;
-                    if (!UtilityString.isNullOrEmpty(s.toString()))
+                    String newValueString = s.toString().trim();
-                        value = new BigDecimal(s.toString());
+
+                    if (!UtilityString.isNullOrEmpty(newValueString))
+                        value = new BigDecimal(newValueString);
+
                     observableBigDecimal.set(value);
                 }
             };
@@ -247,7 +253,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));

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,24 +50,19 @@ public class BaseActivity extends AppCompatActivity {
     }
 
 
+
     private void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
+        executorService.execute(() -> {
-            this.progressOpened = true;
+            this.mCurrentProgress.show(getSupportFragmentManager());
-            runOnUiThread(() -> {
+        });
-                this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
-            });
-        }
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
+        executorService.execute(() -> {
-            this.progressOpened = false;
+            mCurrentProgress.dismissAllowingStateLoss();
-            runOnUiThread(() -> {
+        });
-                mCurrentProgress.dismiss();
-            });
-        }
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -12,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;
@@ -19,11 +22,13 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
-public class BaseDialogFragment extends DialogFragment implements DialogInterface.OnShowListener {
+public abstract class BaseDialogFragment extends DialogFragment implements DialogInterface.OnShowListener {
 
     @Inject
     public DialogProgressView mCurrentProgress;
-    private boolean progressOpened;
+
+    @Inject
+    public ExecutorService executorService;
 
     private boolean mBarcodeListener = false;
 
@@ -69,22 +74,19 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac
         BarcodeManager.enable();
     }
 
+
     private void openProgress() {
-        if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) {
+        BarcodeManager.disable();
-            this.progressOpened = true;
+        executorService.execute(() -> {
-            requireActivity().runOnUiThread(() -> {
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
+        });
-            });
-        }
     }
 
     private void closeProgress() {
-        if (progressOpened) {
+        BarcodeManager.enable();
-            this.progressOpened = false;
+        executorService.execute(() -> {
-            requireActivity().runOnUiThread(() -> {
+            mCurrentProgress.dismissAllowingStateLoss();
-                mCurrentProgress.dismiss();
+        });
-            });
-        }
     }
 
 
@@ -111,7 +113,14 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac
 
     @Override
     public void onShow(DialogInterface dialogInterface) {
+        getDialog().getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
+
         this.initialize();
+        this.onInit(dialogInterface);
+    }
+
+    public void onInit(DialogInterface dialogInterface) {
+
     }
 
     private void initialize() {

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()) {
+        executorService.execute(() -> {
-            this.progressOpened = true;
+            this.mCurrentProgress.show(requireActivity().getSupportFragmentManager());
-            executorService.execute(() -> {
+        });
-                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            });
-        }
     }
 
     private void closeProgress() {
         BarcodeManager.enable();
-        if (progressOpened) {
+        executorService.execute(() -> {
-            this.progressOpened = false;
+            mCurrentProgress.dismissAllowingStateLoss();
-            executorService.execute(() -> {
+        });
-                mCurrentProgress.dismissAllowingStateLoss();
-            });
-        }
     }
 
     public void onError(Exception ex) {

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

@@ -10,6 +10,7 @@ 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;
@@ -160,6 +161,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 +175,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;
     }

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

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.model;
 
+import com.google.gson.annotations.SerializedName;
+
 import java.math.BigDecimal;
 
 public class MtbTCol {
@@ -13,7 +15,7 @@ public class MtbTCol {
     private BigDecimal taraKg;
     private String descrizione;
     private String codMart;
-    private String flagUIUL;
+    private FlagUiUlEnum flagUIUL;
     private String circuito;
 
     public String getCodTcol() {
@@ -88,13 +90,12 @@ public class MtbTCol {
         return this;
     }
 
-    public String getFlagUIUL() {
+    public FlagUiUlEnum getFlagUIUL() {
         return flagUIUL;
     }
 
-    public MtbTCol setFlagUIUL(String flagUIUL) {
+    public void setFlagUIUL(FlagUiUlEnum flagUIUL) {
         this.flagUIUL = flagUIUL;
-        return this;
     }
 
     public String getCircuito() {
@@ -107,4 +108,29 @@ public class MtbTCol {
     }
 
 
+    public enum FlagUiUlEnum {
+        @SerializedName("UI")
+        UI("UI"),
+
+        @SerializedName("UL")
+        UL("UL");
+
+        private final String text;
+        FlagUiUlEnum(String text) {
+            this.text = text;
+        }
+
+
+        public String getText() {
+            return this.text;
+        }
+
+        public static FlagUiUlEnum fromString(String text) {
+            for (FlagUiUlEnum b : FlagUiUlEnum.values()) {
+                if (b.text.equalsIgnoreCase(text)) return b;
+            }
+            return null;
+        }
+    }
+
 }

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

@@ -2,8 +2,11 @@ package it.integry.integrywmsnative.core.model;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Date;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 /**
  * Created by ValerioC on 06/03/2018.
@@ -39,6 +42,7 @@ public class MvwSitArtUdcDetInventario {
     private String codJfas;
     private MtbAart mtbAart;
     private Integer numOrd;
+    private Date dataOrd;
 
     public String getGestione() {
         return gestione;
@@ -292,6 +296,12 @@ public class MvwSitArtUdcDetInventario {
         return this;
     }
 
+    public String getQtaText(){
+        String text = UtilityNumber.decimalToString(this.qtaCol);
+        text += !UtilityString.isNullOrEmpty(this.untMis) ? "\n" + this.untMis : "";
+        return text;
+    }
+
     public MtbColr toMtbColr() {
         return new MtbColr()
                 .setCodJcom(getCodJcom())
@@ -309,4 +319,13 @@ public class MvwSitArtUdcDetInventario {
                 .setPesoLordoKg(getPesoLordoKg())
                 .setUntMis(getUntMis());
     }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public MvwSitArtUdcDetInventario setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
 }

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

@@ -0,0 +1,95 @@
+package it.integry.integrywmsnative.core.model;
+
+import android.os.Parcelable;
+
+import java.math.BigDecimal;
+
+public class VtbVetr extends EntityBase {
+
+    public VtbVetr() {
+        type = "vtb_vetr";
+    }
+
+    private String codVvet;
+    private String codSpes;
+    private String idRiga;
+    private BigDecimal daQta;
+    private BigDecimal aQta;
+    private BigDecimal impUnt;
+    private BigDecimal impFisso;
+    private String codDivi;
+
+    public String getCodVvet() {
+        return codVvet;
+    }
+
+    public VtbVetr setCodVvet(String codVvet) {
+        this.codVvet = codVvet;
+        return this;
+    }
+
+    public String getCodSpes() {
+        return codSpes;
+    }
+
+    public VtbVetr setCodSpes(String codSpes) {
+        this.codSpes = codSpes;
+        return this;
+    }
+
+    public String getIdRiga() {
+        return idRiga;
+    }
+
+    public VtbVetr setIdRiga(String idRiga) {
+        this.idRiga = idRiga;
+        return this;
+    }
+
+    public BigDecimal getDaQta() {
+        return daQta;
+    }
+
+    public VtbVetr setDaQta(BigDecimal daQta) {
+        this.daQta = daQta;
+        return this;
+    }
+
+    public BigDecimal getaQta() {
+        return aQta;
+    }
+
+    public VtbVetr setaQta(BigDecimal aQta) {
+        this.aQta = aQta;
+        return this;
+    }
+
+    public BigDecimal getImpUnt() {
+        return impUnt;
+    }
+
+    public VtbVetr setImpUnt(BigDecimal impUnt) {
+        this.impUnt = impUnt;
+        return this;
+    }
+
+    public BigDecimal getImpFisso() {
+        return impFisso;
+    }
+
+    public VtbVetr setImpFisso(BigDecimal impFisso) {
+        this.impFisso = impFisso;
+        return this;
+    }
+
+    public String getCodDivi() {
+        return codDivi;
+    }
+
+    public VtbVetr setCodDivi(String codDivi) {
+        this.codDivi = codDivi;
+        return this;
+    }
+
+
+}

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

@@ -0,0 +1,273 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class VtbVett extends EntityBase {
+
+    public VtbVett() {
+        type = "vtb_vett";
+    }
+
+    private String codVvet;
+    private String codLettVett;
+    private String codAnag;
+    private String ragSoc;
+    private String indirizzo;
+    private String cap;
+    private String citta;
+    private String prov;
+    private String nazione;
+    private String telefono;
+    private String fax;
+    private String partIva;
+    private String note;
+    private String eMail;
+    private String modStamp;
+    private BigDecimal coefVol;
+    private String flagAttivo;
+    private String numAutoriz;
+    private List<VtbVetr> vtbVetr;
+
+
+    public String getCodVvet() {
+        return codVvet;
+    }
+
+    public VtbVett setCodVvet(String codVvet) {
+        this.codVvet = codVvet;
+        return this;
+    }
+
+    public String getCodLettVett() {
+        return codLettVett;
+    }
+
+    public VtbVett setCodLettVett(String codLettVett) {
+        this.codLettVett = codLettVett;
+        return this;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public VtbVett setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public String getRagSoc() {
+        return ragSoc;
+    }
+
+    public VtbVett setRagSoc(String ragSoc) {
+        this.ragSoc = ragSoc;
+        return this;
+    }
+
+    public String getIndirizzo() {
+        return indirizzo;
+    }
+
+    public VtbVett setIndirizzo(String indirizzo) {
+        this.indirizzo = indirizzo;
+        return this;
+    }
+
+    public String getCap() {
+        return cap;
+    }
+
+    public VtbVett setCap(String cap) {
+        this.cap = cap;
+        return this;
+    }
+
+    public String getCitta() {
+        return citta;
+    }
+
+    public VtbVett setCitta(String citta) {
+        this.citta = citta;
+        return this;
+    }
+
+    public String getProv() {
+        return prov;
+    }
+
+    public VtbVett setProv(String prov) {
+        this.prov = prov;
+        return this;
+    }
+
+    public String getNazione() {
+        return nazione;
+    }
+
+    public VtbVett setNazione(String nazione) {
+        this.nazione = nazione;
+        return this;
+    }
+
+    public String getTelefono() {
+        return telefono;
+    }
+
+    public VtbVett setTelefono(String telefono) {
+        this.telefono = telefono;
+        return this;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public VtbVett setFax(String fax) {
+        this.fax = fax;
+        return this;
+    }
+
+    public String getPartIva() {
+        return partIva;
+    }
+
+    public VtbVett setPartIva(String partIva) {
+        this.partIva = partIva;
+        return this;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public VtbVett setNote(String note) {
+        this.note = note;
+        return this;
+    }
+
+    public String geteMail() {
+        return eMail;
+    }
+
+    public VtbVett seteMail(String eMail) {
+        this.eMail = eMail;
+        return this;
+    }
+
+    public String getModStamp() {
+        return modStamp;
+    }
+
+    public VtbVett setModStamp(String modStamp) {
+        this.modStamp = modStamp;
+        return this;
+    }
+
+    public BigDecimal getCoefVol() {
+        return coefVol;
+    }
+
+    public VtbVett setCoefVol(BigDecimal coefVol) {
+        this.coefVol = coefVol;
+        return this;
+    }
+
+    public String getFlagAttivo() {
+        return flagAttivo;
+    }
+
+    public VtbVett setFlagAttivo(String flagAttivo) {
+        this.flagAttivo = flagAttivo;
+        return this;
+    }
+
+    public String getNumAutoriz() {
+        return numAutoriz;
+    }
+
+    public VtbVett setNumAutoriz(String numAutoriz) {
+        this.numAutoriz = numAutoriz;
+        return this;
+    }
+
+    public List<VtbVetr> getVtbVetr() {
+        return vtbVetr;
+    }
+
+    public VtbVett setVtbVetr(List<VtbVetr> vtbVetr) {
+        this.vtbVetr = vtbVetr;
+        return this;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        VtbVett vtbVett = (VtbVett) o;
+
+        if (!getCodVvet().equals(vtbVett.getCodVvet())) return false;
+        if (getCodLettVett() != null ? !getCodLettVett().equals(vtbVett.getCodLettVett()) : vtbVett.getCodLettVett() != null)
+            return false;
+        if (getCodAnag() != null ? !getCodAnag().equals(vtbVett.getCodAnag()) : vtbVett.getCodAnag() != null)
+            return false;
+        if (getRagSoc() != null ? !getRagSoc().equals(vtbVett.getRagSoc()) : vtbVett.getRagSoc() != null)
+            return false;
+        if (getIndirizzo() != null ? !getIndirizzo().equals(vtbVett.getIndirizzo()) : vtbVett.getIndirizzo() != null)
+            return false;
+        if (getCap() != null ? !getCap().equals(vtbVett.getCap()) : vtbVett.getCap() != null)
+            return false;
+        if (getCitta() != null ? !getCitta().equals(vtbVett.getCitta()) : vtbVett.getCitta() != null)
+            return false;
+        if (getProv() != null ? !getProv().equals(vtbVett.getProv()) : vtbVett.getProv() != null)
+            return false;
+        if (getNazione() != null ? !getNazione().equals(vtbVett.getNazione()) : vtbVett.getNazione() != null)
+            return false;
+        if (getTelefono() != null ? !getTelefono().equals(vtbVett.getTelefono()) : vtbVett.getTelefono() != null)
+            return false;
+        if (getFax() != null ? !getFax().equals(vtbVett.getFax()) : vtbVett.getFax() != null)
+            return false;
+        if (getPartIva() != null ? !getPartIva().equals(vtbVett.getPartIva()) : vtbVett.getPartIva() != null)
+            return false;
+        if (getNote() != null ? !getNote().equals(vtbVett.getNote()) : vtbVett.getNote() != null)
+            return false;
+        if (geteMail() != null ? !geteMail().equals(vtbVett.geteMail()) : vtbVett.geteMail() != null)
+            return false;
+        if (getModStamp() != null ? !getModStamp().equals(vtbVett.getModStamp()) : vtbVett.getModStamp() != null)
+            return false;
+        if (getCoefVol() != null ? !getCoefVol().equals(vtbVett.getCoefVol()) : vtbVett.getCoefVol() != null)
+            return false;
+        if (getFlagAttivo() != null ? !getFlagAttivo().equals(vtbVett.getFlagAttivo()) : vtbVett.getFlagAttivo() != null)
+            return false;
+        if (getNumAutoriz() != null ? !getNumAutoriz().equals(vtbVett.getNumAutoriz()) : vtbVett.getNumAutoriz() != null)
+            return false;
+        return getVtbVetr() != null ? getVtbVetr().equals(vtbVett.getVtbVetr()) : vtbVett.getVtbVetr() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCodVvet().hashCode();
+        result = 31 * result + (getCodLettVett() != null ? getCodLettVett().hashCode() : 0);
+        result = 31 * result + (getCodAnag() != null ? getCodAnag().hashCode() : 0);
+        result = 31 * result + (getRagSoc() != null ? getRagSoc().hashCode() : 0);
+        result = 31 * result + (getIndirizzo() != null ? getIndirizzo().hashCode() : 0);
+        result = 31 * result + (getCap() != null ? getCap().hashCode() : 0);
+        result = 31 * result + (getCitta() != null ? getCitta().hashCode() : 0);
+        result = 31 * result + (getProv() != null ? getProv().hashCode() : 0);
+        result = 31 * result + (getNazione() != null ? getNazione().hashCode() : 0);
+        result = 31 * result + (getTelefono() != null ? getTelefono().hashCode() : 0);
+        result = 31 * result + (getFax() != null ? getFax().hashCode() : 0);
+        result = 31 * result + (getPartIva() != null ? getPartIva().hashCode() : 0);
+        result = 31 * result + (getNote() != null ? getNote().hashCode() : 0);
+        result = 31 * result + (geteMail() != null ? geteMail().hashCode() : 0);
+        result = 31 * result + (getModStamp() != null ? getModStamp().hashCode() : 0);
+        result = 31 * result + (getCoefVol() != null ? getCoefVol().hashCode() : 0);
+        result = 31 * result + (getFlagAttivo() != null ? getFlagAttivo().hashCode() : 0);
+        result = 31 * result + (getNumAutoriz() != null ? getNumAutoriz().hashCode() : 0);
+        result = 31 * result + (getVtbVetr() != null ? getVtbVetr().hashCode() : 0);
+        return result;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/report/ReportType.java

@@ -10,8 +10,6 @@ public enum ReportType {
     ETICHETTA_SSCC_LAVORAZIONE(1),
     @SerializedName("2")
     ETICHETTA_SSCC_SPEDIZIONE(2),
-    @SerializedName("3")
-    WMS_SPEDIZIONE_ETICHETTE_SSCC_ORD(3),
     @SerializedName("4")
     WMS_SPEDIZIONE_PACKING_LIST_ORD(4),
     @SerializedName("5")

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

@@ -61,7 +61,11 @@ public class RESTBuilder {
 
         Gson gson = UtilityGson.createObject();
 
-        Retrofit retrofit = new Retrofit.Builder().addConverterFactory(GsonConverterFactory.create(gson)).baseUrl(endpoint).client(client).build();
+        Retrofit retrofit = new Retrofit.Builder()
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .baseUrl(endpoint)
+                .client(client)
+                .build();
 
         return retrofit.create(service);
     }

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/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/EntityRESTConsumer.java

@@ -40,7 +40,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
 
                             if (response.body() != null) {
                                 if (response.body().getEsito() == EsitoType.OK) {
-                                    Gson gson = new Gson();
+                                    Gson gson = UtilityGson.createObject();
                                     T object = gson.fromJson(response.body().getEntity(), type);
 
                                     callback.onSuccess(object);
@@ -133,7 +133,7 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
 
                     if (response.body() != null) {
                         if (response.body().getEsito() == EsitoType.OK) {
-                            Gson gson = new Gson();
+                            Gson gson = UtilityGson.createObject();
                             List<JsonObject> jsons = response.body().getEntityList();
 
                             List<T> newList = new ArrayList<T>();

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

@@ -25,11 +25,9 @@ import retrofit2.Response;
 @Singleton
 public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
 
-    private final SystemRESTConsumer mSystemRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
 
-    public GiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+    public GiacenzaRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
-        this.mSystemRESTConsumer = systemRESTConsumer;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
 
     }
@@ -41,27 +39,31 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
             public void onResponse(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Response<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> response) {
                 analyzeAnswer(response, "getGiacenzeInPosizione", inventarioList -> {
 
-                    List<String> codMarts = Stream.of(inventarioList)
+                    if(inventarioList != null && !inventarioList.isEmpty()){
-                            .map(x -> x.getCodMart().trim())
+                        List<String> codMarts = Stream.of(inventarioList)
-                            .toList();
+                                .map(x -> x.getCodMart().trim())
+                                .toList();
 
-                    mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
+                        mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
-                        for (var row : inventarioList) {
+                            for (var row : inventarioList) {
 
-                            MtbAart foundMtbAart = null;
+                                MtbAart foundMtbAart = null;
-                            Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                                Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
-                                    .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
+                                        .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
-                                    .findFirst();
+                                        .findFirst();
 
-                            if (mtbAartOpt.isPresent()) {
+                                if (mtbAartOpt.isPresent()) {
-                                foundMtbAart = mtbAartOpt.get();
+                                    foundMtbAart = mtbAartOpt.get();
+                                }
+
+                                row.setMtbAart(foundMtbAart);
                             }
 
-                            row.setMtbAart(foundMtbAart);
+                            onComplete.run(inventarioList);
-                        }
+                        }, onFailed);
-
+                    }else{
-                        onComplete.run(inventarioList);
+                        onComplete.run(new ArrayList<>());
-                    }, onFailed);
+                    }
                 }, onFailed);
             }
 

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

@@ -0,0 +1,92 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+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.MtbTCol;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraCaricoImballiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraScaricoImballiRequestDTO;
+import retrofit2.Response;
+
+@Singleton
+public class ImballiRESTConsumer extends _BaseRESTConsumer {
+
+    private final ExecutorService executorService;
+
+    public ImballiRESTConsumer(ExecutorService executorService) {
+        this.executorService = executorService;
+    }
+
+
+    public List<MtbTCol> retrieveTipiColloSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
+        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        Response<ServiceRESTResponse<List<MtbTCol>>> response = service.retrieveTipiCollo(tipoImballo)
+                .execute();
+
+        return analyzeAnswer(response, "retrieveTipiCollo");
+    }
+
+    public void retrieveTipiCollo(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = retrieveTipiColloSyncronized(tipoImballo);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+
+    public void registraCaricoSyncronized(String codAnag, List<ImballoQuantityDTO> imballi) throws Exception {
+        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        Response<ServiceRESTResponse<Void>> response = service.registraCarico(
+                        new RegistraCaricoImballiRequestDTO()
+                                .setCodAnag(codAnag)
+                                .setUsedImballi(imballi))
+                .execute();
+
+        analyzeAnswer(response, "registraCarico");
+    }
+
+    public void registraCarico(String codAnag, List<ImballoQuantityDTO> imballi, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                registraCaricoSyncronized(codAnag, imballi);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+
+    public void registraScaricoSyncronized(String codVettore, List<ImballoQuantityDTO> imballi) throws Exception {
+        ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+        Response<ServiceRESTResponse<Void>> response = service.registraScarico(
+                        new RegistraScaricoImballiRequestDTO()
+                                .setCodVettore(codVettore)
+                                .setUsedImballi(imballi))
+                .execute();
+
+        analyzeAnswer(response, "registraScarico");
+    }
+
+    public void registraScarico(String idVettore, List<ImballoQuantityDTO> imballi, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                registraScaricoSyncronized(idVettore, imballi);
+                if (onComplete != null) onComplete.run();
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraCaricoImballiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraScaricoImballiRequestDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+
+public interface ImballiRESTConsumerService {
+
+
+    @GET("wms/imballi/retrieve/{tipo}")
+    Call<ServiceRESTResponse<List<MtbTCol>>> retrieveTipiCollo(@Path("tipo") MtbTCol.FlagUiUlEnum tipo);
+
+    @POST("wms/imballi/registraCarico")
+    Call<ServiceRESTResponse<Void>> registraCarico(@Body RegistraCaricoImballiRequestDTO registraCaricoImballiRequest);
+
+    @POST("wms/imballi/registraScarico")
+    Call<ServiceRESTResponse<Void>> registraScarico(@Body RegistraScaricoImballiRequestDTO registraScaricoImballiRequest);
+
+}

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

@@ -1,18 +1,19 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import com.google.gson.reflect.TypeToken;
+import androidx.annotation.NonNull;
 
-import java.lang.reflect.Type;
+import java.util.Date;
-import java.util.ArrayList;
 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.DtbOrdt;
+import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbTCol;
+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;
@@ -21,56 +22,14 @@ import retrofit2.Response;
 @Singleton
 public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
 
+    private final ExecutorService executorService;
     private final SystemRESTConsumer mSystemRESTConsumer;
 
-    public MagazzinoRESTConsumer(SystemRESTConsumer mSystemRESTConsumer) {
+    public MagazzinoRESTConsumer(ExecutorService executorService, SystemRESTConsumer mSystemRESTConsumer) {
+        this.executorService = executorService;
         this.mSystemRESTConsumer = mSystemRESTConsumer;
     }
 
-
-    public void getTipiCollo(RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
-        String baseSql = "SELECT * " +
-                "FROM mtb_tcol ";
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbTCol>>() {
-        }.getType();
-
-        mSystemRESTConsumer.<ArrayList<MtbTCol>>processSql(baseSql, typeOfObjectsList, values -> {
-            if (onComplete != null) {
-                onComplete.run(values);
-            }
-        }, ex -> {
-            if (onFailed != null) onFailed.run(ex);
-        });
-    }
-
-
-    public void saveOrdine(SaveDTO saveDTO, RunnableArgs<DtbOrdt> onComplete, RunnableArgs<Exception> onFailed) {
-        MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class, 240);
-        service.saveOrdine(saveDTO)
-                .enqueue(new Callback<>() {
-                    @Override
-                    public void onResponse(Call<List<ServiceRESTResponse<DtbOrdt>>> call, Response<List<ServiceRESTResponse<DtbOrdt>>> response) {
-                        if (response.body() != null && response.body().size() > 0) {
-                            analyzeListOfAnswers(response, "saveOrdine", dtoList -> {
-                                if (dtoList.size() > 0) {
-                                    onComplete.run(dtoList.get(0));
-                                } else {
-                                    onFailed.run(new Exception("Nessun ordine generato"));
-                                }
-                            }, onFailed);
-                        } else {
-                            onFailed.run(new Exception("Nessun ordine generato"));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Call<List<ServiceRESTResponse<DtbOrdt>>> call, Throwable t) {
-                        onFailed.run(new Exception(t));
-                    }
-                });
-    }
-
     public void saveTerminalinoWMS(SaveDTO saveDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
         service.saveTerminalinoWMS(saveDTO)
@@ -86,4 +45,40 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
                     }
                 });
     }
+
+
+    public MtbPartitaMag retrievePartitaMagSyncronized(String partitaMag, String codMart) throws Exception {
+        MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
+        Response<ServiceRESTResponse<MtbPartitaMag>> response = service.retrievePartitaMag(codMart, partitaMag)
+                .execute();
+
+        return analyzeAnswer(response, "retrievePartitaMag");
+    }
+
+    public void retrievePartitaMag(String partitaMag, String codMart, RunnableArgs<MtbPartitaMag> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = retrievePartitaMagSyncronized(partitaMag, codMart);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
+    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

@@ -2,19 +2,25 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.model.DtbOrdt;
+import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 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.Query;
 
 public interface MagazzinoRESTConsumerService {
 
     @POST("SM2SaveTerminalinoWMS")
     Call<ServiceRESTResponse<Void>> saveTerminalinoWMS(@Body SaveDTO saveDTO);
 
-    @POST("SM2SaveTerminalino")
+    @GET("wms/partita-magazzino/retrievePartitaMag")
-    Call<List<ServiceRESTResponse<DtbOrdt>>> saveOrdine(@Body SaveDTO saveDTO);
+    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/PrinterRESTConsumer.java

@@ -157,6 +157,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
     }
 
     public void printClosedOrders(PrintOrderCloseDTO dto, String codMdep, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        if (BuildConfig.DEBUG) {
+            onComplete.run();
+            return;
+        }
 
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class, 240);
         Call<ServiceRESTResponse<Object>> callable = printerService.printClosedOrders(codMdep, dto);

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

@@ -32,6 +32,7 @@ import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 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;
 import retrofit2.Callback;
@@ -72,15 +73,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "ProcessSql", o -> {
-                            Gson gson = new GsonBuilder()
+                            Gson gson = UtilityGson.createObject();
-                                    .registerTypeAdapter(Date.class, (JsonDeserializer<?>) (json, typeOfT, context) -> {
-                                        try {
-                                            return UtilityDate.recognizeDate(json.getAsString());
-                                        } catch (Exception e) {
-                                            throw new JsonParseException(e);
-                                        }
-                                    })
-                                    .create();
 
 
                             String json = gson.toJson(o);

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

@@ -0,0 +1,44 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+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.VtbVett;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Response;
+
+@Singleton
+public class VettoriRESTConsumer extends _BaseRESTConsumer {
+
+    private final ExecutorService executorService;
+
+    public VettoriRESTConsumer(ExecutorService executorService) {
+        this.executorService = executorService;
+    }
+
+
+    public List<VtbVett> retrieveRecentlyUsedInOrdersSyncronized(GestioneEnum gestione) throws Exception {
+        var service = RESTBuilder.getService(VettoriRESTConsumerService.class);
+        Response<ServiceRESTResponse<List<VtbVett>>> response = service.retrieveRecentlyUsedInOrders(gestione)
+                .execute();
+
+        return analyzeAnswer(response, "retrieveRecentlyUsedInOrders");
+    }
+
+    public void retrieveRecentlyUsedInOrders(GestioneEnum gestione, RunnableArgs<List<VtbVett>> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = retrieveRecentlyUsedInOrdersSyncronized(gestione);
+                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/VettoriRESTConsumerService.java

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.VtbVett;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface VettoriRESTConsumerService {
+
+    @GET("wms/vettore/recentlyUsedInOrders")
+    Call<ServiceRESTResponse<List<VtbVett>>> retrieveRecentlyUsedInOrders(@Query("gestione") GestioneEnum gestioneEnum);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java

@@ -13,15 +13,13 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class LocalDateDeserializer implements JsonDeserializer<LocalDate> {
-
-    DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
-
-
     @Override
     public LocalDate deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException {
         String date = element.getAsString();
         if (UtilityString.isNullOrEmpty(date)) return null;
 
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityString.determineDateFormat(date));
+
         return LocalDate.parse(date, formatter);
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbTcolFlagUiUlDeserializer.java

@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.core.rest.deserializer;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Type;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class MtbTcolFlagUiUlDeserializer implements JsonDeserializer<MtbTCol.FlagUiUlEnum> {
+    @Override
+    public MtbTCol.FlagUiUlEnum deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        if (json.isJsonNull()) {
+            return null;
+        }
+
+        String text = json.getAsString();
+        return MtbTCol.FlagUiUlEnum.fromString(text);
+
+    }
+}

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

@@ -328,13 +328,13 @@ public class Ean128Model {
     public String InternalPart;
 
     ///<summary>Informazioni interne</summary>
-    public String Internal1;
+    public String Internal1; //Cod-Mart
 
     ///<summary>Informazioni interne</summary>
-    public String Internal2;
+    public String Internal2; //IDLotto
 
     ///<summary>Informazioni interne</summary>
-    public String Internal3;
+    public String Internal3; //Cod-Jfas
 
     ///<summary>Informazioni interne</summary>
     public String Internal4;

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

@@ -0,0 +1,25 @@
+package it.integry.integrywmsnative.core.rest.model.imballi;
+
+public class ImballoQuantityDTO {
+
+    private String codMart;
+    private Integer qta;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public ImballoQuantityDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public Integer getQta() {
+        return qta;
+    }
+
+    public ImballoQuantityDTO setQta(Integer qta) {
+        this.qta = qta;
+        return this;
+    }
+}

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

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model.imballi;
+
+import java.util.List;
+
+public class RegistraCaricoImballiRequestDTO {
+
+    private String codAnag;
+    private List<ImballoQuantityDTO> usedImballi;
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public RegistraCaricoImballiRequestDTO setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public List<ImballoQuantityDTO> getUsedImballi() {
+        return usedImballi;
+    }
+
+    public RegistraCaricoImballiRequestDTO setUsedImballi(List<ImballoQuantityDTO> usedImballi) {
+        this.usedImballi = usedImballi;
+        return this;
+    }
+}

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

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model.imballi;
+
+import java.util.List;
+
+public class RegistraScaricoImballiRequestDTO {
+
+    private String codVettore;
+    private List<ImballoQuantityDTO> usedImballi;
+
+    public String getCodVettore() {
+        return codVettore;
+    }
+
+    public RegistraScaricoImballiRequestDTO setCodVettore(String codVettore) {
+        this.codVettore = codVettore;
+        return this;
+    }
+
+    public List<ImballoQuantityDTO> getUsedImballi() {
+        return usedImballi;
+    }
+
+    public RegistraScaricoImballiRequestDTO setUsedImballi(List<ImballoQuantityDTO> usedImballi) {
+        this.usedImballi = usedImballi;
+        return this;
+    }
+}

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

@@ -14,6 +14,7 @@ public class CreateUDSRequestDTO {
     private String codAnag;
     private String codVdes;
     private String rifOrd;
+    private Integer idLotto;
     private boolean orderRequired;
     private List<CreateUDSRequestOrderDTO> orders;
 
@@ -125,6 +126,14 @@ public class CreateUDSRequestDTO {
         return this;
     }
 
+    public Integer getIdLotto() {
+        return idLotto;
+    }
+
+    public CreateUDSRequestDTO setIdLotto(Integer idLotto) {
+        this.idLotto = idLotto;
+        return this;
+    }
 
 
     public static class Causale {

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/rest/serializer/MtbTcolFlagUiUlSerializer.java

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.rest.serializer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class MtbTcolFlagUiUlSerializer implements JsonSerializer<MtbTCol.FlagUiUlEnum> {
+    @Override
+    public JsonElement serialize(MtbTCol.FlagUiUlEnum src, Type typeOfSrc, JsonSerializationContext context) {
+        return new JsonPrimitive(src.getText());
+    }
+}

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

@@ -20,7 +20,6 @@ public class DBSettingsModel {
     private boolean enableCheckPartitaMagCheckPickingV;
     private boolean flagMultiClienteOrdV;
     private boolean flagUseCodAnagAziendale;
-    private String defaultCausaleRettificaGiacenze;
     private boolean flagAskClienteInPickingLibero;
     private boolean flagPickLiberoAllowEmptyCliente;
 
@@ -28,7 +27,6 @@ public class DBSettingsModel {
     private boolean flagCanAutoOpenNewULAccettazione;
     private boolean flagCanAddExtraQuantitySpedizione;
     private boolean flagEnableCheckDepositoSpedizione;
-    private boolean flagUseNewPickingListSpedizione;
     private boolean flagVersamentoDirettoProduzione;
     private boolean flagAskPesoColloSpedizione;
     private boolean flagForceAllToColli;
@@ -36,6 +34,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;
@@ -62,18 +61,28 @@ public class DBSettingsModel {
     private String commessaMagazzino;
     private boolean flagGeneraDocumentoSpedizione = false;
     private boolean flagIsInventarioCacheEnabled = false;
-    private boolean flagAskPrintUlAccettazioneBolla = false;
+    private boolean flagAccettazioneBollaAskPrintUl = false;
-    private boolean flagAskTipoColloAccettazioneBolla = false;
+    private boolean flagAccettazioneBollaAskTipoCollo = false;
-    private boolean flagAskVersamentoAutomaticoAccettazioneBolla = false;
+    private boolean flagAccettazioneBollaAskVersamentoAutomatico = false;
-    private boolean flagCanAddUnknownItemsAccettazioneBolla = false;
+    private boolean flagAccettazioneBollaCanAddUnknownItems = false;
-    private boolean flagCanAddUnknownBarcodesAccettazioneBolla = false;
+    private boolean flagAccettazioneBollaCanAddUnknownBarcodes = false;
-    private boolean flagEnableFastPickAccettazioneBolla = false;
+    private boolean flagAccettazioneBollaEnableFastPick = false;
-    private boolean flagDisableMandatoryTracciabilitaAccettazioneBolla = false;
+    private boolean flagAccettazioneBollaDisableMandatoryTracciabilita = false;
-    private boolean flagAllowULRecoverAccettazioneBolla = true;
+    private boolean flagAccettazioneBollaAllowULRecover = true;
-    private boolean flagOverflowQuantityWarning = false;
+    private boolean flagSpedizioneOverflowQuantityWarning = false;
     private String viewPosizioni;
-    private boolean flagDeleteRowOnClose = false;
+    private boolean flagAccettazioneDeleteRowOnClose = false;
-    private boolean flagAllowBarcodeFornitore = false;
+    private boolean flagAccettazioneAllowBarcodeFornitore = false;
+    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;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -264,6 +273,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;
@@ -490,84 +508,84 @@ public class DBSettingsModel {
         return this;
     }
 
-    public boolean isFlagAskPrintUlAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaAskPrintUl() {
-        return flagAskPrintUlAccettazioneBolla;
+        return flagAccettazioneBollaAskPrintUl;
     }
 
-    public DBSettingsModel setFlagAskPrintUlAccettazioneBolla(boolean flagAskPrintUlAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaAskPrintUl(boolean flagAccettazioneBollaAskPrintUl) {
-        this.flagAskPrintUlAccettazioneBolla = flagAskPrintUlAccettazioneBolla;
+        this.flagAccettazioneBollaAskPrintUl = flagAccettazioneBollaAskPrintUl;
         return this;
     }
 
-    public boolean isFlagAskTipoColloAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaAskTipoCollo() {
-        return flagAskTipoColloAccettazioneBolla;
+        return flagAccettazioneBollaAskTipoCollo;
     }
 
-    public DBSettingsModel setFlagAskTipoColloAccettazioneBolla(boolean flagAskTipoColloAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaAskTipoCollo(boolean flagAccettazioneBollaAskTipoCollo) {
-        this.flagAskTipoColloAccettazioneBolla = flagAskTipoColloAccettazioneBolla;
+        this.flagAccettazioneBollaAskTipoCollo = flagAccettazioneBollaAskTipoCollo;
         return this;
     }
 
-    public boolean isFlagAskVersamentoAutomaticoAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaAskVersamentoAutomatico() {
-        return flagAskVersamentoAutomaticoAccettazioneBolla;
+        return flagAccettazioneBollaAskVersamentoAutomatico;
     }
 
-    public DBSettingsModel setFlagAskVersamentoAutomaticoAccettazioneBolla(boolean flagAskVersamentoAutomaticoAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaAskVersamentoAutomatico(boolean flagAccettazioneBollaAskVersamentoAutomatico) {
-        this.flagAskVersamentoAutomaticoAccettazioneBolla = flagAskVersamentoAutomaticoAccettazioneBolla;
+        this.flagAccettazioneBollaAskVersamentoAutomatico = flagAccettazioneBollaAskVersamentoAutomatico;
         return this;
     }
 
-    public boolean isFlagCanAddUnknownItemsAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaCanAddUnknownItems() {
-        return flagCanAddUnknownItemsAccettazioneBolla;
+        return flagAccettazioneBollaCanAddUnknownItems;
     }
 
-    public DBSettingsModel setFlagCanAddUnknownItemsAccettazioneBolla(boolean flagCanAddUnknownItemsAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaCanAddUnknownItems(boolean flagAccettazioneBollaCanAddUnknownItems) {
-        this.flagCanAddUnknownItemsAccettazioneBolla = flagCanAddUnknownItemsAccettazioneBolla;
+        this.flagAccettazioneBollaCanAddUnknownItems = flagAccettazioneBollaCanAddUnknownItems;
         return this;
     }
 
-    public boolean isFlagCanAddUnknownBarcodesAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaCanAddUnknownBarcodes() {
-        return flagCanAddUnknownBarcodesAccettazioneBolla;
+        return flagAccettazioneBollaCanAddUnknownBarcodes;
     }
 
-    public DBSettingsModel setFlagCanAddUnknownBarcodesAccettazioneBolla(boolean flagCanAddUnknownBarcodesAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaCanAddUnknownBarcodes(boolean flagAccettazioneBollaCanAddUnknownBarcodes) {
-        this.flagCanAddUnknownBarcodesAccettazioneBolla = flagCanAddUnknownBarcodesAccettazioneBolla;
+        this.flagAccettazioneBollaCanAddUnknownBarcodes = flagAccettazioneBollaCanAddUnknownBarcodes;
         return this;
     }
 
-    public boolean isFlagEnableFastPickAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaEnableFastPick() {
-        return flagEnableFastPickAccettazioneBolla;
+        return flagAccettazioneBollaEnableFastPick;
     }
 
-    public DBSettingsModel setFlagEnableFastPickAccettazioneBolla(boolean flagEnableFastPickAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaEnableFastPick(boolean flagAccettazioneBollaEnableFastPick) {
-        this.flagEnableFastPickAccettazioneBolla = flagEnableFastPickAccettazioneBolla;
+        this.flagAccettazioneBollaEnableFastPick = flagAccettazioneBollaEnableFastPick;
         return this;
     }
 
-    public boolean isFlagDisableMandatoryTracciabilitaAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaDisableMandatoryTracciabilita() {
-        return flagDisableMandatoryTracciabilitaAccettazioneBolla;
+        return flagAccettazioneBollaDisableMandatoryTracciabilita;
     }
 
-    public DBSettingsModel setFlagDisableMandatoryTracciabilitaAccettazioneBolla(boolean flagDisableMandatoryTracciabilitaAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaDisableMandatoryTracciabilita(boolean flagAccettazioneBollaDisableMandatoryTracciabilita) {
-        this.flagDisableMandatoryTracciabilitaAccettazioneBolla = flagDisableMandatoryTracciabilitaAccettazioneBolla;
+        this.flagAccettazioneBollaDisableMandatoryTracciabilita = flagAccettazioneBollaDisableMandatoryTracciabilita;
         return this;
     }
 
-    public boolean isFlagAllowULRecoverAccettazioneBolla() {
+    public boolean isFlagAccettazioneBollaAllowULRecover() {
-        return flagAllowULRecoverAccettazioneBolla;
+        return flagAccettazioneBollaAllowULRecover;
     }
 
-    public DBSettingsModel setFlagAllowULRecoverAccettazioneBolla(boolean flagAllowULRecoverAccettazioneBolla) {
+    public DBSettingsModel setFlagAccettazioneBollaAllowULRecover(boolean flagAccettazioneBollaAllowULRecover) {
-        this.flagAllowULRecoverAccettazioneBolla = flagAllowULRecoverAccettazioneBolla;
+        this.flagAccettazioneBollaAllowULRecover = flagAccettazioneBollaAllowULRecover;
         return this;
     }
 
-    public boolean isFlagOverflowQuantityWarning() {
+    public boolean isFlagSpedizioneOverflowQuantityWarning() {
-        return flagOverflowQuantityWarning;
+        return flagSpedizioneOverflowQuantityWarning;
     }
 
-    public DBSettingsModel setFlagOverflowQuantityWarning(boolean flagOverflowQuantityWarning) {
+    public DBSettingsModel setFlagSpedizioneOverflowQuantityWarning(boolean flagSpedizioneOverflowQuantityWarning) {
-        this.flagOverflowQuantityWarning = flagOverflowQuantityWarning;
+        this.flagSpedizioneOverflowQuantityWarning = flagSpedizioneOverflowQuantityWarning;
         return this;
     }
 
@@ -589,21 +607,110 @@ public class DBSettingsModel {
         return this;
     }
 
-    public boolean isFlagDeleteRowOnClose() {
+    public boolean isFlagAccettazioneDeleteRowOnClose() {
-        return flagDeleteRowOnClose;
+        return flagAccettazioneDeleteRowOnClose;
     }
 
-    public DBSettingsModel setFlagDeleteRowOnClose(boolean flagDeleteRowOnClose) {
+    public DBSettingsModel setFlagAccettazioneDeleteRowOnClose(boolean flagAccettazioneDeleteRowOnClose) {
-        this.flagDeleteRowOnClose = flagDeleteRowOnClose;
+        this.flagAccettazioneDeleteRowOnClose = flagAccettazioneDeleteRowOnClose;
         return this;
     }
 
-    public boolean isFlagAllowBarcodeFornitore() {
+    public boolean isFlagAccettazioneAllowBarcodeFornitore() {
-        return flagAllowBarcodeFornitore;
+        return flagAccettazioneAllowBarcodeFornitore;
     }
 
-    public DBSettingsModel setFlagAllowBarcodeFornitore(boolean flagAllowBarcodeFornitore) {
+    public DBSettingsModel setFlagAccettazioneAllowBarcodeFornitore(boolean flagAccettazioneAllowBarcodeFornitore) {
-        this.flagAllowBarcodeFornitore = flagAllowBarcodeFornitore;
+        this.flagAccettazioneAllowBarcodeFornitore = flagAccettazioneAllowBarcodeFornitore;
+        return this;
+    }
+
+    public boolean isFlagProduzioneShowInfo() {
+        return flagProduzioneShowInfo;
+    }
+
+    public DBSettingsModel setFlagProduzioneShowInfo(boolean flagProduzioneShowInfo) {
+        this.flagProduzioneShowInfo = flagProduzioneShowInfo;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneBollaUseQtaOrd() {
+        return flagAccettazioneBollaUseQtaOrd;
+    }
+
+    public void setFlagAccettazioneBollaUseQtaOrd(boolean flagAccettazioneBollaUseQtaOrd) {
+        this.flagAccettazioneBollaUseQtaOrd = flagAccettazioneBollaUseQtaOrd;
+    }
+
+    public boolean isFlagWarningNewPartitaMag() {
+        return flagWarningNewPartitaMag;
+    }
+
+    public DBSettingsModel setFlagWarningNewPartitaMag(boolean flagWarningNewPartitaMag) {
+        this.flagWarningNewPartitaMag = flagWarningNewPartitaMag;
+        return this;
+    }
+
+    public boolean isFlagTracciamentoImballiCaricoEnabled() {
+        return flagTracciamentoImballiCaricoEnabled;
+    }
+
+    public DBSettingsModel setFlagTracciamentoImballiCaricoEnabled(boolean flagTracciamentoImballiCaricoEnabled) {
+        this.flagTracciamentoImballiCaricoEnabled = flagTracciamentoImballiCaricoEnabled;
+        return this;
+    }
+
+    public boolean isFlagTracciamentoImballiScaricoEnabled() {
+        return flagTracciamentoImballiScaricoEnabled;
+    }
+
+    public DBSettingsModel setFlagTracciamentoImballiScaricoEnabled(boolean flagTracciamentoImballiScaricoEnabled) {
+        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 boolean isFlagPositionChangeRequest() {
+        return flagPositionChangeRequest;
+    }
+
+    public DBSettingsModel setFlagPositionChangeRequest(boolean flagPositionChangeRequest) {
+        this.flagPositionChangeRequest = flagPositionChangeRequest;
         return this;
     }
 }

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

@@ -24,6 +24,7 @@ import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.utility.UtilityFirebase;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 @Singleton
 public class SettingsManager {
@@ -246,7 +247,7 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE")
                 .setKeySection("FLAG_DELETE_ROW_ON_CLOSE")
-                .setSetter(dbSettingsModelIstance::setFlagDeleteRowOnClose));
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneDeleteRowOnClose));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -283,6 +284,12 @@ public class SettingsManager {
                 .setKeySection("FLAG_GROUP_BY_GRP_MERC")
                 .setSetter(dbSettingsModelIstance::setGroupPoductionByCommodityGroup)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PRODUZIONE")
+                .setKeySection("FLAG_SHOW_INFO")
+                .setSetter(dbSettingsModelIstance::setFlagProduzioneShowInfo)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
                 .setSection("PRODUZIONE")
@@ -308,6 +315,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")
@@ -381,6 +393,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")
@@ -439,66 +456,118 @@ 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")
                 .setKeySection("FLAG_ASK_PRINT_UL")
-                .setSetter(dbSettingsModelIstance::setFlagAskPrintUlAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaAskPrintUl)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
                 .setKeySection("FLAG_ASK_TIPO_COLLO")
-                .setSetter(dbSettingsModelIstance::setFlagAskTipoColloAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaAskTipoCollo)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
                 .setKeySection("FLAG_ASK_VERSAMENTO_AUTOMATICO")
-                .setSetter(dbSettingsModelIstance::setFlagAskVersamentoAutomaticoAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaAskVersamentoAutomatico)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
                 .setKeySection("FLAG_CAN_ADD_UNKNOWN_ITEMS")
-                .setSetter(dbSettingsModelIstance::setFlagCanAddUnknownItemsAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaCanAddUnknownItems)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
                 .setKeySection("FLAG_CAN_ADD_UNKNOWN_BARCODES")
-                .setSetter(dbSettingsModelIstance::setFlagCanAddUnknownBarcodesAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaCanAddUnknownBarcodes)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
                 .setKeySection("FLAG_ENABLE_FAST_PICK")
-                .setSetter(dbSettingsModelIstance::setFlagEnableFastPickAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaEnableFastPick)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
                 .setKeySection("FLAG_DISABLE_MANDATORY_TRACCIABILITA")
-                .setSetter(dbSettingsModelIstance::setFlagDisableMandatoryTracciabilitaAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaDisableMandatoryTracciabilita)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE_BOLLA")
                 .setKeySection("FLAG_ALLOW_UL_RECOVER")
-                .setSetter(dbSettingsModelIstance::setFlagAllowULRecoverAccettazioneBolla)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaAllowULRecover)
                 .setDefaultValue(true));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_OVERFLOW_QUANTITY_WARNING")
-                .setSetter(dbSettingsModelIstance::setFlagOverflowQuantityWarning)
+                .setSetter(dbSettingsModelIstance::setFlagSpedizioneOverflowQuantityWarning)
                 .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE")
                 .setKeySection("FLAG_ALLOW_BARCODE_FORNITORE")
-                .setSetter(dbSettingsModelIstance::setFlagAllowBarcodeFornitore)
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneAllowBarcodeFornitore)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE_BOLLA")
+                .setKeySection("FLAG_USE_QTA_ORD")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaUseQtaOrd)
+                .setDefaultValue(true));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .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")
+                .setSection("IMBALLI")
+                .setKeySection("COD_DTIP_CARICO")
+                .setSetter(data -> {
+                    dbSettingsModelIstance.setFlagTracciamentoImballiCaricoEnabled(!UtilityString.isNullOrEmpty(data));
+                }));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("PICKING")
+                .setSection("IMBALLI")
+                .setKeySection("COD_DTIP_SCARICO")
+                .setSetter(data -> {
+                    dbSettingsModelIstance.setFlagTracciamentoImballiScaricoEnabled(!UtilityString.isNullOrEmpty(data));
+                }));
+
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+                .setGestName("PVM")
+                .setSection("DOC_INTERNI")
+                .setKeySection("REQUEST_NUM_DOC")
+                .setSetter(dbSettingsModelIstance::setDocInterniRequestNumDoc));
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 

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

@@ -48,7 +48,7 @@ public class UpdatesManager {
 
     private void installAPK(String downloadURL) {
 
-        String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
+        File destination = mContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
 
         var progressDialogBuilder = new DialogProgressView("Download", null, false);
         progressDialogBuilder.show(mContext.getSupportFragmentManager(), "tag");
@@ -74,10 +74,10 @@ public class UpdatesManager {
                             intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
                             fileLoc = GenericFileProvider.getUriForFile(mContext,
                                     mContext.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
-                                    new File(destPath));
+                                    destPath);
                         } else {
                             intent = new Intent(Intent.ACTION_VIEW);
-                            fileLoc = Uri.fromFile(new File(destPath));
+                            fileLoc = Uri.fromFile(destPath);
                         }
 
                         intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");

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

@@ -15,23 +15,20 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 public class FileDownloader {
 
     private String urlString;
-    private String destFolder;
+    private File destFolder;
 
     private RunnableArgs<Integer> onProgressUpdate;
-    private RunnableArgs<String> onDownloadCompleted;
+    private RunnableArgs<File> onDownloadCompleted;
 
 
     public void download() throws Exception {
         InputStream input = null;
         OutputStream output = null;
         HttpURLConnection connection = null;
-        String destPathFile;
+        File downloadFile = null;
 
         try {
-            File direct = new File(destFolder);
+            if (!destFolder.exists()) destFolder.mkdirs();
-            if (!direct.exists()) {
-                direct.mkdirs();
-            }
 
             URL url = new URL(urlString);
             connection = (HttpURLConnection) url.openConnection();
@@ -46,13 +43,12 @@ public class FileDownloader {
             int downloadedBytes = 0;
 
             String title = URLUtil.guessFileName(String.valueOf(url), null, null);
+            downloadFile = new File(destFolder, title);
 
-            destPathFile = destFolder + title;
+            if (downloadFile.exists())
+                downloadFile.delete();
 
-            if (new File(destPathFile).exists())
+            output = new FileOutputStream(downloadFile);
-                new File(destPathFile).delete();
-
-            output = new FileOutputStream(destPathFile);
 
             byte[] buf = new byte[1024];
             int len;
@@ -79,7 +75,7 @@ public class FileDownloader {
                 connection.disconnect();
         }
 
-        if (onDownloadCompleted != null) onDownloadCompleted.run(destPathFile);
+        if (onDownloadCompleted != null) onDownloadCompleted.run(downloadFile);
     }
 
 
@@ -92,11 +88,11 @@ public class FileDownloader {
         return this;
     }
 
-    public String getDestFolder() {
+    public File getDestFolder() {
         return destFolder;
     }
 
-    public FileDownloader setDestFolder(String destFolder) {
+    public FileDownloader setDestFolder(File destFolder) {
         this.destFolder = destFolder;
         return this;
     }
@@ -106,7 +102,7 @@ public class FileDownloader {
         return this;
     }
 
-    public FileDownloader setOnDownloadCompleted(RunnableArgs<String> onDownloadCompleted) {
+    public FileDownloader setOnDownloadCompleted(RunnableArgs<File> onDownloadCompleted) {
         this.onDownloadCompleted = onDownloadCompleted;
         return this;
     }

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

@@ -7,12 +7,15 @@ import java.lang.reflect.Modifier;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag;
 import it.integry.integrywmsnative.core.rest.deserializer.LocalDateDeserializer;
 import it.integry.integrywmsnative.core.rest.deserializer.LocalDateTimeDeserializer;
+import it.integry.integrywmsnative.core.rest.deserializer.MtbTcolFlagUiUlDeserializer;
 import it.integry.integrywmsnative.core.rest.deserializer.StatoPartitaMagDeserializer;
 import it.integry.integrywmsnative.core.rest.serializer.LocalDateSerializer;
 import it.integry.integrywmsnative.core.rest.serializer.LocalDateTimeSerializer;
+import it.integry.integrywmsnative.core.rest.serializer.MtbTcolFlagUiUlSerializer;
 import it.integry.integrywmsnative.core.rest.serializer.StatoPartitaMagSerializer;
 
 public class UtilityGson {
@@ -27,6 +30,8 @@ public class UtilityGson {
                 .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
                 .registerTypeAdapter(StatoPartitaMag.class, new StatoPartitaMagDeserializer())
                 .registerTypeAdapter(StatoPartitaMag.class, new StatoPartitaMagSerializer())
+                .registerTypeAdapter(MtbTCol.FlagUiUlEnum.class, new MtbTcolFlagUiUlDeserializer())
+                .registerTypeAdapter(MtbTCol.FlagUiUlEnum.class, new MtbTcolFlagUiUlSerializer())
                 .create();
     }
 

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

@@ -5,6 +5,8 @@ import android.text.Spanned;
 
 import androidx.annotation.StringRes;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -13,9 +15,101 @@ import java.util.regex.Pattern;
  */
 
 public class UtilityString {
+    private static final Map<String, String> DATE_FORMAT_REGEXPS = new HashMap<String, String>() {{
+
+        //-----------------------------------------------------------------------------------------
+        //giorno-mese-giorno
+        put("^\\d{1,2}/\\d{1,2}/\\d{4}$", "dd/MM/yyyy");
+        put("^\\d{1,2}\\.\\d{1,2}\\.\\d{4}$", "dd.MM.yyyy");
+        put("^\\d{1,2}-\\d{1,2}-\\d{4}$", "dd-MM-yyyy");
+
+        //anno-mese-giorno
+        put("^\\d{4}/\\d{1,2}/\\d{1,2}$", "yyyy/MM/dd");
+        put("^\\d{4}\\.\\d{1,2}\\.\\d{1,2}$", "yyyy.MM.dd");
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}$", "yyyy-MM-dd");
+
+
+        //-----------------------------------------------------------------------------------------
+        //senza spazi
+        put("^\\d{8}$", "yyyyMMdd");
+        put("^\\d{1,2}\\s[a-z]{3}\\s\\d{4}$", "dd MMM yyyy");
+        put("^\\d{1,2}\\s[a-z]{4,}\\s\\d{4}$", "dd MMMM yyyy");
+
+        put("^\\d{12}$", "yyyyMMddHHmm");
+        put("^\\d{8}\\s\\d{4}$", "yyyyMMdd HHmm");
+
+        put("^\\d{14}$", "yyyyMMddHHmmss");
+        put("^\\d{8}\\s\\d{6}$", "yyyyMMdd HHmmss");
+
+
+        //-----------------------------------------------------------------------------------------
+        //giorno-mese-anno hhmm
+        put("^\\d{1,2}/\\d{1,2}/\\d{4}\\s\\d{1,2}\\.\\d{2}$", "dd/MM/yyyy HH.mm");
+        put("^\\d{1,2}/\\d{1,2}/\\d{4}\\s\\d{1,2}:\\d{2}$", "dd/MM/yyyy HH:mm");
+
+        put("^\\d{1,2}\\.\\d{1,2}\\.\\d{4}\\s\\d{1,2}\\.\\d{2}$", "dd.MM.yyyy HH.mm");
+        put("^\\d{1,2}\\.\\d{1,2}\\.\\d{4}\\s\\d{1,2}:\\d{2}$", "dd.MM.yyyy HH:mm");
+
+        put("^\\d{1,2}-\\d{1,2}-\\d{4}\\s\\d{1,2}\\.\\d{2}$", "dd-MM-yyyy HH.mm");
+        put("^\\d{1,2}-\\d{1,2}-\\d{4}\\s\\d{1,2}:\\d{2}$", "dd-MM-yyyy HH:mm");
+
+        //anno-mese-giorno hhmm
+        put("^\\d{4}/\\d{1,2}/\\d{1,2}\\s\\d{1,2}\\.\\d{2}$", "yyyy/MM/dd HH.mm");
+        put("^\\d{4}/\\d{1,2}/\\d{1,2}\\s\\d{1,2}:\\d{2}$", "yyyy/MM/dd HH:mm");
+
+        put("^\\d{4}\\.\\d{1,2}\\.\\d{1,2}\\s\\d{1,2}\\.\\d{2}$", "yyyy.MM.dd HH.mm");
+        put("^\\d{4}\\.\\d{1,2}\\.\\d{1,2}\\s\\d{1,2}:\\d{2}$", "yyyy.MM.dd HH:mm");
+
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}\\.\\d{2}$", "yyyy-MM-dd HH.mm");
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{2}$", "yyyy-MM-dd HH:mm");
+
+
+        //-----------------------------------------------------------------------------------------
+        //giorno-mese-anno hhmmss
+        put("^\\d{1,2}/\\d{1,2}/\\d{4}\\s\\d{1,2}\\.\\d{2}\\.\\d{2}$", "dd/MM/yyyy HH.mm.ss");
+        put("^\\d{1,2}/\\d{1,2}/\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd/MM/yyyy HH:mm:ss");
+
+        put("^\\d{1,2}\\.\\d{1,2}\\.\\d{4}\\s\\d{1,2}\\.\\d{2}\\.\\d{2}$", "dd.MM.yyyy HH.mm.ss");
+        put("^\\d{1,2}\\.\\d{1,2}\\.\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd.MM.yyyy HH:mm:ss");
+
+        put("^\\d{1,2}-\\d{1,2}-\\d{4}\\s\\d{1,2}\\.\\d{2}\\.\\d{2}$", "dd-MM-yyyy HH.mm.ss");
+        put("^\\d{1,2}-\\d{1,2}-\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd-MM-yyyy HH:mm:ss");
+
+        //anno-mese-giorno hhmmss
+        put("^\\d{4}/\\d{1,2}/\\d{1,2}\\s\\d{1,2}\\.\\d{2}\\.\\d{2}$", "yyyy/MM/dd HH.mm.ss");
+        put("^\\d{4}/\\d{1,2}/\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}$", "yyyy/MM/dd HH:mm:ss");
+
+        put("^\\d{4}\\.\\d{1,2}\\.\\d{1,2}\\s\\d{1,2}\\.\\d{2}\\.\\d{2}$", "yyyy.MM.dd HH.mm.ss");
+        put("^\\d{4}\\.\\d{1,2}\\.\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}$", "yyyy.MM.dd HH:mm:ss");
+
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}\\.\\d{2}\\.\\d{2}$", "yyyy-MM-dd HH.mm.ss");
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}$", "yyyy-MM-dd HH:mm:ss");
+
+        //anno-mese-giorno hhmmssS
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{2}:\\d{2}.\\d{1,3}$", "yyyy-MM-dd HH:mm:ss.SSS");
+
+        //-----------------------------------------------------------------------------------------
+        //altri formati
+        put("^\\d{1,2}\\s[a-z]{3}\\s\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd MMM yyyy HH:mm:ss");
+        put("^\\d{1,2}\\s[a-z]{4,}\\s\\d{4}\\s\\d{1,2}:\\d{2}:\\d{2}$", "dd MMMM yyyy HH:mm:ss");
+
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}[T]\\d{1,2}:\\d{2}:\\d{2}$", "yyyy-MM-ddTHH:mm:ss");
+
+        put("^\\d{4}-\\d{1,2}-\\d{1,2}t\\d{1,2}:\\d{2}:\\d{2}.\\d{1,3}z$", "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        put("^(\\d{4})-(\\d{2})-(\\d{2})t(\\d{2}):(\\d{2}):(\\d{2})((\\+|-)(\\d{2}):(\\d{2}))$", "yyyy-MM-dd'T'HH:mm:ss");
+    }};
+
+    public static String determineDateFormat(String dateString) {
+        for (String regexp : DATE_FORMAT_REGEXPS.keySet()) {
+            if (dateString.toLowerCase().matches(regexp)) {
+                return DATE_FORMAT_REGEXPS.get(regexp);
+            }
+        }
+        return null; // Unknown format.
+    }
 
     public static boolean isNullOrEmpty(String stringToCheck){
-        return stringToCheck == null || stringToCheck.trim().length() == 0;
+        return stringToCheck == null || stringToCheck.trim().isEmpty();
     }
 
     public static String isNull(String stringToCheck, String alternativeString){
@@ -23,7 +117,7 @@ public class UtilityString {
     }
 
     public static String empty2null(String stringToCheck) {
-        return (stringToCheck == null || stringToCheck.trim().length() == 0) ? null : stringToCheck.trim();
+        return (stringToCheck == null || stringToCheck.trim().isEmpty()) ? null : stringToCheck.trim();
     }
 
     public static String capitalizeWords(String capString){

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,6 +35,7 @@ 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;
@@ -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;
@@ -82,8 +89,9 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     private ActivityAccettazioneBollaPickingBinding mBindings;
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
-
+    
-
+    private final AccettazioneBollaPickingFilterViewModel mAppliedFilterViewModel = new AccettazioneBollaPickingFilterViewModel();
+    
     private final ObservableArrayList<AccettazioneBollaPickingListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
     public BindableBoolean noItemsToPick = new BindableBoolean(false);
@@ -150,10 +158,10 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
-//        this.initFilters();
+        this.initFilters();
         this.initFab();
 
-        boolean useQtaBolla = SettingsManager.iDB().isFlagAccettazioneUseQtaOrd();
+        boolean useQtaBolla = SettingsManager.iDB().isFlagAccettazioneBollaUseQtaOrd();
 
         mViewModel.setListeners(this);
         mViewModel.init(
@@ -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,
@@ -221,7 +298,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         fabPopupMenu.setForceShowIcon(true);
         fabPopupMenu.getMenuInflater().inflate(R.menu.accettazione_ordine_inevaso_fab_menu, fabPopupMenu.getMenu());
 
-        fabPopupMenu.getMenu().findItem(R.id.show_created_ul).setVisible(SettingsManager.iDB().isFlagAllowULRecoverAccettazioneBolla());
+        fabPopupMenu.getMenu().findItem(R.id.show_created_ul).setVisible(SettingsManager.iDB().isFlagAccettazioneBollaAllowULRecover());
 
         fabPopupMenu.setOnMenuItemClickListener(item -> {
             int itemId = item.getItemId();
@@ -246,13 +323,13 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         runOnUiThread(() -> {
             List<PickingObjectDTO> tmpList;
 
-//            if (mAppliedFilterViewModel != null) {
+            if (mAppliedFilterViewModel != null) {
-//                mAppliedFilterViewModel.applyAllTests();
+                mAppliedFilterViewModel.applyAllTests();
-//                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-//            } else {
+            } else {
             tmpList = mViewModel.getPickingList().getValue();
-//            }
+            }
-//
+
             var list = convertDataModelToListModel(tmpList);
 
             this.mAccettazioneMutableData.clear();
@@ -526,7 +603,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(true)
                 .setCanOverflowOrderQuantity(canOverflowQuantity)
-                .setDisableTracciabilitaCheck(SettingsManager.iDB().isFlagDisableMandatoryTracciabilitaAccettazioneBolla());
+                .setDisableTracciabilitaCheck(SettingsManager.iDB().isFlagAccettazioneBollaDisableMandatoryTracciabilita());
 
         if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View

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

@@ -356,7 +356,7 @@ public class AccettazioneBollaPickingViewModel {
 
 
     private void manageUnknownBarcode(String barcode, Runnable onComplete) {
-        if (SettingsManager.iDB().isFlagCanAddUnknownBarcodesAccettazioneBolla()) {
+        if (SettingsManager.iDB().isFlagAccettazioneBollaCanAddUnknownBarcodes()) {
             //TODO: Implementare popup che richiede delle note aggiuntive sul barcode scansionato
             this.sendOnUnknownBarcodeScanned(barcode, notes -> {
                 this.manageDispatchBollaRow(new PickingObjectDTO()
@@ -376,7 +376,7 @@ public class AccettazioneBollaPickingViewModel {
 
 
     private void manageNoArtFound(MtbAart mtbAart, PickDataDTO pickDataDTO) {
-        if (SettingsManager.iDB().isFlagCanAddUnknownItemsAccettazioneBolla()) {
+        if (SettingsManager.iDB().isFlagAccettazioneBollaCanAddUnknownItems()) {
 
             this.manageDispatchBollaRow(new PickingObjectDTO()
                     .setMtbAart(mtbAart)
@@ -410,7 +410,7 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     private void manageInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
-        if (!SettingsManager.iDB().isFlagAskTipoColloAccettazioneBolla()) {
+        if (!SettingsManager.iDB().isFlagAccettazioneBollaAskTipoCollo()) {
             onComplete.run(null, null);
             return;
         }
@@ -420,15 +420,15 @@ public class AccettazioneBollaPickingViewModel {
 
     public void manageDispatchBollaRow(final PickingObjectDTO pickingObjectDTO) {
         String partitaMag = null;
-        if(pickingObjectDTO.getTempPickData() != null){
+        if (pickingObjectDTO.getTempPickData() != null) {
-            if(pickingObjectDTO.getTempPickData().getManualPickDTO() != null){
+            if (pickingObjectDTO.getTempPickData().getManualPickDTO() != null) {
-                if(pickingObjectDTO.getTempPickData().getManualPickDTO().getMtbPartitaMag() != null){
+                if (pickingObjectDTO.getTempPickData().getManualPickDTO().getMtbPartitaMag() != null) {
                     partitaMag = pickingObjectDTO.getTempPickData().getManualPickDTO().getMtbPartitaMag().getPartitaMag();
                 }
             }
         }
 
-        if (SettingsManager.iDB().isFlagEnableFastPickAccettazioneBolla()) {
+        if (SettingsManager.iDB().isFlagAccettazioneBollaEnableFastPick()) {
             this.saveNewRow(pickingObjectDTO,
                     BigDecimal.ONE,
                     pickingObjectDTO.getMtbAart().getQtaCnf(),
@@ -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();
@@ -550,11 +554,15 @@ public class AccettazioneBollaPickingViewModel {
             initialQtaTot = mtbAart.getQtaCnf();
         }
 
-        if (!this.mUseQtaBolla &&
+        if (!this.mUseQtaBolla) {
-                UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) &&
+            if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) &&
-                UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
+                    UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
-            initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
+                initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
-            initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
+                initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
+            } else if(UtilityBigDecimal.greaterThan(initialNumCnf, BigDecimal.ONE) && pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
+                initialNumCnf = BigDecimal.ONE;
+                initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
+            }
         }
 
         if (dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) {
@@ -574,36 +582,48 @@ public class AccettazioneBollaPickingViewModel {
             }
         }
 
-        this.sendOnItemDispatched(
+        if (!longClick){
-                pickingObjectDTO,
+            this.sendOnItemDispatched(
-                pickingObjectDTO.getMtbAart(),
+                    pickingObjectDTO,
-                initialNumCnf, initialQtaCnf, initialQtaTot,
+                    pickingObjectDTO.getMtbAart(),
-                qtaDaEvadere,
+                    initialNumCnf, initialQtaCnf, initialQtaTot,
-                numCnfDaEvadere,
+                    qtaDaEvadere,
-                qtaCnfDaEvadere,
+                    numCnfDaEvadere,
-                qtaColDaPrelevare,
+                    qtaCnfDaEvadere,
-                numCnfDaPrelevare,
+                    qtaColDaPrelevare,
-                qtaCnfDaPrelevare,
+                    numCnfDaPrelevare,
-                null,
+                    qtaCnfDaPrelevare,
-                null,
+                    null,
-                null,
+                    null,
-                partitaMag,
+                    null,
-                dataScad,
+                    partitaMag,
-                true,
+                    dataScad,
-                (pickedQuantityDTO, shouldCloseLU) -> {
+                    true,
-                    this.saveNewRow(pickingObjectDTO,
+                    (pickedQuantityDTO, shouldCloseLU) -> {
-                            pickedQuantityDTO.getNumCnf(),
+                        this.saveNewRow(pickingObjectDTO,
-                            pickedQuantityDTO.getQtaCnf(),
+                                pickedQuantityDTO.getNumCnf(),
-                            pickedQuantityDTO.getQtaTot(),
+                                pickedQuantityDTO.getQtaCnf(),
-                            pickedQuantityDTO.getPartitaMag(),
+                                pickedQuantityDTO.getQtaTot(),
-                            pickedQuantityDTO.getDataScad(),
+                                pickedQuantityDTO.getPartitaMag(),
-                            shouldCloseLU);
+                                pickedQuantityDTO.getDataScad(),
-                });
+                                shouldCloseLU);
+                    });
+        } else {
+            this.saveNewRow(
+                    pickingObjectDTO,
+                    initialNumCnf,
+                    initialQtaCnf,
+                    initialQtaTot,
+                    partitaMag,
+                    dataScad,
+                    false);
+        }
 
     }
 
 
-    public void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
+    public void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal
+            qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
         if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
             resetMatchedRows();
 
@@ -691,7 +711,8 @@ public class AccettazioneBollaPickingViewModel {
                 });
     }
 
-    private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
+    private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal
+            qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) {
         this.sendOnLoadingStarted();
 
         MtbColr mtbColrClone = (MtbColr) mtbColrToUpdate.clone();
@@ -802,7 +823,7 @@ public class AccettazioneBollaPickingViewModel {
 
     private void manageVersamentoAutomatico(Runnable onComplete) {
 
-        if (!SettingsManager.iDB().isFlagAskVersamentoAutomaticoAccettazioneBolla()) {
+        if (!SettingsManager.iDB().isFlagAccettazioneBollaAskVersamentoAutomatico()) {
             onComplete.run();
             return;
         }
@@ -825,7 +846,7 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     private void managePrintCollo(Runnable onComplete) {
-        if (!mCurrentMtbColt.getDisablePrint() || !SettingsManager.iDB().isFlagAskPrintUlAccettazioneBolla()) {
+        if (!mCurrentMtbColt.getDisablePrint() || !SettingsManager.iDB().isFlagAccettazioneBollaAskPrintUl()) {
             onComplete.run();
             return;
         }
@@ -998,12 +1019,14 @@ public class AccettazioneBollaPickingViewModel {
         if (this.mListener != null) mListener.onMtbColrDeleteRequest(onComplete);
     }
 
-    private void notifyVersamentoAutomaticoResult(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
+    private void notifyVersamentoAutomaticoResult(VersamentoAutomaticoULResponseDTO
+                                                          versamentoAutomaticoULResponseDTO, Runnable onComplete) {
         if (this.mListener != null)
             mListener.onULVersata(versamentoAutomaticoULResponseDTO, onComplete);
     }
 
-    private void sendOnUnknownBarcodeScanned(String barocde, RunnableArgs<String> onComplete, Runnable onAbort) {
+    private void sendOnUnknownBarcodeScanned(String
+                                                     barocde, RunnableArgs<String> onComplete, Runnable onAbort) {
         if (this.mListener != null)
             mListener.onUnknownBarcodeScanned(barocde, onComplete, onAbort);
     }

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

@@ -33,6 +33,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 {
 
@@ -75,6 +76,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) {
@@ -101,7 +105,9 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
     public void onBindItemViewHolder(final AccettazioneBollaPickingListAdapter.SingleItemViewHolder holder, final int position) {
         AccettazioneBollaPickingListModel pickingObjectDTO = this.mDataset.get(position);
 
-        if (pickingObjectDTO.getQtaEvasa().subtract(pickingObjectDTO.getQtaTot()).floatValue() >= 0) {
+        if (pickingObjectDTO.getQtaEvasa().subtract(pickingObjectDTO.getQtaTot()).floatValue() > 0) {
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.blue_100));
+        } else if (pickingObjectDTO.getQtaEvasa().subtract(pickingObjectDTO.getQtaTot()).floatValue() == 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.green_500_with_alpha));
         } else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
@@ -158,6 +164,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;
@@ -78,6 +79,7 @@ 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.tracciamento_imballi.DialogTracciamentoImballiView;
 import it.integry.integrywmsnative.view.dialogs.versamento_automatico_ul_done.DialogVersamentoAutomaticoULDoneView;
 
 public class AccettazioneOrdiniPickingActivity extends BaseActivity implements AccettazioneOrdiniPickingViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
@@ -151,28 +153,30 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         boolean useQtaOrd = SettingsManager.iDB().isFlagAccettazioneUseQtaOrd();
 
         mViewModel.setListeners(this);
-        mViewModel.init(
+        mViewModel.init(mOrders, mSitArts, useQtaOrd);
-                mOrders,
-                mSitArts,
-                useQtaOrd);
     }
 
     private void initFab() {
-        fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab,
+        fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab, (Gravity.END | Gravity.BOTTOM), androidx.appcompat.R.attr.popupMenuStyle, com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
-                (Gravity.END | Gravity.BOTTOM),
-                androidx.appcompat.R.attr.popupMenuStyle,
-                com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
 
         fabPopupMenu.setForceShowIcon(true);
         fabPopupMenu.getMenuInflater().inflate(R.menu.accettazione_ordine_inevaso_fab_menu, fabPopupMenu.getMenu());
 
+        if (!SettingsManager.iDB().isFlagTracciamentoImballiCaricoEnabled())
+            fabPopupMenu.getMenu().removeItem(R.id.track_packaging);
+
         fabPopupMenu.setOnMenuItemClickListener(item -> {
             int itemId = item.getItemId();
 
             if (itemId == R.id.show_created_ul) {
                 showCreatedUL();
+                return true;
+            } else if (itemId == R.id.track_packaging) {
+                trackPackaging();
+                return true;
             } else if (itemId == R.id.create_ul) {
                 createNewLU();
+                return true;
             }
 
             return false;
@@ -192,17 +196,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged);
         mAppliedFilterViewModel.getCurrentPosPredicate().addOnPropertyChangedCallback(onPredicateChanged);
 
-        List<FilterChipDTO> filterList = Stream.of(AccettazioneOrdiniPickingBindings.AVAILABLE_FILTERS.entrySet())
+        List<FilterChipDTO> filterList = Stream.of(AccettazioneOrdiniPickingBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
-                .map(Map.Entry::getValue)
-                .sortBy(FilterChipDTO::getPosizione)
-                .toList();
 
         for (FilterChipDTO filterChipDTO : filterList) {
 
-            FilterChipView filterChipView = new FilterChipView(
+            FilterChipView filterChipView = new FilterChipView(this, filterChipDTO.getFilterChipText(), v -> initBottomSheetDialogFilter(filterChipDTO));
-                    this,
-                    filterChipDTO.getFilterChipText(),
-                    v -> initBottomSheetDialogFilter(filterChipDTO));
 
             switch (filterChipDTO.getID()) {
                 case AccettazioneOrdiniPickingBindings.COD_ART_FILTER_ID -> {
@@ -280,52 +278,20 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
 
-        filterChipDTO
+        filterChipDTO.getFilterLayoutView().setFilterName(filterChipDTO.getFilterChipText()).setContext(this);
-                .getFilterLayoutView()
-                .setFilterName(filterChipDTO.getFilterChipText())
-                .setContext(this);
 
-        var filterLayoutView = filterChipDTO
+        var filterLayoutView = filterChipDTO.getFilterLayoutView();
-                .getFilterLayoutView();
 
         switch (filterChipDTO.getID()) {
             case AccettazioneOrdiniPickingBindings.COD_ART_FILTER_ID ->
-                    ((FilterCodArtLayoutView) filterLayoutView)
+                    ((FilterCodArtLayoutView) filterLayoutView).setAll(mAppliedFilterViewModel.getAllCodArts()).setAvailable(mAppliedFilterViewModel.getAvailableCodArts()).setOnFilterApplied(mAppliedFilterViewModel::setCodArtFilter).setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue())).filter(mAppliedFilterViewModel.getCurrentCodArtPredicate().get() == null ? x -> false : mAppliedFilterViewModel.getCurrentCodArtPredicate().get()).map(x -> x.getSitArtOrdDTO().getCodMart()).toList());
-                            .setAll(mAppliedFilterViewModel.getAllCodArts())
-                            .setAvailable(mAppliedFilterViewModel.getAvailableCodArts())
-                            .setOnFilterApplied(mAppliedFilterViewModel::setCodArtFilter)
-                            .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
-                                    .filter(mAppliedFilterViewModel.getCurrentCodArtPredicate().get() == null ?
-                                            x -> false :
-                                            mAppliedFilterViewModel.getCurrentCodArtPredicate().get())
-                                    .map(x -> x.getSitArtOrdDTO().getCodMart())
-                                    .toList());
             case AccettazioneOrdiniPickingBindings.DESCR_FILTER_ID ->
-                    ((FilterDescrLayoutView) filterLayoutView)
+                    ((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 : mAppliedFilterViewModel.getCurrentDescrPredicate().get()).map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt()).toList());
-                            .setAll(mAppliedFilterViewModel.getAllDescrs())
-                            .setAvailable(mAppliedFilterViewModel.getAvailableDescrs())
-                            .setOnFilterApplied(mAppliedFilterViewModel::setDescrFilter)
-                            .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
-                                    .filter(mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null ?
-                                            x -> false :
-                                            mAppliedFilterViewModel.getCurrentDescrPredicate().get())
-                                    .map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt())
-                                    .toList());
             case AccettazioneOrdiniPickingBindings.POS_FILTER_ID ->
-                    ((FilterPosizioneLayoutView) filterLayoutView)
+                    ((FilterPosizioneLayoutView) filterLayoutView).setAll(mAppliedFilterViewModel.getAllPos()).setAvailable(mAppliedFilterViewModel.getAvailablePos()).setOnFilterApplied(mAppliedFilterViewModel::setPosFilter).setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue())).filter(mAppliedFilterViewModel.getCurrentPosPredicate().get() == null ? x -> false : mAppliedFilterViewModel.getCurrentPosPredicate().get()).map(x -> x.getMtbAart().getPosizione()).toList());
-                            .setAll(mAppliedFilterViewModel.getAllPos())
-                            .setAvailable(mAppliedFilterViewModel.getAvailablePos())
-                            .setOnFilterApplied(mAppliedFilterViewModel::setPosFilter)
-                            .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
-                                    .filter(mAppliedFilterViewModel.getCurrentPosPredicate().get() == null ?
-                                            x -> false :
-                                            mAppliedFilterViewModel.getCurrentPosPredicate().get())
-                                    .map(x -> x.getMtbAart().getPosizione())
-                                    .toList());
         }
 
-        if (!filterLayoutView.isAdded())
+        if (!filterLayoutView.isAdded()) filterLayoutView.show(getSupportFragmentManager(), "TAG");
-            filterLayoutView.show(getSupportFragmentManager(), "TAG");
     }
 
     @Override
@@ -374,9 +340,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     }
 
     private void initBarcodeReader() {
-        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO().setOnScanSuccessful(onScanSuccessful).setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
-                .setOnScanSuccessful(onScanSuccessful)
-                .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
     }
 
     private void initRecyclerView() {
@@ -417,9 +381,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     }
 
     private List<AccettazioneOrdiniPickingListModel> convertDataModelToListModel(List<PickingObjectDTO> dataList) {
-        List<PickingObjectDTO> tmpList = Stream.of(dataList)
+        List<PickingObjectDTO> tmpList = Stream.of(dataList).filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO)).toList();
-                .filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO))
-                .toList();
 
         return switch (mCurrentOrderBy) {
             case COD_ART_FOR -> convertDataModelToListModel__CodArtForn(tmpList);
@@ -430,133 +392,118 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     private List<AccettazioneOrdiniPickingListModel> convertDataModelToListModel__CodArtForn(List<PickingObjectDTO> dataList) {
         ArrayList<AccettazioneOrdiniPickingListModel> list = new ArrayList<>();
-        Stream.of(dataList)
+        Stream.of(dataList).sortBy(x -> UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa())).forEach(x -> {
-                .sortBy(x -> UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) +
+            AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                        (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()))
+            accettazioneOrdiniPickingListModel.setActive(true);
-                .forEach(x -> {
-                    AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                    accettazioneOrdiniPickingListModel.setActive(true);
 
-                    accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) +
+            accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
-                            (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
 
-                    accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+            accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
-                    accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+            accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
-                    accettazioneOrdiniPickingListModel.setSubDescrizione1("Consegna: " + UtilityDate.formatDate(x.getSitArtOrdDTO().getDataCons(), UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH));
+            accettazioneOrdiniPickingListModel.setSubDescrizione1("Consegna: " + UtilityDate.formatDate(x.getSitArtOrdDTO().getDataCons(), UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH));
 
-                    accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+            accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
-                    if (x.getMtbAart() != null)
+            if (x.getMtbAart() != null)
-                        accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
+                accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
 
-                    //Calc Num CNF
+            //Calc Num CNF
-                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+            BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getNumCnf)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
-                    //Calc qta col
+            //Calc qta col
-                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+            BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getQtaCol)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
 
-                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+            if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
-                    } else {
+            } else {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
-                    }
+            }
 
-                    accettazioneOrdiniPickingListModel.setOriginalModel(x);
+            accettazioneOrdiniPickingListModel.setOriginalModel(x);
 
-                    list.add(accettazioneOrdiniPickingListModel);
+            list.add(accettazioneOrdiniPickingListModel);
-                });
+        });
 
         return list;
     }
 
     private List<AccettazioneOrdiniPickingListModel> convertDataModelToListModel__DescrArt(List<PickingObjectDTO> dataList) {
         ArrayList<AccettazioneOrdiniPickingListModel> list = new ArrayList<>();
-        Stream.of(dataList)
+        Stream.of(dataList).sortBy(x -> x.getMtbAart().getDescrizioneEstesa()).forEach(x -> {
-                .sortBy(x -> x.getMtbAart().getDescrizioneEstesa())
+            AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                .forEach(x -> {
+            accettazioneOrdiniPickingListModel.setActive(true);
-                    AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                    accettazioneOrdiniPickingListModel.setActive(true);
 
-                    accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart())
+            accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
-                            + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
 
-                    accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+            accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
-                    accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+            accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
-                    accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+            accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
-                    if (x.getMtbAart() != null)
+            if (x.getMtbAart() != null)
-                        accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
+                accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
 
-                    //Calc Num CNF
+            //Calc Num CNF
-                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+            BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getNumCnf)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
-                    //Calc qta col
+            //Calc qta col
-                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+            BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getQtaCol)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
 
-                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+            if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
-                    } else {
+            } else {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
-                    }
+            }
 
-                    accettazioneOrdiniPickingListModel.setOriginalModel(x);
+            accettazioneOrdiniPickingListModel.setOriginalModel(x);
 
-                    list.add(accettazioneOrdiniPickingListModel);
+            list.add(accettazioneOrdiniPickingListModel);
-                });
+        });
 
         return list;
     }
@@ -564,136 +511,122 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     private List<AccettazioneOrdiniPickingListModel> convertDataModelToListModel__RagSocCom(List<PickingObjectDTO> dataList) {
         ArrayList<AccettazioneOrdiniPickingListModel> list = new ArrayList<>();
 
-        Stream.of(dataList)
+        Stream.of(dataList).filter(x -> !UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) && !x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)).sortBy(x -> x.getSitArtOrdDTO().getDescrizioneCommessa()).forEach(x -> {
-                .filter(x -> !UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) && !x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG))
+            AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                .sortBy(x -> x.getSitArtOrdDTO().getDescrizioneCommessa())
+            accettazioneOrdiniPickingListModel.setActive(true);
-                .forEach(x -> {
-                    AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                    accettazioneOrdiniPickingListModel.setActive(true);
 
-                    accettazioneOrdiniPickingListModel.setGroupTitle(x.getSitArtOrdDTO().getCodJcom() + (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) ? " - " + x.getSitArtOrdDTO().getDescrizioneCommessa() : ""));
+            accettazioneOrdiniPickingListModel.setGroupTitle(x.getSitArtOrdDTO().getCodJcom() + (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) ? " - " + x.getSitArtOrdDTO().getDescrizioneCommessa() : ""));
 
-                    accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
+            accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
-                    accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+            accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
-                    //Calc Num CNF
+            //Calc Num CNF
-                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+            BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getNumCnf)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
-                    //Calc qta col
+            //Calc qta col
-                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+            BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getQtaCol)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
 
-                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+            if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
-                    } else {
+            } else {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
-                    }
+            }
 
-                    accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneEstesaOrd());
+            accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneEstesaOrd());
 
-                    if (x.getMtbAart() != null) {
+            if (x.getMtbAart() != null) {
-                        accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
+                accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
-                    }
+            }
 
-                    accettazioneOrdiniPickingListModel.setOriginalModel(x);
+            accettazioneOrdiniPickingListModel.setOriginalModel(x);
 
-                    list.add(accettazioneOrdiniPickingListModel);
+            list.add(accettazioneOrdiniPickingListModel);
-                });
+        });
 
-        Stream.of(dataList)
+        Stream.of(dataList).filter(x -> UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) || x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)).forEach(x -> {
-                .filter(x -> UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) || x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG))
+            AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                .forEach(x -> {
+            accettazioneOrdiniPickingListModel.setActive(true);
-                    AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
-                    accettazioneOrdiniPickingListModel.setActive(true);
 
-                    accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+            accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
 
-                    accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
+            accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
-                    accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+            accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
 
-                    //Calc Num CNF
+            //Calc Num CNF
-                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+            BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getNumCnf)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
-                    //Calc qta col
+            //Calc qta col
-                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+            BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if (x.getWithdrawMtbColrs().size() > 0) {
+            if (x.getWithdrawMtbColrs().size() > 0) {
-                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                .map(MtbColr::getQtaCol)
+            }
-                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    }
 
 
-                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+            if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
-                    } else {
+            } else {
-                        accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+                accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
-                        accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
-                        if (x.getMtbAart() != null)
+                if (x.getMtbAart() != null)
-                            accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+                    accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
 
-                        accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+                accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
-                        accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
-                        accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
-                    }
+            }
 
 
-                    if (x.getMtbAart() != null) {
+            if (x.getMtbAart() != null) {
-                        accettazioneOrdiniPickingListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
+                accettazioneOrdiniPickingListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
-                        accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+                accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
-                    }
+            }
 
-                    accettazioneOrdiniPickingListModel.setOriginalModel(x);
+            accettazioneOrdiniPickingListModel.setOriginalModel(x);
 
-                    list.add(accettazioneOrdiniPickingListModel);
+            list.add(accettazioneOrdiniPickingListModel);
-                });
+        });
 
         return list;
     }
 
     private boolean isThereAnyItemToPick(List<PickingObjectDTO> dataList) {
-        return Stream.of(dataList)
+        return Stream.of(dataList).anyMatch(x -> !x.isHidden());
-                .anyMatch(x -> !x.isHidden());
     }
 
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
@@ -718,20 +651,26 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         });
     }
 
+    public void trackPackaging() {
+        this.fabPopupMenu.dismiss();
+
+        DialogTracciamentoImballiView.newInstance(data -> {
+            if (data != null && !data.isEmpty())
+                mViewModel.registraImballi(data);
+        }).show(getSupportFragmentManager(), DialogTracciamentoImballiView.class.getName());
+    }
+
+
     public void showCreatedUL() {
         this.fabPopupMenu.dismiss();
         this.mViewModel.retrieveExistentLU(this::startListaBancaliRegistratiActivity);
     }
 
     private void showOrderByDialog() {
-        AlertDialog dialog = new AlertDialog.Builder(this)
+        AlertDialog dialog = new AlertDialog.Builder(this).setTitle(this.getText(R.string.action_orderBy)).setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(), (dialog12, which) -> {
-                .setTitle(this.getText(R.string.action_orderBy))
+            mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
-                .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(), (dialog12, which) -> {
+            SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which);
-                    mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
+        }).setPositiveButton(getText(R.string.ok), (dialog1, which) -> this.refreshList()).create();
-                    SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which);
-                })
-                .setPositiveButton(getText(R.string.ok), (dialog1, which) -> this.refreshList())
-                .create();
         dialog.show();
     }
 
@@ -739,14 +678,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
         Intent myIntent = ListaBancaliActivity.createIntent(this,
 
-                Stream.of(mtbColts)
+                Stream.of(mtbColts).map(AlreadyRegisteredUDCDTO::getMtbColt).toList(),
-                        .map(AlreadyRegisteredUDCDTO::getMtbColt)
-                        .toList(),
 
-                input -> Stream.of(mtbColts)
+                input -> Stream.of(mtbColts).filter(x -> x.getMtbColt() == input).findFirstOrElse(null).isCanBeRecovered(),
-                        .filter(x -> x.getMtbColt() == input)
-                        .findFirstOrElse(null)
-                        .isCanBeRecovered(),
 
                 ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
 
@@ -757,9 +691,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     public void onLUSuccessullyPrinted() {
         Resources res = getResources();
         String errorMessage = res.getText(R.string.alert_print_completed_message).toString();
-        DialogSimpleMessageView
+        DialogSimpleMessageView.makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(getSupportFragmentManager(), "tag");
-                .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null)
-                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -769,13 +701,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     @Override
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.onLoadingEnded();
-        DialogSimpleMessageView.makeErrorDialog(
+        DialogSimpleMessageView.makeErrorDialog(new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, onComplete).show(getSupportFragmentManager(), "tag");
-                        new SpannableString(ex.getMessage()),
-                        null,
-                        null,
-                        R.string.button_ignore_print,
-                        onComplete)
-                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -795,20 +721,12 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete) {
-        runOnUiThread(() -> {
+        DialogAskShouldVersamentoAutomaticoULView.newInstance(onComplete).show(getSupportFragmentManager(), "tag");
-            DialogAskShouldVersamentoAutomaticoULView.newInstance(onComplete)
-                    .show(getSupportFragmentManager(), "tag");
-        });
     }
 
     @Override
     public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
-//        runOnUiThread(() -> {
+        DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded).show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
-//            DialogInfoAggiuntiveLU.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
-//        });
-
-        DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded)
-                .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
 
     @Override
@@ -824,43 +742,25 @@ 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()
+        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);
-                .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);
 
         if (!mDialogInputQuantityV2View.isVisible())
-            mDialogInputQuantityV2View
+            mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO).setOnComplete((resultDTO, shouldCloseLU) -> {
-                    .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO().setNumCnf(resultDTO.getNumCnf()).setQtaCnf(resultDTO.getQtaCnf()).setQtaTot(resultDTO.getQtaTot()).setPartitaMag(resultDTO.getPartitaMag()).setDataScad(resultDTO.getDataScad());
-                    .setOnComplete((resultDTO, shouldCloseLU) -> {
+                onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                        PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+            }).setOnAbort(() -> this.mViewModel.resetMatchedRows()).show(getSupportFragmentManager(), "tag");
-                                .setNumCnf(resultDTO.getNumCnf())
-                                .setQtaCnf(resultDTO.getQtaCnf())
-                                .setQtaTot(resultDTO.getQtaTot())
-                                .setPartitaMag(resultDTO.getPartitaMag())
-                                .setDataScad(resultDTO.getDataScad());
-                        onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                    })
-                    .setOnAbort(() -> this.mViewModel.resetMatchedRows())
-                    .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -894,9 +794,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     public void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
 
         runOnUiThread(() -> {
-            DialogVersamentoAutomaticoULDoneView
+            DialogVersamentoAutomaticoULDoneView.newInstance(versamentoAutomaticoULResponseDTO, onComplete).show(getSupportFragmentManager(), "tag");
-                    .newInstance(versamentoAutomaticoULResponseDTO, onComplete)
-                    .show(getSupportFragmentManager(), "tag");
         });
 
     }
@@ -905,11 +803,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
         runOnUiThread(() -> {
             String text = getResources().getString(R.string.alert_delete_mtb_colr);
-            DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
+            DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false)).show(getSupportFragmentManager(), "tag");
-                    null,
-                    () -> onComplete.run(true),
-                    () -> onComplete.run(false)
-            ).show(getSupportFragmentManager(), "tag");
         });
     }
 
@@ -925,15 +819,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onLUClosed() {
-        runOnUiThread(() -> {
+        noLUPresent.set(true);
-            noLUPresent.set(true);
+        this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
-            this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
+        this.refreshList();
 
-
+        if (this.mShouldCloseActivity) super.onBackPressed();
-            this.refreshList();
-
-            if (this.mShouldCloseActivity) super.onBackPressed();
-        });
     }
 
     @Override

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

@@ -8,7 +8,7 @@ import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliAccettazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.rest.AccettazioneOrdiniPickingRESTConsumer;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
@@ -31,18 +31,19 @@ public class AccettazioneOrdiniPickingModule {
             ArticoloRESTConsumer articoloRESTConsumer,
             BarcodeRESTConsumer barcodeRESTConsumer,
             ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-            PrinterRESTConsumer printerRESTConsumer,
             AccettazioneOrdiniPickingRESTConsumer accettazioneOrdiniPickingRESTConsumer,
             ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer,
             ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
-            Ean128Service ean128Service) {
+            Ean128Service ean128Service,
+            ImballiRESTConsumer imballiRESTConsumer) {
         return new AccettazioneOrdiniPickingViewModel(articoloRESTConsumer,
                 barcodeRESTConsumer,
                 colliMagazzinoRESTConsumer,
-                printerRESTConsumer,
                 accettazioneOrdiniPickingRESTConsumer,
                 colliAccettazioneRESTConsumer,
-                colliLavorazioneRESTConsumer, ean128Service);
+                colliLavorazioneRESTConsumer,
+                ean128Service,
+                imballiRESTConsumer);
     }
 
 }

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

@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -40,11 +41,12 @@ import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliAccettazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliCaricoRESTConsumerInterface;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestOrderDTO;
@@ -66,17 +68,18 @@ import it.integry.integrywmsnative.gest.accettazione_ordini_picking.rest.Accetta
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.NotCurrentYearLUException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO;
 
 public class AccettazioneOrdiniPickingViewModel {
 
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final BarcodeRESTConsumer mBarcodeRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
-    private final PrinterRESTConsumer mPrinterRESTConsumer;
     private final AccettazioneOrdiniPickingRESTConsumer mAccettazioneOrdiniPickingRESTConsumer;
     private final ColliAccettazioneRESTConsumer mColliAccettazioneRESTConsumer;
     private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer;
     private final Ean128Service mEan128Service;
+    private final ImballiRESTConsumer mImballiRESTConsumer;
 
     private ColliCaricoRESTConsumerInterface mColliCaricoRESTConsumer;
 
@@ -88,6 +91,7 @@ public class AccettazioneOrdiniPickingViewModel {
 
     private MtbColt mCurrentMtbColt = null;
     private GestioneEnum defaultGestioneOfUL = null;
+    private String foundCodAnag = null;
 
     private final List<HistoryMtbAartDTO> mHistoryUsedAarts = new ArrayList<>();
 
@@ -95,19 +99,19 @@ public class AccettazioneOrdiniPickingViewModel {
     public AccettazioneOrdiniPickingViewModel(ArticoloRESTConsumer articoloRESTConsumer,
                                               BarcodeRESTConsumer barcodeRESTConsumer,
                                               ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                              PrinterRESTConsumer printerRESTConsumer,
                                               AccettazioneOrdiniPickingRESTConsumer accettazioneOrdiniPickingRESTConsumer,
                                               ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer,
                                               ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
-                                              Ean128Service ean128Service) {
+                                              Ean128Service ean128Service,
+                                              ImballiRESTConsumer imballiRESTConsumer) {
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
-        this.mPrinterRESTConsumer = printerRESTConsumer;
         this.mAccettazioneOrdiniPickingRESTConsumer = accettazioneOrdiniPickingRESTConsumer;
         this.mColliAccettazioneRESTConsumer = colliAccettazioneRESTConsumer;
         this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
         this.mEan128Service = ean128Service;
+        this.mImballiRESTConsumer = imballiRESTConsumer;
     }
 
 
@@ -131,6 +135,15 @@ public class AccettazioneOrdiniPickingViewModel {
                 .findFirst()
                 .get();
 
+        //Definizione codAnag
+        var codAnagsOrd = mOrders.stream()
+                .map(OrdineAccettazioneInevasoDTO::getCodAnagOrd)
+                .distinct()
+                .collect(Collectors.toList());
+
+        if(codAnagsOrd.size() == 1) foundCodAnag = codAnagsOrd.get(0);
+
+
         //Definizione della gestione collo di default
         List<GestioneEnum> foundGestioni = Stream.of(mOrders)
                 .map(OrdineAccettazioneInevasoDTO::getGestioneEnum)
@@ -214,7 +227,7 @@ public class AccettazioneOrdiniPickingViewModel {
                 //dell'etichetta anonima
                 this.executeEtichettaAnonimaNotOpenedLU(barcodeScanDTO, onComplete);
             } else {
-                if (SettingsManager.iDB().isFlagAllowBarcodeFornitore() && UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
+                if (SettingsManager.iDB().isFlagAccettazioneAllowBarcodeFornitore() && UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
                     this.executeSSCCFornitore(barcodeScanDTO, onComplete);
                 } else {
                     this.processBarcodeNotOpenedLU(barcodeScanDTO, null, onComplete);
@@ -234,8 +247,14 @@ public class AccettazioneOrdiniPickingViewModel {
         try {
             Ean128Model ean128Model = mEan128Service.decode(barcodeScanDTO);
 
-            //Nel caso trovo un SSCC lo aggiungo
+            mColliAccettazioneRESTConsumer.checkBarcodeUl(ean128Model.Sscc, result -> {
-            this.processBarcodeNotOpenedLU(barcodeScanDTO, ean128Model.Sscc, onComplete);
+                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);
@@ -275,7 +294,7 @@ public class AccettazioneOrdiniPickingViewModel {
                 null,
                 false,
                 () -> {
-                    if(UtilityString.isNullOrEmpty(customSSCC))
+                    if (UtilityString.isNullOrEmpty(customSSCC))
                         processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete);
                     else onComplete.run();
                 });
@@ -537,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) {
@@ -767,9 +786,6 @@ public class AccettazioneOrdiniPickingViewModel {
                         } else {
                             postCloseOperations();
                         }
-
-                        this.sendLUClosed();
-                        this.sendOnLoadingEnded();
                     };
 
                     sendVersamentoAutomaticoULRequest(response -> {
@@ -815,13 +831,13 @@ public class AccettazioneOrdiniPickingViewModel {
     }
 
     private void calculateQtaDaEvadere() {
-        if (SettingsManager.iDB().isFlagDeleteRowOnClose()) {
+        if (SettingsManager.iDB().isFlagAccettazioneDeleteRowOnClose()) {
             for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
                 List<MtbColr> withdrawMtbColrs = pickingObjectDTO.getWithdrawMtbColrs();
                 BigDecimal qtaEvasa = BigDecimal.ZERO;
                 BigDecimal numCnf = BigDecimal.ZERO;
 
-                if (withdrawMtbColrs.size() > 0) {
+                if (!withdrawMtbColrs.isEmpty()) {
                     qtaEvasa = Stream.of(withdrawMtbColrs)
                             .map(MtbColr::getQtaCol)
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -887,6 +903,22 @@ public class AccettazioneOrdiniPickingViewModel {
         return optional.isPresent() ? optional.get() : null;
     }
 
+    public void registraImballi(List<TracciamentoImballoDTO> data) {
+        this.sendOnLoadingStarted();
+
+
+        var inputData = data.stream()
+                .map(x -> new ImballoQuantityDTO()
+                        .setQta(x.getQta().get())
+                        .setCodMart(x.getCodMart().get()))
+                .collect(Collectors.toList());
+
+        mImballiRESTConsumer.registraCarico(foundCodAnag, inputData, () -> {
+            this.sendOnLoadingEnded();
+        }, this::sendError);
+    }
+
+
     private void sendOnLoadingStarted() {
         if (this.mListener != null) mListener.onLoadingStarted();
     }
@@ -907,6 +939,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);
     }
@@ -1024,6 +1060,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/articoli_in_giacenza/ArticoliInGiacenzaComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ArticoliInGiacenzaComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ArticoliInGiacenzaComponent create();
+    }
+
+    void inject(ArticoliInGiacenzaFragment ControlloGiacenzeFragment);
+}

app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaFragment.java

@@ -0,0 +1,139 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+
+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.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.databinding.FragmentArticoliInGiacenzaBinding;
+import it.integry.integrywmsnative.databinding.ListaGiacenzePerPosizioneModelBinding;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
+
+public class ArticoliInGiacenzaFragment extends BaseFragment implements ITitledFragment, ArticoliInGiacenzaViewModel.Listener {
+    @Inject
+    ArticoliInGiacenzaViewModel mViewModel;
+    private FragmentArticoliInGiacenzaBinding mBindings;
+    private final ObservableArrayList<MvwSitArtUdcDetInventario> mItemsInventario = new ObservableArrayList<>();
+
+    public ArticoliInGiacenzaFragment() {
+        // Required empty public constructor
+    }
+
+    public static ArticoliInGiacenzaFragment newInstance() {
+        return new ArticoliInGiacenzaFragment();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_giacenza, container, false);
+
+        MainApplication.appComponent
+                .controlloGiacenzeComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
+        mBindings.setViewmodel(mViewModel);
+
+        this.initRecyclerView();
+
+        return mBindings.getRoot();
+    }
+
+    private void initRecyclerView() {
+        mViewModel.getMvwSitArtUdcDetInventario().observe(getViewLifecycleOwner(), data -> {
+            mBindings.emptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
+
+            this.refreshList(null);
+        });
+
+        var itemType = new Type<MvwSitArtUdcDetInventario, ListaGiacenzePerPosizioneModelBinding>(R.layout.lista_giacenze_per_posizione_model, BR.item);
+
+        new LiveAdapter(mItemsInventario)
+                .map(MvwSitArtUdcDetInventario.class, itemType)
+                .into(this.mBindings.inventarioList);
+    }
+
+    public void refreshList(List<MvwSitArtUdcDetInventario> filteredList) {
+        List<MvwSitArtUdcDetInventario> tmpList;
+
+        if (filteredList != null) {
+            tmpList = filteredList;
+        } else {
+            tmpList = mViewModel.getMvwSitArtUdcDetInventario().getValue();
+        }
+        this.mItemsInventario.clear();
+        if (tmpList != null) {
+            this.mItemsInventario.addAll(tmpList);
+        }
+    }
+
+    private void choosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
+
+                    if (status == DialogConsts.Results.ABORT) {
+                        popMe();
+                    } else {
+                        onComplete.run(mtbDepoPosizione);
+                    }
+
+                }, this::onError)
+                .show(requireActivity().getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(context.getText(R.string.articoli_in_giacenza_title).toString());
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        mViewModel.init();
+    }
+
+    @Override
+    public void onDestroy() {
+        mViewModel.setListener(null);
+
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+        super.onDestroy();
+    }
+
+    @Override
+    public void onRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        choosePosition(onComplete);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+
+@Module(subcomponents = ArticoliInGiacenzaComponent.class)
+public class ArticoliInGiacenzaModule {
+
+    @Provides
+    ArticoliInGiacenzaViewModel providesControlloGiacenzeViewModel(InventarioService inventarioService) {
+        return new ArticoliInGiacenzaViewModel(inventarioService);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaViewModel.java

@@ -0,0 +1,68 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+
+public class ArticoliInGiacenzaViewModel {
+    private final InventarioService mInventarioService;
+    private final MutableLiveData<List<MvwSitArtUdcDetInventario>> mvwSitArtUdcDetInventario = new MutableLiveData<>();
+    private Listener mListener;
+
+    public ArticoliInGiacenzaViewModel(InventarioService inventarioService){
+        this.mInventarioService = inventarioService;
+    }
+
+    public void init() {
+        this.sendRequestChoosePosition(this::setPosizione);
+    }
+
+    private void setPosizione(MtbDepoPosizione posizione){
+        if (posizione == null) {
+            //Nessuna posizione trovata con questo barcode
+            this.sendError(new ScannedPositionNotExistException());
+        }else{
+            this.sendOnLoadingStarted();
+            mInventarioService.getInventarioDaPosizione(posizione, inventario -> {
+                mvwSitArtUdcDetInventario.postValue(inventario);
+                this.sendOnLoadingEnded();
+            }, this::sendError);
+        }
+    }
+
+    public MutableLiveData<List<MvwSitArtUdcDetInventario>> getMvwSitArtUdcDetInventario() {
+        return mvwSitArtUdcDetInventario;
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    private void sendRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        if (this.mListener != null) mListener.onRequestChoosePosition(onComplete);
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    public interface Listener extends ILoadingListener {
+        void onError(Exception ex);
+        void onRequestChoosePosition(RunnableArgs<MtbDepoPosizione> 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);
+        mViewModel.setSelectedDocDetails(selection, () -> {
-        mBinding.invalidateAll();
+            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();
+        String codAnag = null;
-        fetchProducts(() -> {
+        if (fornitore != null){
-            fetchDocuments(this::sendOnLoadingEnded);
+            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,13 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dialog;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
+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 +36,11 @@ public class DialogSelectDocInfoViewModel extends ViewModel {
     private final MutableLiveData<Boolean> noteRequired = new MutableLiveData<>(false);
 
     public DialogSelectDocInfoViewModel() {
+        List<String> requestNumDocList = Arrays.asList(SettingsManager.iDB().getDocInterniRequestNumDoc().split("\\|"));
+
         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/ArtDTO.java

@@ -29,8 +29,11 @@ public class ArtDTO {
     private LocalDate dataScad;
 
     private String systemNote;
+
     private String codAlis;
 
+    private Date datetimeRow;
+
     public Integer getRigaOrd() {
         return rigaOrd;
     }
@@ -135,4 +138,13 @@ public class ArtDTO {
         this.codAlis = codAlis;
         return this;
     }
+
+    public Date getDatetimeRow() {
+        return datetimeRow;
+    }
+
+    public ArtDTO setDatetimeRow(Date datetimeRow) {
+        this.datetimeRow = datetimeRow;
+        return this;
+    }
 }

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

@@ -6,6 +6,7 @@ import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,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;
@@ -31,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;
@@ -125,7 +128,12 @@ public class DocInterniEditFormViewModel {
     }
 
     public void loadArticoloByCodMartOrBarcode(String codMart) {
-        var matchedArt = Stream.of(productsList)
+        if (productsList == null) {
+            this.sendError(new NoResultFromCodMartException(codMart));
+            return;
+        }
+
+        var matchedArt = productsList.stream()
                 .filter(x -> x.getCodMart().equalsIgnoreCase(codMart) ||
                         x.getBarcode().contains(codMart))
                 .findFirst()
@@ -234,6 +242,7 @@ public class DocInterniEditFormViewModel {
             artDto.setBarcode(row.getCodBarre());
             artDto.setQta(BigDecimal.valueOf(row.getQtaCol()));
             artDto.setDataIns(row.getDataCollo());
+            artDto.setDatetimeRow(row.getDatetimeRow());
             artDto.setColli(BigDecimal.valueOf(row.getNumCnf()));
             artDto.setUntMis(row.getUntMis());
             artDto.setCodMart(row.getCodMart());
@@ -350,6 +359,7 @@ public class DocInterniEditFormViewModel {
         row.setQtaCnf(resultDTO.getQtaCnf().floatValue());
         row.setNumCnf(resultDTO.getNumCnf().floatValue());
         row.setQtaCol(resultDTO.getQtaTot().floatValue());
+        row.setDatetimeRow(new Date());
         row.setNote(resultDTO.getNote());
         row.setDataScad(resultDTO.getDataScad());
         row.setPartitaMag(resultDTO.getPartitaMag());
@@ -364,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);
     }
@@ -389,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/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/picking_libero/PickingLiberoFragment.java

@@ -55,6 +55,7 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteView;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdView;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto.DialogAskLineaProdResponse;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrList;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
@@ -297,7 +298,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     }
 
     @Override
-    public void onLULineaProdRequired(RunnableArgs<String> onComplete, Runnable onAbort) {
+    public void onLULineaProdRequired(RunnableArgs<DialogAskLineaProdResponse> onComplete, Runnable onAbort) {
         DialogAskLineaProdView.newInstance(onComplete, onAbort)
                 .show(getParentFragmentManager(), DialogAskLineaProdView.class.getName());
     }

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;
@@ -55,6 +56,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto.DialogAskLineaProdResponse;
 
 public class PickingLiberoViewModel {
 
@@ -136,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());
         }
     }
 
@@ -268,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());
@@ -324,25 +326,25 @@ public class PickingLiberoViewModel {
 
     private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, Runnable onComplete) {
         if (this.mFlagAskLineaProd) {
-            this.sendLULineaProdRequired(codJfas -> {
+            this.sendLULineaProdRequired(response -> {
-                createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, codJfas, onComplete);
+                createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
-            }, () -> {
 
-            });
+            }, this::sendOnLoadingEnded);
         } else {
-            createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, onComplete);
+            createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, null, onComplete);
         }
     }
 
-    private void createNewLU_PostLineaProdAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJfas, Runnable onComplete) {
+    private void createNewLU_PostLineaProdAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJfas, Integer idLotto, Runnable onComplete) {
 
         this.sendOnLoadingStarted();
 
         var createUDSRequest = new CreateUDSRequestDTO()
-                .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE ? "PICKING LIBERO" : null)
+                .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE && !mFlagAskLineaProd ? "PICKING LIBERO" : null)
                 .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
                 .setCausaleCollo(CreateUDSRequestDTO.Causale.SCARICO)
-                .setOrderRequired(mFlagAskLineaProd);
+                .setIdLotto(idLotto)
+                .setOrderRequired(false);
 
         if (customNumCollo != null) {
             createUDSRequest.setNumCollo(customNumCollo);
@@ -529,9 +531,9 @@ public class PickingLiberoViewModel {
         this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> {
             List<MtbColr> destNewMtbColr = new ArrayList<>();
 
-            if (pickedAarts.size() > 0) {
+            if (!pickedAarts.isEmpty()) {
                 askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
-                    if (destNewMtbColr.size() > 0) {
+                    if (!destNewMtbColr.isEmpty()) {
                         MtbColt clonedTestata = (MtbColt) this.mCurrentMtbColt.clone();
                         clonedTestata.setOperation(CommonModelConsts.OPERATION.UPDATE);
 
@@ -563,8 +565,6 @@ public class PickingLiberoViewModel {
 
                         clonedTestata.setMtbColr(mtbColrObservableField);
 
-                        this.sendOnLoadingStarted();
-
                         new Thread(() -> {
                             mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
                                 for (int i = 0; i < mtbColrObservableField.size(); i++) {
@@ -950,7 +950,7 @@ public class PickingLiberoViewModel {
         if (this.mListener != null) mListener.onLUClienteRequired(onComplete, onAbort);
     }
 
-    private void sendLULineaProdRequired(RunnableArgs<String> onComplete, Runnable onAbort) {
+    private void sendLULineaProdRequired(RunnableArgs<DialogAskLineaProdResponse> onComplete, Runnable onAbort) {
         if (this.mListener != null) mListener.onLULineaProdRequired(onComplete, onAbort);
     }
 
@@ -1010,7 +1010,7 @@ public class PickingLiberoViewModel {
 
         void onLUClienteRequired(RunnableArgss<VtbDest, String> onComplete, Runnable onAbort);
 
-        void onLULineaProdRequired(RunnableArgs<String> onComplete, Runnable onAbort);
+        void onLULineaProdRequired(RunnableArgs<DialogAskLineaProdResponse> onComplete, Runnable onAbort);
 
         void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort);
 

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

@@ -2,19 +2,27 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
 
 import java.util.HashMap;
 
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.filters.FilterCommessaLayoutView;
 import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
 import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView;
 
 public class ProdFabbisognoLineeProdBindings {
     public static final int NUM_ORD_FILTER_ID = 0;
+    public static final int MGRP_FILTER_ID = 1;
 
     public static final HashMap<Integer, FilterChipDTO> AVAILABLE_FILTERS = new HashMap<>() {{
 
         put(NUM_ORD_FILTER_ID, new FilterChipDTO()
                 .setID(NUM_ORD_FILTER_ID)
+                .setPosizione(0)
                 .setFilterChipText("Numero ordine")
                 .setFilterLayoutView(new FilterNumeroOrdineLayoutView()));
 
+        put(MGRP_FILTER_ID, new FilterChipDTO()
+                .setID(MGRP_FILTER_ID)
+                .setPosizione(1)
+                .setFilterChipText("Gruppo merceologico")
+                .setFilterLayoutView(new FilterGruppoMercLayoutView()));
     }};
 }

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

@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import javax.inject.Inject;
@@ -33,8 +34,13 @@ import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.JtbComt;
 import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
@@ -44,6 +50,7 @@ import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeListSi
 import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeProdBinding;
 import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeTitleItemBinding;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto.OrdineAccettazioneInevasoDTO;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoClienteListModel;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ui.MainListProdOrdineProduzioneElencoListModel;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.GroupTitleModel;
@@ -68,11 +75,17 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
     @Inject
     ProdFabbisognoLineeProdViewModel mViewModel;
+    @Inject
+    ArticoloRESTConsumer mArticoloRESTConsumer;
+    @Inject
+    CommessaRESTConsumer mCommessaRESTConsumer;
 
     private final ArrayList<Runnable> mOnPreDestroyList = new ArrayList<>();
     private final ObservableArrayList<Object> mProdFabbisognoItemModel = new ObservableArrayList<>();
     private FragmentProdFabbisognoLineeProdBinding mBindings;
     private ProdFabbisognoLineeProdFilterViewModel mFilterViewModel = new ProdFabbisognoLineeProdFilterViewModel();
+    private List<MtbGrup> mtbGrupCache;
+    private List<JtbComt> jtbComtCache;
 
     public ProdFabbisognoLineeProdFragment() {
         // Required empty public constructor
@@ -120,6 +133,11 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         mViewModel.getOrdiniList().observe(getViewLifecycleOwner(), data -> {
             mBindings.emptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
 
+            this.onLoadingStarted();
+            this.initMtbGrupsCache(() -> {
+                this.initJtbComtCache(this::onLoadingEnded);
+            });
+
             mFilterViewModel.init(mViewModel.getOrdiniList().getValue());
             this.refreshList(null);
         });
@@ -211,34 +229,67 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         };
 
         mFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+        mFilterViewModel.getCurrentGruppoMercPredicate().addOnPropertyChangedCallback(onPredicateChanged);
 
-        for (var filterChipDTO : ProdFabbisognoLineeProdBindings.AVAILABLE_FILTERS.entrySet()) {
+        List<FilterChipDTO> filterList = Stream.of(ProdFabbisognoLineeProdBindings.AVAILABLE_FILTERS.entrySet())
+                .map(Map.Entry::getValue)
+                .sortBy(FilterChipDTO::getPosizione)
+                .toList();
+
+        for (FilterChipDTO filterChipDTO : filterList) {
 
             FilterChipView filterChipView = new FilterChipView(
                     requireActivity(),
-                    filterChipDTO.getValue().getFilterChipText(),
+                    filterChipDTO.getFilterChipText(),
-                    v -> initBottomSheetDialogFilter(filterChipDTO.getValue()));
+                    v -> initBottomSheetDialogFilter(filterChipDTO));
 
-            if (filterChipDTO.getKey() == ProdFabbisognoLineeProdBindings.NUM_ORD_FILTER_ID) {
+            switch (filterChipDTO.getID()) {
-                mFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                case ProdFabbisognoLineeProdBindings.NUM_ORD_FILTER_ID -> {
-                    @Override
+                    mFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
-                    public void run() {
+                        @Override
-                        if (mFilterViewModel.getCurrentNumOrdsPredicate().get() == null) {
+                        public void run() {
-                            filterChipView.disableCloseIcon();
+                            if (mFilterViewModel.getCurrentNumOrdsPredicate().get() == null) {
+                                filterChipView.disableCloseIcon();
 
-                            mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.removeView(filterChipView);
-                            mBindings.filterChipsGroup.addView(filterChipView);
+                                mBindings.filterChipsGroup.addView(filterChipView);
-                            mBindings.filterChips.smoothScrollTo(0, 0);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
-                        } else {
+                            } else {
-                            filterChipView.enableCloseIcon();
+                                filterChipView.enableCloseIcon();
 
-                            mBindings.filterChipsGroup.removeView(filterChipView);
+                                mBindings.filterChipsGroup.removeView(filterChipView);
-                            mBindings.filterChipsGroup.addView(filterChipView, 0);
+                                mBindings.filterChipsGroup.addView(filterChipView, 0);
-                            mBindings.filterChips.smoothScrollTo(0, 0);
+                                mBindings.filterChips.smoothScrollTo(0, 0);
+                            }
                         }
-                    }
+                    });
-                });
+                    filterChipView.setOnResetClicked(() -> mFilterViewModel.getCurrentNumOrdsPredicate().set(null));
-                filterChipView.setOnResetClicked(() -> mFilterViewModel.getCurrentNumOrdsPredicate().set(null));
+                }
+
+                case ProdFabbisognoLineeProdBindings.MGRP_FILTER_ID -> {
+                    mFilterViewModel.getCurrentGruppoMercPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                        @Override
+                        public void run() {
+                            if (mFilterViewModel.getCurrentGruppoMercPredicate().get() == null) {
+                                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(() -> {
+                        mFilterViewModel.setGruppoMercFilter(null);
+                        mFilterViewModel.getCurrentGruppoMercPredicate().set(null);
+                    });
+                }
             }
             this.mBindings.filterChipsGroup.addView(filterChipView);
         }
@@ -253,16 +304,24 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         var filterLayoutView = filterChipDTO
                 .getFilterLayoutView();
 
-        if (filterChipDTO.getID() == ProdFabbisognoLineeProdBindings.NUM_ORD_FILTER_ID) {
+        switch (filterChipDTO.getID()) {
-            ((FilterNumeroOrdineLayoutView) filterLayoutView)
+            case ProdFabbisognoLineeProdBindings.NUM_ORD_FILTER_ID ->
-                    .setAllNumOrds(mFilterViewModel.getAllNumOrds())
+                    ((FilterNumeroOrdineLayoutView) filterLayoutView)
-                    .setAvailableNumOrds(mFilterViewModel.getAvailableNumOrds())
+                            .setAllNumOrds(mFilterViewModel.getAllNumOrds())
-                    .setOnFilterApplied(mFilterViewModel::setNumOrdFilter)
+                            .setAvailableNumOrds(mFilterViewModel.getAvailableNumOrds())
-                    .setPreSelectedNumOrds(Stream.of(Objects.requireNonNull(mViewModel.getOrdiniList().getValue()))
+                            .setOnFilterApplied(mFilterViewModel::setNumOrdFilter)
-                            .filter(mFilterViewModel.getCurrentNumOrdsPredicate().get() == null ?
+                            .setPreSelectedNumOrds(Stream.of(Objects.requireNonNull(mViewModel.getOrdiniList().getValue()))
-                                    x -> false : Objects.requireNonNull(mFilterViewModel.getCurrentNumOrdsPredicate().get()))
+                                    .filter(mFilterViewModel.getCurrentNumOrdsPredicate().get() == null ?
-                            .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
+                                            x -> false : Objects.requireNonNull(mFilterViewModel.getCurrentNumOrdsPredicate().get()))
-                            .toList());
+                                    .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
+                                    .toList());
+
+            case ProdFabbisognoLineeProdBindings.MGRP_FILTER_ID ->
+                    ((FilterGruppoMercLayoutView) filterLayoutView)
+                            .setAllGroupMerc(mFilterViewModel.getAllGruppoMerc(mtbGrupCache))
+                            .setAvailableGroupMerc(mFilterViewModel.getAvailableGruppoMerc(mtbGrupCache))
+                            .setOnFilterApplied(mFilterViewModel::setGruppoMercFilter)
+                            .setPreSelectedGroupMerc(mFilterViewModel.getSelectedMtbGrup());
         }
 
         if (!filterLayoutView.isAdded())
@@ -270,6 +329,44 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
     }
 
+    private void initMtbGrupsCache(Runnable onComplete) {
+        var codMgrpArts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrdiniList().getValue()))
+                .flatMap(x -> Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc() != null ?
+                        x.getOrdineLavorazioneDTO().getAvailableClassMerc() : new ArrayList<>()))
+                .map(OrdineLavorazioneDTO.AvailableClassMerc::getCodMgrp)
+                .withoutNulls()
+                .distinct()
+                .toList();
+
+        this.mArticoloRESTConsumer.getArtsGroups(codMgrpArts, mtbGrupCache -> {
+            this.mtbGrupCache = mtbGrupCache;
+            onComplete.run();
+        }, this::onError);
+    }
+
+    private void initJtbComtCache(Runnable onComplete) {
+        if (this.mViewModel.getOrdiniList().getValue() == null) {
+            this.jtbComtCache = new ArrayList<>();
+            onComplete.run();
+            return;
+        }
+        var jtbComts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrdiniList().getValue()))
+                .flatMap(x -> Stream.of(x.getOrdineLavorazioneDTO().getCodJcom()))
+                .distinct().withoutNulls()
+                .toList();
+
+        if (jtbComts.isEmpty()) {
+            this.jtbComtCache = new ArrayList<>();
+            onComplete.run();
+            return;
+        }
+
+        this.mCommessaRESTConsumer.getJtbComts(jtbComts, jtbComtCache -> {
+            this.jtbComtCache = jtbComtCache;
+            onComplete.run();
+        }, this::onError);
+    }
+
     @Override
     public void onDestroy() {
         for (Runnable onPreDestroy : mOnPreDestroyList) {
@@ -305,15 +402,32 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                 .max(Date::compareTo)
                 .orElse(null);
 
-        this.mViewModel.loadFabbisogno(ordini, codMdep, dataInizio, dataFine, this::startPickingActivity);
+        List<MtbGrup> listMtbGrup = Stream.of(mProdFabbisognoItemModel)
+                .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
+                .flatMap(x -> Stream.of(((ProdFabbisognoLineeItemModelDto) x).getSelectedMtbGrup()))
+                .toList();
+
+        this.mViewModel.loadFabbisogno(ordini, codMdep, dataInizio, dataFine, onCompleteData -> {
+            startPickingActivity(listMtbGrup, onCompleteData);
+        });
 
     }
 
-    private void startPickingActivity(List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
+    private void startPickingActivity(List<MtbGrup> listMtbGrup, List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
-        List<SitArtOrdDTO> sitArtOrdDTOS = Stream.of(fabbisognoList)
+        String ordini = UtilityDB.listValueToString(Stream.of(mProdFabbisognoItemModel)
-                .map(x -> {
+                .filter(x -> x instanceof ProdFabbisognoLineeItemModelDto && ((ProdFabbisognoLineeItemModelDto) x).selected.get())
+                .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd().toString())
+                .toList());
+
+        Stream<ProdFabbisognoLineeProdDTO> streamSitArtOrd = Stream.of(fabbisognoList);
+
+        streamSitArtOrd = listMtbGrup != null && !listMtbGrup.isEmpty() ?
+                streamSitArtOrd.filter(x -> Stream.of(listMtbGrup).anyMatch(y -> y.getCodMgrp().equalsIgnoreCase(x.getCodMgrp()))) :
+                streamSitArtOrd;
+
+        List<SitArtOrdDTO> sitArtOrdDTOS = streamSitArtOrd.map(x -> {
                     SitArtOrdDTO sitArtOrdDTO = new SitArtOrdDTO()
                             .setCodMart(x.getCodMart())
                             .setCodMdep(codMdep)
@@ -328,6 +442,7 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
                     sitArtOrdDTO.getExtraInfo().put("dataInizio", x.getDataInizio());
                     sitArtOrdDTO.getExtraInfo().put("dataFine", x.getDataFine());
+                    sitArtOrdDTO.getExtraInfo().put("ordini", ordini);
 
                     return sitArtOrdDTO;
                 })

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dto/ProdFabbisognoLineeItemModelDto.java

@@ -1,12 +1,17 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 
 public class ProdFabbisognoLineeItemModelDto {
 
     public BindableBoolean selected = new BindableBoolean();
     public OrdineLavorazioneDTO ordineLavorazioneDTO;
+    List<MtbGrup> selectedMtbGrup = new ArrayList<>();
 
     public BindableBoolean getSelected() {
         return selected;
@@ -20,4 +25,13 @@ public class ProdFabbisognoLineeItemModelDto {
         this.ordineLavorazioneDTO = ordineLavorazioneDTO;
         return this;
     }
+
+    public List<MtbGrup> getSelectedMtbGrup() {
+        return selectedMtbGrup;
+    }
+
+    public ProdFabbisognoLineeItemModelDto setSelectedMtbGrup(List<MtbGrup> selectedMtbGrup) {
+        this.selectedMtbGrup = selectedMtbGrup;
+        return this;
+    }
 }

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

@@ -6,18 +6,25 @@ import androidx.lifecycle.MutableLiveData;
 import com.annimon.stream.Stream;
 import com.annimon.stream.function.Predicate;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeItemModelDto;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 
 public class ProdFabbisognoLineeProdFilterViewModel {
     private final ObservableField<Predicate<ProdFabbisognoLineeItemModelDto>> currentNumOrdsPredicate = new ObservableField<>();
+    private final ObservableField<Predicate<ProdFabbisognoLineeItemModelDto>> currentGruppoMercPredicate = new ObservableField<>();
 
     private List<ProdFabbisognoLineeItemModelDto> initialList;
+    private List<MtbGrup> selectedMtbGrup = new ArrayList<>();
     private final MutableLiveData<List<ProdFabbisognoLineeItemModelDto>> currentList = new MutableLiveData<>();
 
-    public void init(List<ProdFabbisognoLineeItemModelDto> initialList){
+    public void init(List<ProdFabbisognoLineeItemModelDto> initialList) {
         this.initialList = initialList;
         this.currentList.setValue(this.initialList);
     }
@@ -26,23 +33,37 @@ public class ProdFabbisognoLineeProdFilterViewModel {
         return this.currentList;
     }
 
-    public void setNumOrdFilter(List<Integer> numOrds){
+    public void setNumOrdFilter(List<Integer> numOrds) {
         if (numOrds == null || numOrds.isEmpty()) currentNumOrdsPredicate.set(null);
-        else{
+        else {
             currentNumOrdsPredicate.set(x -> numOrds.contains(x.getOrdineLavorazioneDTO().getNumOrd()));
         }
     }
 
-    public void applyAllTests(){
+    public void setGruppoMercFilter(List<MtbGrup> mtbGrupList) {
+        if (mtbGrupList == null || mtbGrupList.isEmpty()) {
+            currentGruppoMercPredicate.set(null);
+            this.selectedMtbGrup = new ArrayList<>();
+        } else {
+            this.selectedMtbGrup = mtbGrupList;
+            var mtbGrups = Stream.of(mtbGrupList).map(MtbGrup::getCodMgrp).toList();
+
+            currentGruppoMercPredicate.set(x -> Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc())
+                    .anyMatch(y -> mtbGrups.contains(y.getCodMgrp())));
+        }
+    }
+
+    public void applyAllTests() {
         List<ProdFabbisognoLineeItemModelDto> returnList = null;
 
-        if (currentNumOrdsPredicate.get() == null){
+        if (currentNumOrdsPredicate.get() == null &&
+                currentGruppoMercPredicate.get() == null) {
             returnList = this.initialList;
-        }else {
+        } else {
-            Stream<ProdFabbisognoLineeItemModelDto> tmpStream = Stream.of(this.initialList)
+            returnList = Stream.of(this.initialList)
-                    .filter(x -> (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))));
+                    .filter(x -> (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))) &&
-
+                            (currentGruppoMercPredicate.get() == null || (currentGruppoMercPredicate.get().test(x)))
-            returnList = tmpStream.toList();
+                    ).map(x -> x.setSelectedMtbGrup(this.selectedMtbGrup)).toList();
         }
 
         this.currentList.setValue(returnList);
@@ -52,7 +73,11 @@ public class ProdFabbisognoLineeProdFilterViewModel {
         return currentNumOrdsPredicate;
     }
 
-    public List<Integer> getAllNumOrds(){
+    public ObservableField<Predicate<ProdFabbisognoLineeItemModelDto>> getCurrentGruppoMercPredicate() {
+        return currentGruppoMercPredicate;
+    }
+
+    public List<Integer> getAllNumOrds() {
         return Stream
                 .of(Objects.requireNonNull(initialList))
                 .filter(x -> x.getOrdineLavorazioneDTO().getNumOrd() != null)
@@ -62,13 +87,59 @@ public class ProdFabbisognoLineeProdFilterViewModel {
                 .toList();
     }
 
-    public List<Integer> getAvailableNumOrds(){
+    public List<Integer> getAvailableNumOrds() {
-        if (currentNumOrdsPredicate.get() == null) return getAllNumOrds();
+        if (currentGruppoMercPredicate.get() == null) return getAllNumOrds();
         else {
             return Stream.of(this.initialList)
+                    .filter(x -> (currentGruppoMercPredicate.get() == null || (currentGruppoMercPredicate.get().test(x))))
                     .map(x -> x.getOrdineLavorazioneDTO().getNumOrd())
                     .distinct()
                     .toList();
         }
     }
+
+    public List<MtbGrup> getSelectedMtbGrup() {
+        return selectedMtbGrup;
+    }
+
+    public List<MtbGrup> getAllGruppoMerc(List<MtbGrup> mtbGrupFullList) {
+        var codMgrp = Stream.of(initialList)
+                .flatMap(x ->
+                        Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc() != null ?
+                                x.getOrdineLavorazioneDTO().getAvailableClassMerc() :
+                                new ArrayList<>()))
+                .map(OrdineLavorazioneDTO.AvailableClassMerc::getCodMgrp)
+                .withoutNulls()
+                .distinct()
+                .toList();
+
+        return Stream.of(Objects.requireNonNull(mtbGrupFullList))
+                .filter(x -> codMgrp.contains(x.getCodMgrp()))
+                .distinct()
+                .withoutNulls()
+                .sortBy(MtbGrup::getDescrizione)
+                .toList();
+    }
+
+    public List<MtbGrup> getAvailableGruppoMerc(List<MtbGrup> mtbGrupFullList){
+        if (currentNumOrdsPredicate.get() == null){
+            return getAllGruppoMerc(mtbGrupFullList);
+        } else {
+            List<String> availableCodMgrups = Stream.of(this.initialList)
+                    .filter(x ->
+                            (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x)))
+                    )
+                    .flatMap(x -> Stream.of(x.getOrdineLavorazioneDTO().getAvailableClassMerc()))
+                    .map(OrdineLavorazioneDTO.AvailableClassMerc::getCodMgrp)
+                    .distinct()
+                    .toList();
+
+            return Stream.of(Objects.requireNonNull(mtbGrupFullList))
+                    .filter(x -> availableCodMgrups.contains(x.getCodMgrp()))
+                    .distinct()
+                    .withoutNulls()
+                    .sortBy(MtbGrup::getDescrizione)
+                    .toList();
+        }
+    }
 }

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

@@ -50,123 +50,26 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void loadFabbisogno(String codMart, Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void loadFabbisogno(String codMart, String ordini, Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        String sql = "WITH input_values AS ( " +
+        String sql = "SELECT DISTINCT cod_jfas\n" +
-                "    SELECT " + UtilityDB.valueToString(startDate) + " AS data_inizio, " +
+                "FROM (SELECT DENSE_RANK() OVER (PARTITION BY dtb_ordt.gestione, dtb_ordt.data_ord, dtb_ordt.num_ord ORDER BY dtb_ord_steps.data_iniz DESC) AS row_n,\n" +
-                "           " + UtilityDB.valueToString(endDate) + " AS data_fine, " +
+                "             dtb_ord_steps.*\n" +
-//                "           " + UtilityDB.valueToString(lineaProd) + " AS linea_prod, " +
+                "      FROM dtb_ord_steps\n" +
-                "           " + UtilityDB.valueToString(codMdep) + " AS cod_mdep)," +
+                "               INNER JOIN dtb_ordt ON dtb_ord_steps.data_ord = dtb_ordt.data_ord\n" +
-                " withdraw_mtb_colr AS ( " +
+                "          AND dtb_ord_steps.num_ord = dtb_ordt.num_ord\n" +
-                "         SELECT cod_mart, " +
+                "          AND dtb_ord_steps.gestione = dtb_ordt.gestione\n" +
-                "                SUM(ISNULL(qta_col, 0)) as qta_col, " +
+                "               INNER JOIN dtb_ordr ON dtb_ordr.gestione = dtb_ord_steps.gestione AND\n" +
-                "                SUM(ISNULL(num_cnf, 0)) as num_cnf, " +
+                "                                      dtb_ordr.data_ord = dtb_ord_steps.data_ord AND\n" +
-                "                mtb_colr.data_ord, " +
+                "                                      dtb_ordr.num_ord = dtb_ord_steps.num_ord\n" +
-                "                mtb_colr.num_ord, " +
+                "      WHERE dtb_ordt.gestione = 'L'\n" +
-                "                mtb_colr.gestione " +
+                "        AND dtb_ordr.flag_evaso = 'I'\n" +
-                "         FROM mtb_colr " +
+                "        AND dtb_ordr.flag_evaso_forzato = 'N'\n" +
-                "                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and " +
+                "        AND flag_annulla = 'N'\n" +
-                "                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo " +
+                "        AND dtb_ordt.cod_mdep = " + UtilityDB.valueToString(codMdep) + "\n" +
-                "         WHERE segno = -1 " +
+                "        AND dtb_ordt.num_ord IN ( " + ordini + " )\n" +
-                "           AND cod_dtip IS NULL " +
+                "        AND dtb_ordt.data_ord BETWEEN " + UtilityDB.valueToString(startDate) + " AND " + UtilityDB.valueToString(endDate) + "\n" +
-                "         GROUP BY cod_mart, " +
+                "        AND dtb_ordr.cod_mart = " + UtilityDB.valueToString(codMart) + ") t\n" +
-                "                  mtb_colr.data_ord, " +
+                "WHERE t.row_n = 1";
-                "                  mtb_colr.num_ord, " +
-                "                  mtb_colr.gestione " +
-                "     ), " +
-                "     custom_mtb_colr AS (SELECT cod_mart, " +
-                "                                SUM(qta_col) AS qta_col, " +
-                "                                SUM(num_cnf) AS num_cnf, " +
-                "                                posizione " +
-                "                         FROM mvw_sitart_udc_det_inventario " +
-                "                         GROUP BY cod_mart, posizione), " +
-                "     grouped_ord AS ( " +
-                "         SELECT dtb_ordr.cod_mart, " +
-                "                dtb_ordt.cod_jfas, " +
-                "                dtb_ordt.cod_mdep, " +
-                "                dtb_ordt.gestione, " +
-                "                CONVERT(NUMERIC(15, 5), SUM(dtb_ordr.qta_ord * dtb_ordr.rap_conv) - " +
-                "                                        SUM(dtb_ordr.qta_evasa * dtb_ordr.rap_conv)) AS qta_ord, " +
-                "                SUM(dtb_ordr.num_cnf - dtb_ordr.num_cnf_evasa)                       AS num_cnf_ord, " +
-                "                SUM(ISNULL(withdraw_mtb_colr.qta_col, 0))                            AS qta_col_scaricata, " +
-                "                SUM(ISNULL(withdraw_mtb_colr.num_cnf, 0))                            AS num_cnf_scaricata " +
-                "         FROM dtb_ordr " +
-                "                  INNER JOIN dtb_ordt on dtb_ordr.gestione = dtb_ordt.gestione AND " +
-                "                                         dtb_ordr.data_ord = dtb_ordt.data_ord AND " +
-                "                                         dtb_ordr.num_ord = dtb_ordt.num_ord " +
-                "                  LEFT OUTER JOIN withdraw_mtb_colr " +
-                "                                  ON withdraw_mtb_colr.gestione = dtb_ordt.gestione AND " +
-                "                                     withdraw_mtb_colr.num_ord = dtb_ordt.num_ord AND " +
-                "                                     withdraw_mtb_colr.data_ord = dtb_ordt.data_ord AND " +
-                "                                     withdraw_mtb_colr.cod_mart = dtb_ordr.cod_mart " +
-                "                  CROSS APPLY input_values " +
-                "         WHERE dtb_ordt.gestione = 'L' " +
-                "           AND flag_evaso = 'I' " +
-                "           AND dtb_ordr.flag_evaso_forzato = 'N' " +
-                "           AND flag_annulla = 'N' " +
-                "           AND dtb_ordt.cod_mdep = input_values.cod_mdep " +
-                "           AND dtb_ordt.data_ord BETWEEN input_values.data_inizio AND input_values.data_fine " +
-                "         GROUP BY dtb_ordr.cod_mart, dtb_ordt.cod_jfas, dtb_ordt.cod_mdep, dtb_ordt.gestione " +
-                "     ), " +
-                "     tmp_ord AS (SELECT grouped_ord.cod_mart, " +
-                "                        mtb_aart.unt_mis, " +
-                "                        grouped_ord.cod_jfas, " +
-                "                        SUM(qta_ord) - SUM(qta_col_scaricata)     AS qta_ord, " +
-                "                        SUM(num_cnf_ord) - SUM(num_cnf_scaricata) AS num_cnf_ord " +
-                "                 FROM grouped_ord " +
-                "                          INNER JOIN mtb_aart ON grouped_ord.cod_mart = mtb_aart.cod_mart " +
-                "                          CROSS APPLY input_values " +
-                "                 GROUP BY grouped_ord.cod_mart, mtb_aart.unt_mis, grouped_ord.cod_jfas " +
-                "     ), " +
-                "     ord_without_positioned_mtb_colt AS ( " +
-                "         SELECT tmp_ord.cod_mart, " +
-                "                tmp_ord.cod_jfas, " +
-                "                ISNULL(custom_mtb_colr_on_linea.posizione, tmp_ord.cod_jfas) AS posizione, " +
-                "                unt_mis, " +
-                "                qta_ord                                                      AS qta_ord_calc, " +
-                "                num_cnf_ord                                                  AS num_cnf_ord_calc, " +
-                "                ISNULL(custom_mtb_colr_on_linea.qta_col, 0)                  AS qta_gia_posizionata, " +
-                "                ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)                  AS num_cnf_gia_posizionata, " +
-                "                qta_ord - ISNULL(custom_mtb_colr_on_linea.qta_col, 0)        AS qta_fabbisogno, " +
-                "                num_cnf_ord - ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)    AS num_cnf_fabbisogno " +
-                "         FROM tmp_ord " +
-                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
-                "             AND tmp_ord.cod_jfas = jrl_fase_posizioni.posizione " +
-                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
-                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
-                "                                     tmp_ord.cod_jfas = custom_mtb_colr_on_linea.posizione " +
-                " " +
-                "         UNION ALL " +
-                " " +
-                "         SELECT DISTINCT tmp_ord.cod_mart, " +
-                "                         null                                        AS cod_jfas, " +
-                "                         jrl_fase_posizioni.posizione, " +
-                "                         unt_mis, " +
-                "                         0                                           AS qta_ord_calc, " +
-                "                         0                                           AS num_cnf_ord_calc, " +
-                "                         ISNULL(custom_mtb_colr_on_linea.qta_col, 0) AS qta_gia_posizionata, " +
-                "                         ISNULL(custom_mtb_colr_on_linea.num_cnf, 0) AS num_cnf_gia_posizionata, " +
-                "                         0                                           AS qta_fabbisogno, " +
-                "                         0                                           AS num_cnf_fabbisogno " +
-                "         FROM tmp_ord " +
-                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
-                "             AND tmp_ord.cod_jfas <> jrl_fase_posizioni.posizione " +
-                " " +
-                " " +
-                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
-                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
-                "                                     jrl_fase_posizioni.posizione = custom_mtb_colr_on_linea.posizione " +
-                "     ) " +
-                "SELECT DISTINCT cod_mart, " +
-                "       unt_mis, " +
-                "       cod_jfas, " +
-                "       input_values.data_inizio, " +
-                "       input_values.data_fine " +
-                "FROM ord_without_positioned_mtb_colt " +
-                "CROSS APPLY input_values " +
-                "WHERE cod_mart = " + UtilityDB.valueToString(codMart) + " " +
-                "GROUP BY cod_mart, unt_mis, cod_jfas, input_values.data_inizio, input_values.data_fine " +
-                "HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 AND SUM(num_cnf_ord_calc - num_cnf_gia_posizionata) > 0 " +
-                "ORDER BY cod_mart";
 
 
         Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();

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);
         }
 
@@ -267,7 +266,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;
     }

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java

@@ -264,7 +264,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                     });
 
 
-            if (newUlList.size() > 0) {
+            if (!newUlList.isEmpty()) {
                 List<String> codMarts = Stream.of(newUlList)
                         .map(HistoryVersamentoProdULDTO::getCodMart)
                         .withoutNulls()

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

@@ -15,6 +15,7 @@ import com.annimon.stream.Stream;
 import com.ravikoradiya.liveadapter.LiveAdapter;
 import com.ravikoradiya.liveadapter.Type;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -29,8 +30,8 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.ISearchableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
@@ -42,11 +43,10 @@ import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsIn
 import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.filter.ProdRiposizionamentoDaProdFilterViewModel;
 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.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
 
-public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements ITitledFragment, ProdRiposizionamentoDaProdViewModel.Listener {
+public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements ISearchableFragment, ITitledFragment, ProdRiposizionamentoDaProdViewModel.Listener {
 
     @Inject
     ProdRiposizionamentoDaProdViewModel mViewModel;
@@ -57,6 +57,8 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
     private final Handler mHandler = new Handler();
     private final int mInterval = 120 * 1000; //2 minuti
     private int barcodeScannerIstanceID = -1;
+    private AppCompatTextView mAppBarTitle;
+    private String mTextFilter;
 
 
     public ProdRiposizionamentoDaProdFragment() {
@@ -123,7 +125,7 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
         mViewModel.getItemsInventario().observe(getViewLifecycleOwner(), data -> {
             mBindings.emptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
 
-            mFilterViewModel.init(mViewModel.getItemsInventario().getValue());
+            mFilterViewModel.init(getFilteredList(mTextFilter));
             this.refreshList(null);
         });
 
@@ -134,6 +136,14 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
             return null;
         });
 
+        itemType.areContentsTheSame((oldObject, newObject) ->
+                oldObject.getCodMart().equalsIgnoreCase(newObject.getCodMart()) &&
+                oldObject.getNumOrd().equals(newObject.getNumOrd()) &&
+                oldObject.getDataOrd().equals(newObject.getDataOrd())
+        );
+
+        itemType.areItemSame((oldObject, newObject) -> oldObject == newObject);
+
         new LiveAdapter(mItemsInventario)
                 .map(ArtsInGiacenzaDTO.class, itemType)
                 .into(this.mBindings.inventarioList);
@@ -197,10 +207,10 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
                     .setOnFilterApplied(mFilterViewModel::setPositionFilter)
                     .setPreselected(
                             Stream.of(Objects.requireNonNull(mViewModel.getItemsInventario().getValue()))
-                            .filter(mFilterViewModel.getCurrentPositionPredicate().get() == null ?
+                                    .filter(mFilterViewModel.getCurrentPositionPredicate().get() == null ?
-                                    x -> false : Objects.requireNonNull(mFilterViewModel.getCurrentPositionPredicate().get()))
+                                            x -> false : Objects.requireNonNull(mFilterViewModel.getCurrentPositionPredicate().get()))
-                            .map(ArtsInGiacenzaDTO::getPosizione)
+                                    .map(ArtsInGiacenzaDTO::getPosizione)
-                            .toList()
+                                    .toList()
                     );
         }
 
@@ -209,8 +219,9 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
 
     }
 
-    public void onInfoClick(List<MvwSitArtUdcDetInventario> item) {
+    public void onInfoClick(ArtsInGiacenzaDTO item) {
         try {
+            BarcodeManager.disable();
             DialogInfoGiacenzaView.newInstance(item).show(getChildFragmentManager(), DialogInfoGiacenzaView.class.getName());
         } catch (Exception e) {
             UtilityExceptions.defaultException(this.getContext(), e);
@@ -254,6 +265,44 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
+    @Override
+    public void onSearchEnabled() {
+        mAppBarTitle.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void onSearchDisabled() {
+        mAppBarTitle.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(String query) {
+        return false;
+    }
+
+    @Override
+    public boolean onQueryTextChange(String newText) {
+        List<ArtsInGiacenzaDTO> originalList = this.mViewModel.getItemsInventario().getValue();
+        if (originalList == null || originalList.isEmpty()) return false;
+        mTextFilter = newText;
+        List<ArtsInGiacenzaDTO> filteredOrders = getFilteredList(newText);
+
+        refreshList(filteredOrders);
+        return true;
+    }
+
+    private List<ArtsInGiacenzaDTO> getFilteredList(String newText) {
+        List<ArtsInGiacenzaDTO> filteredOrders = new ArrayList<>();
+        List<ArtsInGiacenzaDTO> originalList = this.mViewModel.getItemsInventario().getValue();
+        if (originalList == null || originalList.isEmpty() || newText == null) return originalList;
+        for (int i = 0; i < originalList.size(); i++) {
+            if (originalList.get(i).getDescrizione().toLowerCase().contains(newText.toLowerCase())) {
+                filteredOrders.add(originalList.get(i));
+            }
+        }
+        return filteredOrders;
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -274,7 +323,8 @@ public class ProdRiposizionamentoDaProdFragment extends BaseFragment implements
 
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
-        titleText.setText(context.getText(R.string.prod_riposizionamento_da_prod_title).toString());
+        mAppBarTitle = titleText;
+        mAppBarTitle.setText(context.getText(R.string.prod_riposizionamento_da_prod_title).toString());
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -13,8 +14,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException;
@@ -32,6 +31,7 @@ import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.StatoArtInventarioDTO;
 
 public class ProdRiposizionamentoDaProdViewModel {
     private final SoundAlertService mSoundAlertService;
@@ -41,6 +41,7 @@ public class ProdRiposizionamentoDaProdViewModel {
     private final MutableLiveData<List<ArtsInGiacenzaDTO>> itemsInventario = new MutableLiveData<>();
     private final MutableLiveData<MtbColt> mtbColtMutableLiveData = new MutableLiveData<>();
     private final MutableLiveData<List<MvwSitArtUdcDetInventario>> mMvwSitArtUdcDetInventarioLiveData = new MutableLiveData<>();
+    private final MutableLiveData<List<StatoArtInventarioDTO>> mStatoArticoli = new MutableLiveData<>();
     private Listener mListener;
 
     public ProdRiposizionamentoDaProdViewModel(GiacenzaRESTConsumer giacenzaRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, SoundAlertService soundAlertService) {
@@ -100,6 +101,13 @@ public class ProdRiposizionamentoDaProdViewModel {
 
                 mMvwSitArtUdcDetInventarioLiveData.setValue(mvwSitArtUdcDetInventario);
 
+                List<StatoArtInventarioDTO> statoArticolo = Stream.of(Objects.requireNonNull(itemsInventario.getValue()))
+                        .flatMap(x -> Stream.of(x.getStatoArtInventario())
+                                .filter(Objects::nonNull))
+                        .toList();
+
+                mStatoArticoli.setValue(statoArticolo);
+
                 boolean isPresent = Stream.of(mvwSitArtUdcDetInventario)
                         .anyMatch(x ->
                                 x.getGestione().equals(mtbColt.getGestione()) &&
@@ -161,6 +169,35 @@ public class ProdRiposizionamentoDaProdViewModel {
                                             .map(MvwSitArtUdcDetInventario::getNumCnf)
                                             .reduce(BigDecimal.ZERO, BigDecimal::add);
 
+                                    List<StatoArtInventarioDTO> statoArticoli = mStatoArticoli.getValue();
+
+                                    if (statoArticoli == null)
+                                        statoArticoli = new ArrayList<>();
+
+                                    StatoArtInventarioDTO statoArticolo = Stream.of(statoArticoli)
+                                            .filter(x -> x.getCodProd().equalsIgnoreCase(dtoList.get(0).getCodMart()) &&
+                                                    Objects.equals(x.getNumOrd(), dtoList.get(0).getNumOrd()) &&
+                                                    Objects.equals(x.getDataOrd(), dtoList.get(0).getDataOrd())
+                                            )
+                                            .findFirstOrElse(new StatoArtInventarioDTO());
+
+                                    MvwSitArtUdcDetInventario mvwInventario = mvwSitArtUdcDetInventario.get();
+
+                                    if (mvwInventario.getCodMart().equalsIgnoreCase(dtoList.get(0).getCodMart()) &&
+                                            Objects.equals(mvwInventario.getNumOrd(), dtoList.get(0).getNumOrd()) &&
+                                            Objects.equals(mvwInventario.getDataOrd(), dtoList.get(0).getDataOrd())) {
+                                        BigDecimal colliMag = statoArticolo.getColliMag();
+                                        Integer pedMag = statoArticolo.getPedMag();
+                                        BigDecimal qtaMag = statoArticolo.getQtaMag();
+
+                                        BigDecimal numCnf = mvwInventario.getNumCnf();
+                                        BigDecimal qtaCol = mvwInventario.getQtaCol();
+
+                                        statoArticolo.setColliMag(colliMag.add(numCnf));
+                                        statoArticolo.setQtaMag(qtaMag.add(qtaCol));
+                                        statoArticolo.setPedMag(pedMag + 1);
+                                    }
+
                                     return new ArtsInGiacenzaDTO()
                                             .setCodMart(dtoList.get(0).getCodMart())
                                             .setPartitaMag(dtoList.get(0).getPartitaMag())
@@ -169,6 +206,7 @@ public class ProdRiposizionamentoDaProdViewModel {
                                             .setNumOrd(dtoList.get(0).getNumOrd())
                                             .setNumCnf(totalNumCnf)
                                             .setCount(dtoList.size())
+                                            .setStatoArtInventario(statoArticolo)
                                             .setMvwSitArtUdcDetInventarioDTO(dtoList);
                                 })
                                 .sorted(Comparator.comparing(ArtsInGiacenzaDTO::getPosizione))

app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/dialogs/info_giacenza/DialogInfoGiacenzaView.java

@@ -5,24 +5,23 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.View;
 
 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 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.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.databinding.DialogInfoGiacenzaBinding;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.StatoArtInventarioDTO;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.ui.DialogInfoSituazioneArticoloAvailableListItem;
 
 public class DialogInfoGiacenzaView extends BaseDialogFragment {
@@ -30,23 +29,22 @@ public class DialogInfoGiacenzaView extends BaseDialogFragment {
     DialogInfoGiacenzaViewModel mViewModel;
 
     private DialogInfoGiacenzaBinding mBindings;
-    private Context mContext;
+    private final ArtsInGiacenzaDTO item;
-    private List<MvwSitArtUdcDetInventario> item;
 
-    public static DialogInfoGiacenzaView newInstance(List<MvwSitArtUdcDetInventario> item) {
+    public static DialogInfoGiacenzaView newInstance(ArtsInGiacenzaDTO item) {
         return new DialogInfoGiacenzaView(item);
     }
 
-    public DialogInfoGiacenzaView(List<MvwSitArtUdcDetInventario> item) {
+    public DialogInfoGiacenzaView(ArtsInGiacenzaDTO item) {
         this.item = item;
     }
 
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        this.mContext = requireContext();
+        Context mContext = requireContext();
 
-        mBindings = DialogInfoGiacenzaBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings = DialogInfoGiacenzaBinding.inflate(LayoutInflater.from(mContext), null, false);
         mBindings.setLifecycleOwner(this);
 
         MainApplication.appComponent
@@ -56,7 +54,7 @@ public class DialogInfoGiacenzaView extends BaseDialogFragment {
 
         setCancelable(true);
 
-        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+        var alertDialog = new MaterialAlertDialogBuilder(mContext)
                 .setView(mBindings.getRoot())
                 .setNeutralButton(R.string.action_close, null)
                 .setCancelable(isCancelable())
@@ -78,17 +76,38 @@ public class DialogInfoGiacenzaView extends BaseDialogFragment {
         this.onLoadingEnded();
     }
 
-    private void initAvailableItemsList(List<MvwSitArtUdcDetInventario> availableItems) {
+    private void initAvailableItemsList(ArtsInGiacenzaDTO availableItems) {
-        if(availableItems == null || availableItems.isEmpty())
+        if (availableItems == null)
             return;
 
-        var itemList = Stream.of(availableItems)
+        StatoArtInventarioDTO statoArtInventario = availableItems.getStatoArtInventario();
-                .map(DialogInfoSituazioneArticoloAvailableListItem::fromMvwSitArtUdcDetInventario)
+        if (statoArtInventario != null) {
-                .toList();
+            if (statoArtInventario.colliArrivoIsLessThenZero() &&
+                    statoArtInventario.colliMagIsLessThenZero()) {
+                this.mBindings.situazioneArticolo.setVisibility(View.GONE);
+            }
+        } else {
+            this.mBindings.situazioneArticolo.setVisibility(View.GONE);
+        }
 
-        new LiveAdapter(itemList, BR.item)
+        new LiveAdapter(this.item.getSituazioneArticoloAvailableListItem(), BR.item)
                 .map(DialogInfoSituazioneArticoloAvailableListItem.class, R.layout.dialog_info_giacenza_list_item)
                 .into(this.mBindings.availableList);
+
+        new LiveAdapter(this.item.getStatoInventario(), BR.item)
+                .map(StatoArtInventarioDTO.class, R.layout.dialog_info_giacenza_situazione_articolo)
+                .into(this.mBindings.situazioneArticolo);
     }
 
+    @Override
+    public void onLoadingStarted() {
+        this.mBindings.loadingView.setVisibility(View.VISIBLE);
+        this.mBindings.listItem.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void onLoadingEnded() {
+        this.mBindings.loadingView.setVisibility(View.GONE);
+        this.mBindings.listItem.setVisibility(View.VISIBLE);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/dto/ArtsInGiacenzaDTO.java

@@ -1,9 +1,13 @@
 package it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto;
 
+import com.annimon.stream.Stream;
+
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.ui.DialogInfoSituazioneArticoloAvailableListItem;
 
 public class ArtsInGiacenzaDTO {
 
@@ -13,7 +17,9 @@ public class ArtsInGiacenzaDTO {
     private String posizione;
     private BigDecimal numCnf;
     private Integer numOrd;
+    private Date dataOrd;
     private Integer count;
+    private StatoArtInventarioDTO statoArtInventario;
     private List<MvwSitArtUdcDetInventario> mvwSitArtUdcDetInventarioDTO;
 
     public String getCodMart() {
@@ -92,4 +98,34 @@ public class ArtsInGiacenzaDTO {
         this.numOrd = numOrd;
         return this;
     }
+
+    public StatoArtInventarioDTO getStatoArtInventario() {
+        return statoArtInventario;
+    }
+
+    public ArtsInGiacenzaDTO setStatoArtInventario(StatoArtInventarioDTO statoArtInventario) {
+        this.statoArtInventario = statoArtInventario;
+        return this;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public ArtsInGiacenzaDTO setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public List<DialogInfoSituazioneArticoloAvailableListItem> getSituazioneArticoloAvailableListItem() {
+        return Stream.of(this)
+                .flatMap(x -> Stream.of(x.getMvwSitArtUdcDetInventarioDTO())
+                        .map(DialogInfoSituazioneArticoloAvailableListItem::fromMvwSitArtUdcDetInventario)
+                )
+                .toList();
+    }
+
+    public List<StatoArtInventarioDTO> getStatoInventario(){
+        return Stream.of(this.statoArtInventario).toList();
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/dto/StatoArtInventarioDTO.java

@@ -0,0 +1,181 @@
+package it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StatoArtInventarioDTO {
+    private String codProd;
+    private Integer numOrd;
+    private Date dataOrd;
+    private String untMis;
+    private BigDecimal qtaProd;
+    private BigDecimal colliProd;
+    private BigDecimal pedProd;
+    private BigDecimal qtaInArrivo;
+    private BigDecimal colliArrivo;
+    private BigDecimal pedArrivo;
+    private BigDecimal qtaLinea;
+    private BigDecimal colliLinea;
+    private Integer pedLinea;
+    private BigDecimal qtaMag;
+    private BigDecimal colliMag;
+    private Integer pedMag;
+
+    public String getCodProd() {
+        return codProd;
+    }
+
+    public StatoArtInventarioDTO setCodProd(String codProd) {
+        this.codProd = codProd;
+        return this;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public StatoArtInventarioDTO setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public StatoArtInventarioDTO setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public BigDecimal getQtaProd() {
+        return qtaProd;
+    }
+
+    public StatoArtInventarioDTO setQtaProd(BigDecimal qtaProd) {
+        this.qtaProd = qtaProd;
+        return this;
+    }
+
+    public BigDecimal getColliProd() {
+        return colliProd;
+    }
+
+    public StatoArtInventarioDTO setColliProd(BigDecimal colliProd) {
+        this.colliProd = colliProd;
+        return this;
+    }
+
+    public BigDecimal getPedProd() {
+        return pedProd;
+    }
+
+    public StatoArtInventarioDTO setPedProd(BigDecimal pedProd) {
+        this.pedProd = pedProd;
+        return this;
+    }
+
+    public BigDecimal getQtaInArrivo() {
+        return qtaInArrivo;
+    }
+
+    public StatoArtInventarioDTO setQtaInArrivo(BigDecimal qtaInArrivo) {
+        this.qtaInArrivo = qtaInArrivo;
+        return this;
+    }
+
+    public BigDecimal getColliArrivo() {
+        return colliArrivo;
+    }
+
+    public StatoArtInventarioDTO setColliArrivo(BigDecimal colliArrivo) {
+        this.colliArrivo = colliArrivo;
+        return this;
+    }
+
+    public BigDecimal getPedArrivo() {
+        if (pedArrivo.compareTo(BigDecimal.ZERO) < 0)
+            return BigDecimal.ZERO;
+        else
+            return pedArrivo;
+    }
+
+    public StatoArtInventarioDTO setPedArrivo(BigDecimal pedArrivo) {
+        this.pedArrivo = pedArrivo;
+        return this;
+    }
+
+    public BigDecimal getQtaLinea() {
+        return qtaLinea;
+    }
+
+    public StatoArtInventarioDTO setQtaLinea(BigDecimal qtaLinea) {
+        this.qtaLinea = qtaLinea;
+        return this;
+    }
+
+    public BigDecimal getColliLinea() {
+        return colliLinea;
+    }
+
+    public StatoArtInventarioDTO setColliLinea(BigDecimal colliLinea) {
+        this.colliLinea = colliLinea;
+        return this;
+    }
+
+    public Integer getPedLinea() {
+        return pedLinea;
+    }
+
+    public StatoArtInventarioDTO setPedLinea(Integer pedLinea) {
+        this.pedLinea = pedLinea;
+        return this;
+    }
+
+    public BigDecimal getQtaMag() {
+        return qtaMag;
+    }
+
+    public StatoArtInventarioDTO setQtaMag(BigDecimal qtaMag) {
+        this.qtaMag = qtaMag;
+        return this;
+    }
+
+    public BigDecimal getColliMag() {
+        return colliMag;
+    }
+
+    public StatoArtInventarioDTO setColliMag(BigDecimal colliMag) {
+        this.colliMag = colliMag;
+        return this;
+    }
+
+    public Integer getPedMag() {
+        if (pedMag == null || pedMag < 0)
+            return 0;
+        else
+            return pedMag;
+    }
+
+    public StatoArtInventarioDTO setPedMag(Integer pedMag) {
+        this.pedMag = pedMag;
+        return this;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public StatoArtInventarioDTO setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public boolean colliArrivoIsLessThenZero(){
+        return this.colliArrivo.compareTo(BigDecimal.ZERO) <= 0;
+    }
+
+    public boolean colliMagIsLessThenZero(){
+        return this.colliMag.compareTo(BigDecimal.ZERO) <= 0;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java

@@ -3,8 +3,10 @@ package it.integry.integrywmsnative.gest.prod_versamento_materiale.dto;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Date;
+import java.util.List;
 
 import it.integry.integrywmsnative.core.di.BindableFloat;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class OrdineLavorazioneDTO {
@@ -101,6 +103,7 @@ public class OrdineLavorazioneDTO {
     private Object mtbColtToEdit;
 
     private int hrNum;
+    private List<AvailableClassMerc> availableClassMerc;
 
 
     private BindableFloat qtaColVersamento = new BindableFloat();
@@ -533,4 +536,37 @@ public class OrdineLavorazioneDTO {
         this.descrizioneAttivita = descrizioneAttivita;
         return this;
     }
+
+    public List<AvailableClassMerc> getAvailableClassMerc() {
+        return availableClassMerc;
+    }
+
+    public OrdineLavorazioneDTO setAvailableClassMerc(List<AvailableClassMerc> availableClassMerc) {
+        this.availableClassMerc = availableClassMerc;
+        return this;
+    }
+
+    public static class AvailableClassMerc {
+
+        private String codMgrp;
+        private List<String> codMsgr;
+
+        public String getCodMgrp() {
+            return codMgrp;
+        }
+
+        public AvailableClassMerc setCodMgrp(String codMgrp) {
+            this.codMgrp = codMgrp;
+            return this;
+        }
+
+        public List<String> getCodMsgr() {
+            return codMsgr;
+        }
+
+        public AvailableClassMerc setCodMsgr(List<String> codMsgr) {
+            this.codMsgr = codMsgr;
+            return this;
+        }
+    }
 }