Finish v1.16.13(195)

Rivista implementazione di destroy fragment.

app/build.gradle

@@ -2,13 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 185
-    def appVersionName = '1.16.3'
+    def appVersionCode = 195
+    def appVersionName = '1.16.13'
 
     signingConfigs {
         release {
@@ -97,7 +96,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-crash'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:17.5.0'
+    implementation 'com.google.android.gms:play-services-basement:17.6.0'
 
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -111,15 +110,13 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
     def dagger2_version = '2.29.1'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -139,7 +136,7 @@ dependencies {
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.2.5"
+    def room_version = "2.2.6"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"

app/src/main/AndroidManifest.xml

@@ -17,18 +17,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:fullBackupContent="@xml/backup_descriptor">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />
         <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
-        <activity
-            android:name=".gest.picking_resi_OLD.PickingResiActivity"
-            android:label="@string/activity_ultime_consegne_title"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
         <activity
             android:name=".gest.picking_resi.PickingResiActivity"
             android:screenOrientation="portrait"

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

@@ -277,6 +277,11 @@ public class MainActivity extends BaseActivity
                 mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
                 return false;
             });
+
+            ((ISearcableFragment) fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.mainSearch.setIconified(true);
+                mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
+            });
         } else {
             mBinding.appBarMain.mainSearch.setOnQueryTextListener(null);
             mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
@@ -289,6 +294,10 @@ public class MainActivity extends BaseActivity
             mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.GONE);
             mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
             ((ITitledFragment) fragment).onCreateActionBar(mBinding.appBarMain.toolbarTitleLeft, this);
+            ((ITitledFragment) fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE);
+                mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE);
+            });
         } else {
             mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE);
             mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE);
@@ -296,7 +305,7 @@ public class MainActivity extends BaseActivity
 
         if(fragment instanceof IScrollableFragment) {
             ((IScrollableFragment) fragment).setScrollToolbar(mBinding.appBarMain.elevatedToolbar);
-            ((IScrollableFragment) fragment).setScrollableOnPreDestroy(() -> {
+            ((IScrollableFragment) fragment).addOnPreDestroy(() -> {
                 mBinding.appBarMain.elevatedToolbar.resetAll();
             });
         }
@@ -309,7 +318,7 @@ public class MainActivity extends BaseActivity
                     ((ISelectAllFragment)fragment).onSelectAll();
                 }
             });
-            ((ISelectAllFragment) fragment).setSelectAllOnPreDestroy(() -> {
+            ((ISelectAllFragment) fragment).addOnPreDestroy(() -> {
                 mBinding.appBarMain.mainSelectAll.setVisibility(View.GONE);
                 mBinding.appBarMain.mainSelectAll.setOnClickListener(null);
             });
@@ -323,6 +332,11 @@ public class MainActivity extends BaseActivity
                     ((IFilterableFragment)fragment).onFilterClick();
                 }
             });
+
+            ((IFilterableFragment)fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
+                mBinding.appBarMain.mainFilter.setOnClickListener(null);
+            });
         } else {
             mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
             mBinding.appBarMain.mainFilter.setOnClickListener(null);

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

@@ -25,6 +25,8 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComp
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdComponent;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
@@ -47,7 +49,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
         DialogInputQuantityV2Module.class,
         DialogScanArtModule.class,
         ProdFabbisognoLineeProdModule.class,
-        DialogAskMagazzinoProssimitaModule.class})
+        DialogAskMagazzinoProssimitaModule.class,
+        DialogRowInfoProdFabbisognoLineeProdModule.class})
 public interface MainApplicationComponent {
 
     MainActivityComponent.Factory mainActivityComponent();
@@ -63,6 +66,7 @@ public interface MainApplicationComponent {
     DialogScanArtComponent.Factory dialogScanArtComponent();
     ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
     DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
+    DialogRowInfoProdFabbisognoLineeProdComponent.Factory dialogRowInfoProdFabbisognoLineeProdComponent();
 
 
     void inject(AppContext appContext);

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

@@ -16,6 +16,7 @@ import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 
 @Module
 public class MainApplicationModule {
@@ -88,5 +89,12 @@ public class MainApplicationModule {
         return new PosizioniRESTConsumer(systemRESTConsumer);
     }
 
+    @Provides
+    @Singleton
+    ProdFabbisognoLineeProdRESTConsumer providesProdFabbisognoLineeProdRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new ProdFabbisognoLineeProdRESTConsumer(systemRESTConsumer);
+    }
+
+
 
 }

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

@@ -48,7 +48,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.vendita_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_spedizione)
                                 .setDrawerIcon(R.drawable.ic_black_upload)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1)))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_free_picking)
@@ -79,7 +79,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)))
+                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
 
                 .addItem(new MenuItem()
                         .setID(R.id.nav_free_lav_picking)
@@ -90,7 +90,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 
                 .addItem(new MenuItem()
                         .setID(R.id.nav_prod_posizionamento_da_ord)
-                        .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title)
+                        .setTitleText(R.string.prod_fabbisogno_linee_prod_title)
                         .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
                         .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance))

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

@@ -1,8 +1,12 @@
 package it.integry.integrywmsnative.core.expansion;
 
 import android.app.Dialog;
+import android.os.Bundle;
 import android.view.KeyEvent;
+import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
@@ -15,6 +19,13 @@ public class BaseDialogFragment extends DialogFragment {
 
     public BaseDialogFragment() {
         super();
+    }
+
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
         if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) {
             getDialog().setOnKeyListener((dialog, keyCode, event) -> {
                 if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) {

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

@@ -13,14 +13,18 @@ public class BaseFragment extends Fragment {
 
     protected void openProgress() {
         if (this.mCurrentProgress == null) {
-            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+            getActivity().runOnUiThread(() -> {
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+            });
         }
     }
 
     protected void closeProgress() {
         if (mCurrentProgress != null) {
-            mCurrentProgress.dismiss();
-            mCurrentProgress = null;
+            getActivity().runOnUiThread(() -> {
+                mCurrentProgress.dismiss();
+                mCurrentProgress = null;
+            });
         }
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/interfaces/IDestroyableFragment.java

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.interfaces;
+
+public interface IDestroyableFragment {
+
+    void addOnPreDestroy(Runnable onPreDestroy);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/interfaces/IFilterableFragment.java

@@ -1,6 +1,6 @@
 package it.integry.integrywmsnative.core.interfaces;
 
-public interface IFilterableFragment {
+public interface IFilterableFragment extends IDestroyableFragment {
 
     void onFilterClick();
 

app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java

@@ -2,10 +2,8 @@ package it.integry.integrywmsnative.core.interfaces;
 
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 
-public interface IScrollableFragment {
+public interface IScrollableFragment extends IDestroyableFragment {
 
     void setScrollToolbar(ElevatedToolbar toolbar);
 
-    void setScrollableOnPreDestroy(Runnable onPreDestroy);
-
 }

app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java

@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.interfaces;
 
 import androidx.appcompat.widget.SearchView;
 
-public interface ISearcableFragment extends SearchView.OnQueryTextListener {
+public interface ISearcableFragment extends SearchView.OnQueryTextListener, IDestroyableFragment {
 
     void onSearchEnabled();
 

app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISelectAllFragment.java

@@ -1,11 +1,9 @@
 package it.integry.integrywmsnative.core.interfaces;
 
-public interface ISelectAllFragment {
+public interface ISelectAllFragment extends IDestroyableFragment {
 
     boolean isSelectAllButtonEnabled();
 
     void onSelectAll();
 
-    void setSelectAllOnPreDestroy(Runnable onPreDestroy);
-
 }

app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java

@@ -8,10 +8,8 @@ import androidx.appcompat.widget.AppCompatTextView;
  * Created by GiuseppeS on 07/03/2018.
  */
 
-public interface ITitledFragment {
+public interface ITitledFragment extends IDestroyableFragment {
 
     void onCreateActionBar(AppCompatTextView titleText, Context context);
 
-    void onActionBarPreDestroy(Runnable onActionBarPreDestroy);
-
 }

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

@@ -111,6 +111,14 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
 
     public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, GestioneEnum gestione, int segno, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        String whereCondGestione = "";
+
+        if(gestione != null) {
+            whereCondGestione = "mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " ";
+        } else {
+            whereCondGestione = "(mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') ";
+        }
+
         String baseSql = "SELECT DISTINCT mtb_colt.* " +
                 "FROM mtb_colt, " +
                 "     mtb_colr " +
@@ -118,7 +126,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                 "  AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
                 "  AND mtb_colt.data_collo = mtb_colr.data_collo " +
                 "  AND mtb_colt.num_collo = mtb_colr.num_collo " +
-                "  AND mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " " +
+                "  AND " + whereCondGestione +
                 "  AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " +
                 "  AND mtb_colt.data_doc IS NULL AND ";
 

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

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.rest.model;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 public class SitArtOrdDTO {
 
@@ -25,6 +26,8 @@ public class SitArtOrdDTO {
     private String codMsfa;
     private String descrizioneMsfa;
 
+    private final HashMap<String, Object> extraInfo = new HashMap<>();
+
     public String getCodJcom() {
         return codJcom;
     }
@@ -196,4 +199,8 @@ public class SitArtOrdDTO {
         this.descrizioneMsfa = descrizioneMsfa;
         return this;
     }
+
+    public HashMap<String, Object> getExtraInfo() {
+        return extraInfo;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/wifi/WiFiStatusChecker.java

@@ -53,7 +53,7 @@ public class WiFiStatusChecker {
     };
 
     public WiFiStatusChecker(Context context){
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mWifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
     }
 
     public void startMonitoring(RunnableArgs<SIGNAL> callback){

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java

@@ -45,7 +45,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 
 public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment {
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private FragmentMainAccettazioneBinding mBinding;
@@ -54,7 +54,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
     private MainListAccettazioneAdapter mAdapter;
 
     private List<OrdineAccettazioneInevasoDTO> mOriginalOrderList;
-    private List<OrdineAccettazioneInevasoDTO> mRenderedOrderList = new ArrayList<>();
+    private final List<OrdineAccettazioneInevasoDTO> mRenderedOrderList = new ArrayList<>();
 
     private AppCompatTextView mAppBarTitle;
 
@@ -81,24 +81,14 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         mAppBarTitle.setText(context.getText(R.string.accettazione_title_fragment).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        init();
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_accettazione, container, false);
 
+        init();
+
         mBinding.setView(this);
         mBinding.accettazioneMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
         mBinding.accettazioneMainFab.hide();
@@ -159,7 +149,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
 
 
-    private RunnableArgs<OrdineAccettazioneInevasoDTO> onSingleSelectionChanged = dto -> {
+    private final RunnableArgs<OrdineAccettazioneInevasoDTO> onSingleSelectionChanged = dto -> {
         List<OrdineAccettazioneInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
 
         if(dto.isSelected()) {
@@ -254,8 +244,9 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         mToolbar = toolbar;
     }
 
+
     @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
+    public void addOnPreDestroy(Runnable onPreDestroy) {
         this.mOnPreDestroyList.add(onPreDestroy);
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_picking;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -10,6 +11,7 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AlertDialog;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
@@ -72,7 +74,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
-    private ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
+    private final ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
 
     public BindableBoolean noItemsToPick = new BindableBoolean(false);
@@ -89,6 +91,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private final int PICK_UL_REQUEST = 1;
 
+    private boolean mShowSecondaryUntMis = true;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,11 +119,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
         setSupportActionBar(this.mBindings.toolbar);
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        mShowSecondaryUntMis = sharedPreferences.getBoolean("picking_ingresso_enable_sec_unt_mis", true);
+
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
 
-
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
         mViewModel.setListeners(this);
@@ -180,14 +186,14 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
     private void initRecyclerView() {
+        AccettazioneListAdapter accettazioneListAdapter = new AccettazioneListAdapter(this, mAccettazioneMutableData, mShowSecondaryUntMis);
+        this.mBindings.accettazionePickingList.setAdapter(accettazioneListAdapter);
+        this.mBindings.accettazionePickingList.setLayoutManager(new LinearLayoutManager(this));
+
         this.mViewModel.getPickingList().observe(this, updatedData -> {
             refreshList();
         });
 
-        AccettazioneListAdapter accettazioneListAdapter = new AccettazioneListAdapter(this, mAccettazioneMutableData);
-        this.mBindings.accettazionePickingList.setAdapter(accettazioneListAdapter);
-        this.mBindings.accettazionePickingList.setLayoutManager(new LinearLayoutManager(this));
-
         accettazioneListAdapter.setOnItemClicked(clickedItem -> {
             this.mViewModel.dispatchOrdineRow(clickedItem);
         });
@@ -236,32 +242,44 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
 
+                    //Calc Num CNF
+                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getNumCnf)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+                    //Calc qta col
+                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getQtaCol)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+
 
                     if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                        BigDecimal numCnfEvasa = BigDecimal.ZERO;
-
-                        if(x.getWithdrawMtbColrs().size() > 0) {
-                            numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
-                                    .map(MtbColr::getNumCnf)
-                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-                        }
-
                         accettazioneListModel.setQtaEvasa(numCnfEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
                         accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
                     } else {
-                        BigDecimal qtaEvasa = BigDecimal.ZERO;
-
-                        if(x.getWithdrawMtbColrs().size() > 0) {
-                            qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
-                                    .map(MtbColr::getQtaCol)
-                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-                        }
-
                         accettazioneListModel.setQtaEvasa(qtaEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
                         if (x.getMtbAart() != null)
                             accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
                     }
 
                     accettazioneListModel.setOriginalModel(x);
@@ -287,35 +305,45 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
 
+                    //Calc Num CNF
+                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getNumCnf)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+                    //Calc qta col
+                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getQtaCol)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+
+
                     if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                        BigDecimal numCnfEvasa = BigDecimal.ZERO;
-
-                        if(x.getWithdrawMtbColrs().size() > 0) {
-                            numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
-                                    .map(MtbColr::getNumCnf)
-                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-                        }
-
                         accettazioneListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfOrd());
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
                         accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
                     } else {
-                        BigDecimal qtaEvasa = BigDecimal.ZERO;
-
-                        if(x.getWithdrawMtbColrs().size() > 0) {
-                            qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
-                                    .map(MtbColr::getQtaCol)
-                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-                        }
-
                         accettazioneListModel.setQtaEvasa(qtaEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
                         if (x.getMtbAart() != null)
                             accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
-                    }
 
-                    if (x.getMtbAart() != null)
-                        accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                    }
 
                     accettazioneListModel.setOriginalModel(x);
 
@@ -340,32 +368,43 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     accettazioneListModel.setBadge1(x.getSitArtOrdDTO().getCodArtFor());
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
+                    //Calc Num CNF
+                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getNumCnf)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+                    //Calc qta col
+                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getQtaCol)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
 
                     if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-                        BigDecimal numCnfEvasa = BigDecimal.ZERO;
-
-                        if(x.getWithdrawMtbColrs().size() > 0) {
-                            numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
-                                    .map(MtbColr::getNumCnf)
-                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-                        }
-
                         accettazioneListModel.setQtaEvasa(numCnfEvasa);
-                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfOrd());
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
                         accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
                     } else {
-                        BigDecimal qtaEvasa = BigDecimal.ZERO;
-
-                        if(x.getWithdrawMtbColrs().size() > 0) {
-                            qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
-                                    .map(MtbColr::getQtaCol)
-                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-                        }
-
                         accettazioneListModel.setQtaEvasa(qtaEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
                         if (x.getMtbAart() != null)
                             accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
                     }
 
                     if (x.getMtbAart() != null) {
@@ -389,8 +428,45 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
 
-                    accettazioneListModel.setQtaEvasa(BigDecimal.ZERO);
-                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
+                    //Calc Num CNF
+                    BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getNumCnf)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+                    //Calc qta col
+                    BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                    if(x.getWithdrawMtbColrs().size() > 0) {
+                        qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                .map(MtbColr::getQtaCol)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    }
+
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+
+                        accettazioneListModel.setSecQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setSecUntMis(x.getMtbAart().getUntMis());
+                    } else {
+                        accettazioneListModel.setQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+
+                        accettazioneListModel.setSecQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                    }
+
 
                     if (x.getMtbAart() != null) {
                         accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java

@@ -482,7 +482,7 @@ public class AccettazionePickingViewModel {
 
 
             if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
-                numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
+                numCnfDaPrelevare = UtilityBigDecimal.divideAndRoundToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
 
                 if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
                     if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
@@ -612,7 +612,7 @@ public class AccettazionePickingViewModel {
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/core/AccettazioneListAdapter.java

@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
@@ -28,8 +29,9 @@ import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDT
 
 public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<AccettazioneListAdapter.SubheaderHolder, AccettazioneListAdapter.SingleItemViewHolder> {
 
-    private Context mContext;
-    private List<AccettazioneListModel> mDataset = new ArrayList<>();
+    private final Context mContext;
+    private final boolean mShowSecondaryUntMis;
+    private final List<AccettazioneListModel> mDataset = new ArrayList<>();
 
     private RunnableArgs<PickingObjectDTO> mOnItemClicked;
 
@@ -55,8 +57,9 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
     }
 
 
-    public AccettazioneListAdapter(AppCompatActivity context, ObservableArrayList<AccettazioneListModel> mutableDataSet) {
+    public AccettazioneListAdapter(AppCompatActivity context, ObservableArrayList<AccettazioneListModel> mutableDataSet, boolean showSecondaryUntMis) {
         this.mContext = context;
+        this.mShowSecondaryUntMis = showSecondaryUntMis;
 
         mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
             @Override
@@ -111,8 +114,8 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingObjectDTO.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(mContext.getResources().getDrawable(!pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
-        holder.mBinding.qtaEvasa.setTextColor(mContext.getResources().getColor(!pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
         holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
@@ -129,6 +132,17 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
         holder.mBinding.untMis.setText(pickingObjectDTO.getUntMis());
         holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE);
 
+        //Secondary Unt Mis
+        holder.mBinding.secondaryUntMis.setVisibility(mShowSecondaryUntMis ? View.VISIBLE : View.GONE);
+
+        if(mShowSecondaryUntMis) {
+            holder.mBinding.secQtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getSecQtaEvasa()));
+            holder.mBinding.secQtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getSecQtaTot()));
+
+            holder.mBinding.secUntMis.setText(pickingObjectDTO.getSecUntMis());
+            holder.mBinding.secUntMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getSecUntMis()) ? View.GONE : View.VISIBLE);
+        }
+
         holder.mBinding.getRoot().setOnClickListener(v -> {
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/core/AccettazioneListModel.java

@@ -19,6 +19,9 @@ public class AccettazioneListModel implements Cloneable {
     private BigDecimal qtaEvasa;
     private BigDecimal qtaTot;
     private String untMis;
+    private BigDecimal secQtaEvasa;
+    private BigDecimal secQtaTot;
+    private String secUntMis;
 
     private boolean active;
 
@@ -124,6 +127,33 @@ public class AccettazioneListModel implements Cloneable {
         return this;
     }
 
+    public BigDecimal getSecQtaEvasa() {
+        return secQtaEvasa;
+    }
+
+    public AccettazioneListModel setSecQtaEvasa(BigDecimal secQtaEvasa) {
+        this.secQtaEvasa = secQtaEvasa;
+        return this;
+    }
+
+    public BigDecimal getSecQtaTot() {
+        return secQtaTot;
+    }
+
+    public AccettazioneListModel setSecQtaTot(BigDecimal secQtaTot) {
+        this.secQtaTot = secQtaTot;
+        return this;
+    }
+
+    public String getSecUntMis() {
+        return secUntMis;
+    }
+
+    public AccettazioneListModel setSecUntMis(String secUntMis) {
+        this.secUntMis = secUntMis;
+        return this;
+    }
+
     public boolean isActive() {
         return active;
     }

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

@@ -50,7 +50,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private FragmentMainBinding mBindings;
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private LayoutInflater mLayoutInflater;
@@ -210,21 +210,11 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         titleText.setText(context.getText(R.string.app_name).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
     @Override
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroyList.add(onPreDestroy);
-    }
-
 
     private void initGestMenu() {
         ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
@@ -264,4 +254,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         String appVersion = UtilityResources.getAppVersion();
         mBindings.currentAppVersionName.setText("v" + appVersion);
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

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

@@ -2,13 +2,13 @@ package it.integry.integrywmsnative.gest.main;
 
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
@@ -42,7 +42,7 @@ public class MenuListAdapter extends RecyclerView.Adapter<MenuListAdapter.ViewHo
     // binds the data to the TextView in each cell
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.mIcon.setImageDrawable(mContext.getResources().getDrawable(mDataset.get(position).getTitleIcon(), null));
+        holder.mIcon.setImageDrawable(ResourcesCompat.getDrawable(mContext.getResources(), mDataset.get(position).getTitleIcon(), null));
         holder.mTitle.setText(mContext.getResources().getString(mDataset.get(position).getTitleText()));
     }
 

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.Html;
@@ -11,9 +10,9 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
-import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.ComparatorCompat;
@@ -29,7 +28,9 @@ import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 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.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
 import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
@@ -44,17 +45,17 @@ import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.databinding.FragmentMainOrdiniUscitaBinding;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs.DialogVenditaFiltroAvanzato;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs.DialogVenditaFiltroAvanzatoViewModel;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.list.OrdiniUscitaElencoAdapter;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.list.OrdiniUscitaElencoListModel;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 
-public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragment, ILifecycleFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment, OrdiniUscitaElencoViewModel.Listener {
+public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment, OrdiniUscitaElencoViewModel.Listener {
 
     public BindableBoolean fabVisible = new BindableBoolean(false);
 
@@ -63,31 +64,34 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
 
     private FragmentMainOrdiniUscitaBinding mBindings = null;
 
-    private ObservableArrayList<OrdiniUscitaElencoListModel> mOrdiniInevasiMutableData = new ObservableArrayList<>();
+    private final ObservableArrayList<OrdiniUscitaElencoListModel> mOrdiniInevasiMutableData = new ObservableArrayList<>();
 
     private GestioneEnum mCurrentGestioneOrd = null;
     private GestioneEnum mCurrentGestioneCol = null;
     private int mCurrentSegnoCol = 0;
+    private Class<? extends BaseDialogRowInfoView> mDialogRowInfo;
 
     private ElevatedToolbar mToolbar;
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
 
     private int barcodeScannerIstanceID = -1;
-    private Dialog mCurrentProgress;
 
 
     public OrdiniUscitaElencoFragment() {
         // Required empty public constructor
     }
 
-    public static OrdiniUscitaElencoFragment newInstance(GestioneEnum gestioneOrd, GestioneEnum gestioneCol, int segnoCol) {
+    public static OrdiniUscitaElencoFragment newInstance(GestioneEnum gestioneOrd, GestioneEnum gestioneCol, int segnoCol, Class<? extends BaseDialogRowInfoView> dialogRowInfo) {
         OrdiniUscitaElencoFragment fragment = new OrdiniUscitaElencoFragment();
         Bundle args = new Bundle();
 
         args.putString("gestioneOrd", gestioneOrd.getText());
-        args.putString("gestioneCol", gestioneCol.getText());
+        args.putString("gestioneCol", gestioneCol != null ? gestioneCol.getText() : null);
         args.putInt("segnoCol", segnoCol);
 
+        String keyDialogRowInfo = DataCache.addItem(dialogRowInfo);
+        args.putString("keyDialogRowInfo", keyDialogRowInfo);
+
         fragment.setArguments(args);
         return fragment;
     }
@@ -96,8 +100,12 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mCurrentGestioneOrd = GestioneEnum.fromString(getArguments().getString("gestioneOrd"));
-        mCurrentGestioneCol = GestioneEnum.fromString(getArguments().getString("gestioneCol"));
+        String gestioneCol = getArguments().getString("gestioneCol");
+        mCurrentGestioneCol = gestioneCol != null ? GestioneEnum.fromString(gestioneCol) : null;
         mCurrentSegnoCol = getArguments().getInt("segnoCol");
+
+        String keyDialogRowInfo = getArguments().getString("keyDialogRowInfo");
+        mDialogRowInfo = DataCache.retrieveItem(keyDialogRowInfo);
     }
 
     @Override
@@ -131,6 +139,14 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
         mViewModel.init(codMdep, mCurrentGestioneOrd, mCurrentGestioneCol, mCurrentSegnoCol);
     }
 
+    @Override
+    public void onDestroy() {
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+        super.onDestroy();
+    }
+
     private void initRecyclerView() {
 
         boolean canSelectMultipleOrdini = SettingsManager.iDB().isFlagSpedizioneCanSelectMultipleOrders();
@@ -209,6 +225,14 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
                 .map(x -> {
                     OrdiniUscitaElencoListModel listModel = new OrdiniUscitaElencoListModel();
 
+                    if (x.isFlagEvaso()) {
+                        listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), R.color.mainGreen, null));
+                    } else if (x.isExistColloBoolean()) {
+                        listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null));
+                    } else {
+                        listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), android.R.color.transparent, null));
+                    }
+
                     listModel.setGroupTitle(x.getRagSocOrd());
 
                     String testataOrdString = String.format(getString(R.string.ord_ven_testata), String.valueOf(x.getNumOrd()), UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
@@ -237,10 +261,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
 
     @Override
     public void onPreDestroy(Runnable onComplete) {
-        for (Runnable onPreDestroy : mOnPreDestroyList) {
-            onPreDestroy.run();
-        }
-
         BarcodeManager.removeCallback(barcodeScannerIstanceID);
         onComplete.run();
     }
@@ -250,11 +270,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
         titleText.setText(context.getText(R.string.prod_ordine_lavorazione_title_fragment).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
 
     public void dispatchOrders() {
         List<OrdiniUscitaElencoDTO> selectedOrders = Stream.of(this.mOrdiniInevasiMutableData)
@@ -267,23 +282,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
     }
 
 
-    private void openProgress() {
-        getActivity().runOnUiThread(() -> {
-            if (this.mCurrentProgress == null) {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-            }
-        });
-    }
-
-    private void closeProgress() {
-        getActivity().runOnUiThread(() -> {
-            if (mCurrentProgress != null) {
-                mCurrentProgress.dismiss();
-                mCurrentProgress = null;
-            }
-        });
-    }
-
     @Override
     public void onLoadingStarted() {
         BarcodeManager.disable();
@@ -305,7 +303,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
 
     @Override
     public void onOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders) {
-//        FBToast.infoToast(getActivity(), "Trovati: " + filteredOrders.size() + " ordini", Toast.LENGTH_LONG);
         refreshList(filteredOrders);
     }
 
@@ -326,7 +323,7 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
                         + "<br />" +
                         "<b>" + alreadyRegisteredUL + "</b> " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)),
                 null,
-                () -> SpedizioneActivity.startActivity(getActivity(), sitArts, orders, alreadyRegisteredMtbColts, mCurrentGestioneCol, mCurrentSegnoCol, MtbColr.Causale.DEFAULT)
+                () -> SpedizioneActivity.startActivity(getActivity(), sitArts, orders, alreadyRegisteredMtbColts, mCurrentGestioneCol, mCurrentSegnoCol, MtbColr.Causale.DEFAULT, mDialogRowInfo)
         ).show();
     }
 
@@ -335,11 +332,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
-        this.mOnPreDestroyList.add(onPreDestroy);
-    }
-
     @Override
     public boolean isSelectAllButtonEnabled() {
         return SettingsManager.iDB().isFlagMultiClienteOrdV();
@@ -355,11 +347,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
                 .forEach(x -> x.getSelectedObservable().set(!allSelected));
     }
 
-    @Override
-    public void setSelectAllOnPreDestroy(Runnable onPreDestroy) {
-        this.mOnPreDestroyList.add(onPreDestroy);
-    }
-
 
     private DialogVenditaFiltroAvanzatoViewModel mAppliedFilterViewModel;
 
@@ -379,4 +366,9 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
 
         }).show();
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoAdapter.java

@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
@@ -127,6 +128,10 @@ public class OrdiniUscitaElencoAdapter extends SectionedRecyclerViewAdapter<Ordi
 
         listModel.getSelectedObservable().resetOnPropertyChangedCallback();
 
+        if(listModel.getEtichettaColor() != null)
+            holder.mBinding.emptyView.setBackgroundColor(listModel.getEtichettaColor());
+        else holder.mBinding.emptyView.setBackgroundColor(ResourcesCompat.getColor(mContext.getResources(), android.R.color.transparent, null));
+
         if(!UtilityString.isNullOrEmpty(listModel.getDescription()))
             holder.mBinding.descrizione.setText(Html.fromHtml(listModel.getDescription()));
 

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoListModel.java

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.ordini_uscita_elenco.list;
 
+import androidx.annotation.ColorInt;
+
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
 
@@ -11,6 +13,8 @@ public class OrdiniUscitaElencoListModel implements Cloneable {
     private String rightDescription;
     private String rightSubDescription;
 
+    private @ColorInt Integer etichettaColor;
+
     private boolean hidden;
     private BindableBoolean selected = new BindableBoolean();
 
@@ -63,6 +67,15 @@ public class OrdiniUscitaElencoListModel implements Cloneable {
         return this;
     }
 
+    public @ColorInt Integer getEtichettaColor() {
+        return etichettaColor;
+    }
+
+    public OrdiniUscitaElencoListModel setEtichettaColor(@ColorInt Integer etichettaColor) {
+        this.etichettaColor = etichettaColor;
+        return this;
+    }
+
     public boolean isHidden() {
         return hidden;
     }

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

@@ -1,7 +1,6 @@
 package it.integry.integrywmsnative.gest.picking_libero;
 
 
-import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -32,6 +31,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
@@ -45,7 +45,6 @@ import it.integry.integrywmsnative.core.model.VtbDest;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.core.utility.UtilityToast;
 import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding;
 import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoListAdapter;
@@ -58,13 +57,13 @@ import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskCliente;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
 /**
  * A simple {@link Fragment} subclass.
  */
-public class PickingLiberoFragment extends Fragment implements ITitledFragment, IScrollableFragment, ILifecycleFragment, PickingLiberoViewModel.Listener, BottomSheetMtbColrEditView.Listener {
+public class PickingLiberoFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ILifecycleFragment, PickingLiberoViewModel.Listener, BottomSheetMtbColrEditView.Listener {
 
     private FragmentPickingLiberoBinding mBindings;
 
@@ -84,8 +83,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
 
     private int barcodeScannerIstanceID = -1;
 
-    private Dialog mCurrentProgress;
-
     private GestioneEnum mCurrentGestione;
 
     public PickingLiberoFragment() {
@@ -108,11 +105,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
         mToolbarTitleText.setText(context.getText(R.string.free_picking_title_fragment).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -221,26 +213,12 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
         this.mViewModel.closeLU(null);
     }
 
-
-    private void openProgress() {
-        if (this.mCurrentProgress == null) {
-            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-        }
-    }
-
-    private void closeProgress() {
-        if (mCurrentProgress != null) {
-            mCurrentProgress.dismiss();
-            mCurrentProgress = null;
-        }
-    }
-
     @Override
-    public void onDestroyView() {
+    public void onDestroy() {
         for (Runnable onPreDestroy : mOnPreDestroyList) {
             onPreDestroy.run();
         }
-        super.onDestroyView();
+        super.onDestroy();
     }
 
     @Override
@@ -248,11 +226,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroyList.add(onPreDestroy);
-    }
-
 
     @Override
     public void onLoadingStarted() {
@@ -413,4 +386,9 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment,
         if(thereIsAnOpenedUL.get()) mViewModel.closeLU(onComplete);
         else onComplete.run();
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

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

@@ -512,7 +512,7 @@ public class PickingLiberoViewModel {
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 

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

@@ -378,7 +378,7 @@ public class PickingResiViewModel {
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
                     .setUntMis(withdrawableDtbDocr.getMtbAart().getUntMis())
                     .setMtbAart(withdrawableDtbDocr.getMtbAart());
 

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

@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
@@ -105,8 +106,8 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingResiListModel.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingResiListModel.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(mContext.getResources().getDrawable(!pickingResiListModel.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
-        holder.mBinding.qtaEvasa.setTextColor(mContext.getResources().getColor(!pickingResiListModel.isActive() ? R.color.gray_600 : R.color.green_700));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingResiListModel.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingResiListModel.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingResiListModel.getDescrizione());
         holder.mBinding.descrizione.setTextColor(pickingResiListModel.isDescrizionePresente() ? Color.BLACK : Color.GRAY);

app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java

@@ -117,11 +117,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
         mAppBarTitle.setText(context.getText(R.string.prod_ordine_produzione_title_fragment).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
 
     private void init() {
         final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity());
@@ -152,12 +147,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroyList.add(onPreDestroy);
-    }
-
-
     private void initRecyclerView() {
         mAdapter = new OrdineProduzioneListAdapter(getActivity(), mRenderedOrderList, onSingleSelectionChanged);
         mBinding.ordineProduzioneMainList.setAdapter(mAdapter);
@@ -260,4 +249,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
         mRenderedOrderList.clear();
         mRenderedOrderList.addAll(ordini);
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

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

@@ -20,7 +20,6 @@ import javax.inject.Inject;
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
-import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.model.MtbColr;
@@ -32,18 +31,19 @@ import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeProdBi
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaView;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdView;
 
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link ProdFabbisognoLineeProdFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, ProdFabbisognoLineeProdViewModel.Listener {
+public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITitledFragment, ProdFabbisognoLineeProdViewModel.Listener {
 
     @Inject
     ProdFabbisognoLineeProdViewModel mViewModel;
 
-    private ArrayList<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final ArrayList<Runnable> mOnPreDestroyList = new ArrayList<>();
 
     private FragmentProdFabbisognoLineeProdBinding mBindings;
 
@@ -87,20 +87,16 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
         DialogAskMagazzinoProssimitaView
                 .newInstance((jtbFase, startDate, endDate) -> {
-                    if (jtbFase == null) {
-                        ((IPoppableActivity) getActivity()).pop();
-                    } else {
+//                    if (jtbFase == null) {
+//                        ((IPoppableActivity) getActivity()).pop();
+//                    } else {
                         //Load fabbisogno
-                        this.mViewModel.loadFabbisogno(startDate, endDate, jtbFase.getCodJfas(), codMdep, this::startPickingActivity);
-                    }
+                        this.mViewModel.loadFabbisogno(startDate, endDate, codMdep, this::startPickingActivity);
+//                    }
                 })
                 .show(getActivity().getSupportFragmentManager(), "tag");
     }
 
-    @Override
-    public void onPreDestroy(Runnable onPreDestroy) {
-        this.mOnPreDestroyList.add(onPreDestroy);
-    }
 
     @Override
     public void onDestroy() {
@@ -116,11 +112,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         titleText.setText(context.getText(R.string.prod_fabbisogno_linee_prod_title).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
 
     @Override
     public void onError(Exception ex) {
@@ -140,12 +131,22 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
 
 
     private void startPickingActivity(List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+
         List<SitArtOrdDTO> sitArtOrdDTOS = Stream.of(fabbisognoList)
-                .map(x -> new SitArtOrdDTO()
-                        .setCodMart(x.getCodMart())
-                        .setQtaOrd(x.getQtaFabbisogno())
-                        .setNumCnfOrd(x.getNumCnfFabbisogno())
-                        .setFlagEnablePickManuale(false))
+                .map(x -> {
+                    SitArtOrdDTO sitArtOrdDTO = new SitArtOrdDTO()
+                            .setCodMart(x.getCodMart())
+                            .setCodMdep(codMdep)
+                            .setQtaOrd(x.getQtaFabbisogno())
+                            .setNumCnfOrd(x.getNumCnfFabbisogno())
+                            .setFlagEnablePickManuale(false);
+
+                    sitArtOrdDTO.getExtraInfo().put("dataInizio", x.getDataInizio());
+                    sitArtOrdDTO.getExtraInfo().put("dataFine", x.getDataFine());
+
+                    return sitArtOrdDTO;
+                })
                 .toList();
 
         SpedizioneActivity.startActivity(getActivity(),
@@ -154,9 +155,15 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                 new ArrayList<>(),
                 GestioneEnum.LAVORAZIONE,
                 +1,
-                MtbColr.Causale.VERSAMENTO);
+                MtbColr.Causale.VERSAMENTO,
+                DialogRowInfoProdFabbisognoLineeProdView.class);
 
         ((IPoppableActivity) getActivity()).pop();
 
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

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

@@ -2,14 +2,14 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
 
 import dagger.Module;
 import dagger.Provides;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 
 @Module(subcomponents = ProdFabbisognoLineeProdComponent.class)
 public class ProdFabbisognoLineeProdModule {
 
     @Provides
-    ProdFabbisognoLineeProdViewModel providesProdFabbisognoLineeProdViewModel(SystemRESTConsumer systemRESTConsumer) {
-        return new ProdFabbisognoLineeProdViewModel(systemRESTConsumer);
+    ProdFabbisognoLineeProdViewModel providesProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer) {
+        return new ProdFabbisognoLineeProdViewModel(prodFabbisognoLineeProdRESTConsumer);
     }
 
 }

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

@@ -1,26 +1,23 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod;
 
-import com.google.gson.reflect.TypeToken;
+import com.annimon.stream.Stream;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 
 public class ProdFabbisognoLineeProdViewModel {
 
-    private final SystemRESTConsumer mSystemRESTConsumer;
+    private final ProdFabbisognoLineeProdRESTConsumer mProdFabbisognoLineeProdRESTConsumer;
 
     private Listener mListener;
 
-    public ProdFabbisognoLineeProdViewModel(SystemRESTConsumer systemRESTConsumer) {
-        this.mSystemRESTConsumer = systemRESTConsumer;
+    public ProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer) {
+        this.mProdFabbisognoLineeProdRESTConsumer = prodFabbisognoLineeProdRESTConsumer;
     }
 
     public void init() {
@@ -28,66 +25,15 @@ public class ProdFabbisognoLineeProdViewModel {
     }
 
 
-
-    public void loadFabbisogno(Date startDate, Date endDate, String lineaProd, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
+    public void loadFabbisogno(Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete) {
         this.sendOnLoadingStarted();
 
-        String sql = "WITH input_values AS ( " +
-                "    SELECT " + UtilityDB.valueToString(startDate) + " AS data_inizio, " +
-                "           " + UtilityDB.valueToString(endDate) + " AS data_fine, " +
-                "           " + UtilityDB.valueToString(lineaProd) + " AS linea_prod, " +
-                "           " + UtilityDB.valueToString(codMdep) + " AS cod_mdep " +
-                "), " +
-                "     custom_mtb_colr AS ( " +
-                "         SELECT cod_mart, " +
-                "                sum(qta_col)                AS qta_col, " +
-                "                sum(num_cnf)                AS num_cnf, " +
-                "                sum(qta_col) / sum(num_cnf) AS qta_cnf, " +
-                "                posizione " +
-                "         FROM mvw_sitart_udc_det_inventario " +
-                "         GROUP BY cod_mart, posizione " +
-                "     ), " +
-                "     tmp_ord AS ( " +
-                "         SELECT dtb_ordr.cod_mart, " +
-                "                        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, " +
-                "                        mtb_aart.unt_mis, " +
-                "                        SUM(ISNULL(custom_mtb_colr.qta_col, 0))                                   AS qta_col_versata, " +
-                "                        SUM(ISNULL(custom_mtb_colr.qta_cnf, 0))                                   AS qta_cnf_versata, " +
-                "                        SUM(ISNULL(custom_mtb_colr.num_cnf, 0))                                   AS num_cnf_versata" +
-                "         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 " +
-                "                  INNER JOIN jrl_fase_posizioni ON dtb_ordt.cod_jfas = jrl_fase_posizioni.cod_jfas " +
-                "                  LEFT OUTER JOIN custom_mtb_colr ON custom_mtb_colr.posizione = jrl_fase_posizioni.posizione AND " +
-                "                                                     dtb_ordr.cod_mart = custom_mtb_colr.cod_mart " +
-                "                  INNER JOIN mtb_aart ON dtb_ordr.cod_mart = mtb_aart.cod_mart " +
-                "                  CROSS APPLY input_values " +
-                "         WHERE dtb_ordt.gestione = 'L' " +
-                "           AND dtb_ordt.cod_mdep = input_values.cod_mdep " +
-                "           AND jrl_fase_posizioni.posizione = input_values.linea_prod " +
-                "           AND flag_evaso = 'I' " +
-                "           AND dtb_ordr.flag_evaso_forzato = 'N' " +
-                "           AND flag_annulla = 'N' " +
-                "           AND dtb_ordt.data_ord BETWEEN input_values.data_inizio AND input_values.data_fine " +
-                "         GROUP BY dtb_ordr.cod_mart, " +
-                "                  mtb_aart.unt_mis " +
-                "     ) " +
-                "SELECT cod_mart, " +
-                "       qta_ord, " +
-                "       num_cnf_ord, " +
-                "       unt_mis, " +
-                "       qta_col_versata, " +
-                "       num_cnf_versata, " +
-                "       CASE WHEN qta_ord - qta_col_versata < 0 THEN 0 ELSE qta_ord - qta_col_versata END     AS qta_fabbisogno, " +
-                "       CASE WHEN num_cnf_ord - num_cnf_versata < 0 THEN 0 ELSE num_cnf_ord - num_cnf_versata END AS num_cnf_fabbisogno " +
-                "FROM tmp_ord " +
-                "ORDER BY cod_mart";
+        this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(startDate, endDate, codMdep, jtbFasi -> {
+            if (jtbFasi != null) Stream.of(jtbFasi)
+                    .forEach(x -> x
+                            .setDataInizio(startDate)
+                            .setDataFine(endDate));
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
-        this.mSystemRESTConsumer.<List<ProdFabbisognoLineeProdDTO>>processSql(sql, typeOfObjectsList, jtbFasi -> {
             this.sendOnLoadingEnded();
             onComplete.run(jtbFasi);
         }, this::sendError);

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java

@@ -9,19 +9,14 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AutoCompleteTextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 
-import com.tfb.fbtoast.FBToast;
-
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.List;
 
 import javax.inject.Inject;
 
@@ -47,7 +42,7 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
     private Context mContext;
     private DialogAskMagazzinoProssimitaBinding mBindings;
 
-    private JtbFasi mSelectedItem;
+//    private JtbFasi mSelectedItem;
 
     public static DialogAskMagazzinoProssimitaView newInstance(RunnableArgsss<JtbFasi, Date, Date> onItemSelected) {
         return new DialogAskMagazzinoProssimitaView(onItemSelected);
@@ -82,11 +77,11 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
         mBindings.buttonConfirm.setOnClickListener(new OnSingleClickListener() {
             @Override
             public void onSingleClick(View v) {
-                if(mSelectedItem != null) {
+//                if(mSelectedItem != null) {
                     getDialog().dismiss();
-                } else {
-                    FBToast.warningToast(mContext, getResources().getString(R.string.please_select_an_item), Toast.LENGTH_LONG);
-                }
+//                } else {
+//                    FBToast.warningToast(mContext, getResources().getString(R.string.please_select_an_item), Toast.LENGTH_LONG);
+//                }
             }
         });
 
@@ -113,13 +108,13 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
         this.mViewModel.setListener(this);
         this.mViewModel.init(codMdep);
 
-        this.mViewModel.getJtbFasi().observe(getViewLifecycleOwner(), this::onPosizioniLoaded);
+//        this.mViewModel.getJtbFasi().observe(getViewLifecycleOwner(), this::onPosizioniLoaded);
     }
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         super.onDismiss(dialog);
-        mOnItemSelected.run(mSelectedItem, mViewModel.startDate, mViewModel.endDate);
+        mOnItemSelected.run(null, mViewModel.startDate, mViewModel.endDate);
     }
 
     private final View.OnClickListener onStartDateClickListener = new OnSingleClickListener() {
@@ -172,16 +167,16 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
     };
 
 
-    private void onPosizioniLoaded(List<JtbFasi> items) {
-        DialogAskMagazzinoProssimitaAdapter adapter = new DialogAskMagazzinoProssimitaAdapter(mContext, items);
-
-        AutoCompleteTextView editTextDropdownCliente = mBindings.dropdownLineaProd;
-        editTextDropdownCliente.setThreshold(0);
-        editTextDropdownCliente.setAdapter(adapter);
-        editTextDropdownCliente.setOnItemClickListener((parent, view, position, id) -> {
-            mSelectedItem = items.get(position);
-        });
-    }
+//    private void onPosizioniLoaded(List<JtbFasi> items) {
+//        DialogAskMagazzinoProssimitaAdapter adapter = new DialogAskMagazzinoProssimitaAdapter(mContext, items);
+//
+//        AutoCompleteTextView editTextDropdownCliente = mBindings.dropdownLineaProd;
+//        editTextDropdownCliente.setThreshold(0);
+//        editTextDropdownCliente.setAdapter(adapter);
+//        editTextDropdownCliente.setOnItemClickListener((parent, view, position, id) -> {
+//            mSelectedItem = items.get(position);
+//        });
+//    }
 
     @Override
     public void onError(Exception ex) {

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaViewModel.java

@@ -2,10 +2,6 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_m
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -14,7 +10,6 @@ import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class DialogAskMagazzinoProssimitaViewModel {
@@ -36,7 +31,6 @@ public class DialogAskMagazzinoProssimitaViewModel {
     }
 
     public void init(String codMdep) {
-        this.sendOnLoadingStarted();
 
         Calendar c = UtilityDate.getCalendarInstance();
         c.set(Calendar.DAY_OF_WEEK, c.getActualMinimum(Calendar.DAY_OF_WEEK));
@@ -48,30 +42,32 @@ public class DialogAskMagazzinoProssimitaViewModel {
         endDate = c.getTime();
         endDateBindable.set(UtilityDate.formatDate(endDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
 
-        String sql = "SELECT DISTINCT jrl_fase_posizioni.posizione as cod_jfas, " +
-                "                descrizione, " +
-                "                jrl_fase_posizioni.cod_mdep " +
-                "FROM jrl_fase_posizioni " +
-                "         INNER JOIN mtb_depo_posizioni mdp ON jrl_fase_posizioni.cod_mdep = mdp.cod_mdep AND " +
-                "                                              jrl_fase_posizioni.posizione = mdp.posizione " +
-                "WHERE cod_jfas IN (SELECT cod_jfas FROM jtb_fasi WHERE um_prod IS NOT NULL) " +
-                "  AND jrl_fase_posizioni.cod_mdep = " + UtilityDB.valueToString(codMdep) + " " +
-                "ORDER BY jrl_fase_posizioni.posizione";
-
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<JtbFasi>>() {}.getType();
-        this.mSystemRESTConsumer.<List<JtbFasi>>processSql(sql, typeOfObjectsList, jtbFasi -> {
-            this.mJtbFasi.postValue(jtbFasi);
-
-            this.sendOnLoadingEnded();
-        }, this::sendError);
+//        this.sendOnLoadingStarted();
+//
+//        String sql = "SELECT DISTINCT jrl_fase_posizioni.posizione as cod_jfas, " +
+//                "                descrizione, " +
+//                "                jrl_fase_posizioni.cod_mdep " +
+//                "FROM jrl_fase_posizioni " +
+//                "         INNER JOIN mtb_depo_posizioni mdp ON jrl_fase_posizioni.cod_mdep = mdp.cod_mdep AND " +
+//                "                                              jrl_fase_posizioni.posizione = mdp.posizione " +
+//                "WHERE cod_jfas IN (SELECT cod_jfas FROM jtb_fasi WHERE um_prod IS NOT NULL) " +
+//                "  AND jrl_fase_posizioni.cod_mdep = " + UtilityDB.valueToString(codMdep) + " " +
+//                "ORDER BY jrl_fase_posizioni.posizione";
+//
+//
+//        Type typeOfObjectsList = new TypeToken<ArrayList<JtbFasi>>() {}.getType();
+//        this.mSystemRESTConsumer.<List<JtbFasi>>processSql(sql, typeOfObjectsList, jtbFasi -> {
+//            this.mJtbFasi.postValue(jtbFasi);
+//
+//            this.sendOnLoadingEnded();
+//        }, this::sendError);
     }
 
 
 
-    public MutableLiveData<List<JtbFasi>> getJtbFasi() {
-        return mJtbFasi;
-    }
+//    public MutableLiveData<List<JtbFasi>> getJtbFasi() {
+//        return mJtbFasi;
+//    }
 
 
     private void sendOnLoadingStarted() {

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

@@ -1,10 +1,12 @@
 package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class ProdFabbisognoLineeProdDTO {
 
     private String codMart;
+    private String codJfas;
     private BigDecimal qtaOrd;
     private BigDecimal numCnfOrd;
     private String untMis;
@@ -12,6 +14,11 @@ public class ProdFabbisognoLineeProdDTO {
     private BigDecimal numCnfVersata;
     private BigDecimal qtaFabbisogno;
     private BigDecimal numCnfFabbisogno;
+    private Date dataInizio;
+    private Date dataFine;
+
+    public ProdFabbisognoLineeProdDTO() {
+    }
 
     public String getCodMart() {
         return codMart;
@@ -22,6 +29,15 @@ public class ProdFabbisognoLineeProdDTO {
         return this;
     }
 
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public ProdFabbisognoLineeProdDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
     public BigDecimal getQtaOrd() {
         return qtaOrd;
     }
@@ -84,4 +100,22 @@ public class ProdFabbisognoLineeProdDTO {
         this.numCnfFabbisogno = numCnfFabbisogno;
         return this;
     }
+
+    public Date getDataInizio() {
+        return dataInizio;
+    }
+
+    public ProdFabbisognoLineeProdDTO setDataInizio(Date dataInizio) {
+        this.dataInizio = dataInizio;
+        return this;
+    }
+
+    public Date getDataFine() {
+        return dataFine;
+    }
+
+    public ProdFabbisognoLineeProdDTO setDataFine(Date dataFine) {
+        this.dataFine = dataFine;
+        return this;
+    }
 }

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

@@ -0,0 +1,402 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+
+@Singleton
+public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
+
+    private final SystemRESTConsumer mSystemRESTConsumer;
+
+    public ProdFabbisognoLineeProdRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+    }
+
+
+    public void loadFabbisogno(Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        String sql = "WITH input_values AS ( " +
+                "    SELECT " + UtilityDB.valueToString(startDate) + " AS data_inizio, " +
+                "           " + UtilityDB.valueToString(endDate) + " AS data_fine, " +
+//                "           " + UtilityDB.valueToString(lineaProd) + " AS linea_prod, " +
+                "           " + UtilityDB.valueToString(codMdep) + " AS cod_mdep)," +
+                " withdraw_mtb_colr AS ( " +
+                "         SELECT cod_mart, " +
+                "                SUM(ISNULL(qta_col, 0)) as qta_col, " +
+                "                SUM(ISNULL(num_cnf, 0)) as num_cnf, " +
+                "                mtb_colr.data_ord, " +
+                "                mtb_colr.num_ord, " +
+                "                mtb_colr.gestione " +
+                "         FROM mtb_colr " +
+                "                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and " +
+                "                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo " +
+                "         WHERE segno = -1 " +
+                "           AND cod_dtip IS NULL " +
+                "         GROUP BY cod_mart, " +
+                "                  mtb_colr.data_ord, " +
+                "                  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 cod_mart, " +
+                "       unt_mis, " +
+                "       input_values.data_inizio, " +
+                "       input_values.data_fine, " +
+                "       SUM(qta_ord_calc)                               AS qta_ord, " +
+                "       SUM(num_cnf_ord_calc)                           AS num_cnf_ord, " +
+                "       SUM(qta_gia_posizionata)                        AS qta_col_versata, " +
+                "       SUM(num_cnf_gia_posizionata)                    AS num_cnf_versata, " +
+                "       SUM(qta_ord_calc - qta_gia_posizionata)         AS qta_fabbisogno, " +
+                "       SUM(num_cnf_ord_calc - num_cnf_gia_posizionata) AS num_cnf_fabbisogno " +
+                "FROM ord_without_positioned_mtb_colt " +
+                "CROSS APPLY input_values " +
+                "GROUP BY cod_mart, unt_mis, input_values.data_inizio, input_values.data_fine " +
+                "HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 " +
+                "ORDER BY cod_mart";
+
+
+
+        /*
+        * Query splittata per cod_jfas (più pesante)
+        WITH input_values AS (SELECT '2021-02-15' AS data_inizio,
+                             '2021-02-28' AS data_fine,
+                             --'SC06'     AS linea_prod,
+                             '34'         AS cod_mdep),
+     withdraw_mtb_colr AS (
+         SELECT cod_mart,
+                SUM(ISNULL(qta_col, 0)) as qta_col,
+                SUM(ISNULL(num_cnf, 0)) as num_cnf,
+                mtb_colr.data_ord,
+                mtb_colr.num_ord,
+                mtb_colr.gestione
+         FROM mtb_colr
+                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and
+                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo
+         WHERE segno = -1
+           and cod_dtip IS NULL
+         GROUP BY cod_mart,
+                  mtb_colr.data_ord,
+                  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 cod_mart,
+       cod_jfas,
+       posizione,
+       unt_mis,
+       qta_ord_calc            AS qta_ord,
+       num_cnf_ord_calc        AS num_cnf_ord,
+       qta_gia_posizionata     AS qta_col_versata,
+       num_cnf_gia_posizionata AS num_cnf_versata,
+       qta_ord_calc - qta_gia_posizionata AS qta_fabbisogno,
+       num_cnf_ord_calc - num_cnf_gia_posizionata AS num_cnf_fabbisogno
+FROM ord_without_positioned_mtb_colt
+
+ORDER BY cod_mart, posizione
+        * */
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
+        this.mSystemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
+    }
+
+
+    public void loadFabbisogno(String codMart, Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        String sql = "WITH input_values AS ( " +
+                "    SELECT " + UtilityDB.valueToString(startDate) + " AS data_inizio, " +
+                "           " + UtilityDB.valueToString(endDate) + " AS data_fine, " +
+//                "           " + UtilityDB.valueToString(lineaProd) + " AS linea_prod, " +
+                "           " + UtilityDB.valueToString(codMdep) + " AS cod_mdep)," +
+                " withdraw_mtb_colr AS ( " +
+                "         SELECT cod_mart, " +
+                "                SUM(ISNULL(qta_col, 0)) as qta_col, " +
+                "                SUM(ISNULL(num_cnf, 0)) as num_cnf, " +
+                "                mtb_colr.data_ord, " +
+                "                mtb_colr.num_ord, " +
+                "                mtb_colr.gestione " +
+                "         FROM mtb_colr " +
+                "                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and " +
+                "                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo " +
+                "         WHERE segno = -1 " +
+                "           AND cod_dtip IS NULL " +
+                "         GROUP BY cod_mart, " +
+                "                  mtb_colr.data_ord, " +
+                "                  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 " +
+                "ORDER BY cod_mart";
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
+        this.mSystemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
+    }
+
+}

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

@@ -29,7 +29,7 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr
     private ProdRecuperoMaterialeViewModel mViewmodel;
     private ProdRecuperoMaterialeHelper mHelper;
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
 
     public ProdRecuperoMaterialeFragment() {
         // Required empty public constructor
@@ -72,12 +72,6 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr
         titleText.setText(context.getText(R.string.prod_recupero_materiale_title_fragment).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
-
     @Override
     public void onDestroy() {
         for (Runnable onPreDestroy : mOnPreDestroyList) {
@@ -86,4 +80,8 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr
         super.onDestroy();
     }
 
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

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

@@ -26,7 +26,7 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled
     private ProdVersamentoMaterialViewModel mViewmodel;
     private ProdVersamentoMaterialHelper mHelper;
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
 
     public ProdVersamentoMaterialeFragment() {
         // Required empty public constructor
@@ -87,7 +87,7 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled
     }
 
     @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java

@@ -55,7 +55,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
     private OrdineAcquistoPvHelper mHelper;
     private Griglia mGriglia;
     private OrdineAcquistoPvOpenListAdapter mAdapter;
-    private List<OrdineWrapper> mRenderedOrderList = new ArrayList<>();
+    private final List<OrdineWrapper> mRenderedOrderList = new ArrayList<>();
     private boolean mRedirectToNewOrder = true;
 
     private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
@@ -122,11 +122,6 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
         titleText.setText(context.getText(R.string.pv_elenco_ordiniA_title_fragment).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
     private void setGriglia(Griglia griglia) {
         mGriglia = griglia;
         mBinding.fabNewOrder.setVisibility(View.VISIBLE);
@@ -208,7 +203,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
             mHelper.deleteOrder(ordine, () -> {
                 getActivity().runOnUiThread(() -> {
                     progress.dismiss();
-                    Toast.makeText(getActivity(), "Ordine eliminato!", Toast.LENGTH_SHORT);
+                    Toast.makeText(getActivity(), "Ordine eliminato!", Toast.LENGTH_SHORT).show();
                     fetchOrders();
                 });
             }, e -> {
@@ -238,11 +233,6 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
 
     }
 
-    @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
-        this.mOnPreDestroyList.add(onPreDestroy);
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -259,4 +249,9 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled
             onPreDestroy.run();
         }
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

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

@@ -13,6 +13,7 @@ import android.view.inputmethod.EditorInfo;
 
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableField;
 import androidx.fragment.app.Fragment;
@@ -215,11 +216,6 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme
         titleText.setText(context.getText(R.string.rettifica_giacenze_fragment_title).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
 
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
         BarcodeManager.disable();
@@ -250,7 +246,7 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme
 
     public void setUIToForn() {
         mBinding.rettificaGiacenzeFornCheckBox.setChecked(true);
-        mBinding.rettificaGiacenzeFornLayout.setBackground(getActivity().getResources().getDrawable(R.drawable.circular_background_left));
+        mBinding.rettificaGiacenzeFornLayout.setBackground(ResourcesCompat.getDrawable(getActivity().getResources(), R.drawable.circular_background_left, null));
         mBinding.rettificaGiacenzeFornLayout.setBackgroundTintList(ColorStateList.valueOf(getActivity().getResources().getColor(R.color.alpha_blue_500)));
 
         mBinding.rettificaGiacenzeArtIntCheckBox.setChecked(false);
@@ -261,7 +257,7 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme
 
     public void setUIToIntArt() {
         mBinding.rettificaGiacenzeArtIntCheckBox.setChecked(true);
-        mBinding.rettificaGiacenzeArtIntLayout.setBackground(getActivity().getResources().getDrawable(R.drawable.circular_background_left));
+        mBinding.rettificaGiacenzeArtIntLayout.setBackground(ResourcesCompat.getDrawable(getActivity().getResources(), R.drawable.circular_background_left, null));
         mBinding.rettificaGiacenzeArtIntLayout.setBackgroundTintList(ColorStateList.valueOf(getActivity().getResources().getColor(R.color.alpha_blue_500)));
 
         mBinding.rettificaGiacenzeFornCheckBox.setChecked(false);
@@ -527,7 +523,12 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme
 
     @Override
     public void onPreDestroy(Runnable onComplete) {
-        mViewModel.closeLU(false, onComplete);
         BarcodeManager.removeCallback(barcodeScannerIstanceID);
+        mViewModel.closeLU(false, onComplete);
+    }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
     }
 }

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

@@ -6,26 +6,37 @@ import android.os.Bundle;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.preference.PreferenceFragmentCompat;
 
+import java.util.ArrayList;
+
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 
 public class MainSettingsFragment extends PreferenceFragmentCompat implements ITitledFragment {
 
-
+    private final ArrayList<Runnable> onPreDestroyList = new ArrayList<>();
 
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         titleText.setText(context.getText(R.string.settings_category).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-
-    }
-
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.app_preferences, rootKey);
     }
 
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        onPreDestroyList.add(onPreDestroy);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        for (Runnable onPreDestroy :
+                onPreDestroyList) {
+            onPreDestroy.run();
+        }
+    }
 }

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

@@ -2,12 +2,14 @@ package it.integry.integrywmsnative.gest.spedizione;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.SpannableString;
 
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
@@ -55,6 +57,7 @@ import it.integry.integrywmsnative.databinding.ActivitySpedizioneBinding;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
 import it.integry.integrywmsnative.gest.spedizione.core.SpedizioneListAdapter;
 import it.integry.integrywmsnative.gest.spedizione.core.SpedizioneListModel;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
@@ -67,8 +70,8 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 import it.integry.integrywmsnative.view.dialogs.camera_barcode_reader.DialogCameraBarcodeReader;
 import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPeso;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 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.scan_art.DialogScanArtView;
 import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNo;
 
@@ -81,7 +84,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
-    private ObservableArrayList<SpedizioneListModel> mSpedizioneMutableData = new ObservableArrayList<>();
+    private final ObservableArrayList<SpedizioneListModel> mSpedizioneMutableData = new ObservableArrayList<>();
 
 
     public BindableBoolean addExtraItemsEnabled = new BindableBoolean(false);
@@ -93,6 +96,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     private boolean mEnableGiacenza;
     private boolean mFlagShowCodForn;
     private boolean mDivideByGrpMerc;
+    private boolean mEnableQuantityReset;
     private int barcodeScannerIstanceID = -1;
 
     private ArrayList<SitArtOrdDTO> mSitArtOrd;
@@ -101,12 +105,20 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     private GestioneEnum mGestioneCol;
     private int mSegnoCol;
     private Integer mDefaultCausaleUL;
+    private Class<? extends BaseDialogRowInfoView> mInfoDialogClassType;
 
     private boolean mShouldCloseActivity;
 
     private final int PICK_UL_REQUEST = 1;
 
-    public static void startActivity(Context context, List<SitArtOrdDTO> ordini, List<OrdineUscitaInevasoDTO> selectedOrders, List<MtbColt> mtbColtList, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL) {
+    public static void startActivity(Context context,
+                                     List<SitArtOrdDTO> ordini,
+                                     List<OrdineUscitaInevasoDTO> selectedOrders,
+                                     List<MtbColt> mtbColtList,
+                                     GestioneEnum gestioneCol,
+                                     int segnoCol,
+                                     Integer defaultCausaleUL,
+                                     Class<? extends BaseDialogRowInfoView> infoDialogClassType) {
         Intent myIntent = new Intent(context, SpedizioneActivity.class);
 
         String keyPickingList = DataCache.addItem(ordini);
@@ -127,6 +139,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         String keyDefaultCausaleUL = DataCache.addItem(defaultCausaleUL);
         myIntent.putExtra("keyDefaultCausaleCol", keyDefaultCausaleUL);
 
+        String keyInfoDialogClassType = DataCache.addItem(infoDialogClassType);
+        myIntent.putExtra("keyInfoDialogClassType", keyInfoDialogClassType);
+
         context.startActivity(myIntent);
     }
 
@@ -140,6 +155,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         mGestioneCol = DataCache.retrieveItem(getIntent().getStringExtra("keyGestioneCol"));
         mSegnoCol = DataCache.retrieveItem(getIntent().getStringExtra("keySegnoCol"));
         mDefaultCausaleUL = DataCache.retrieveItem(getIntent().getStringExtra("keyDefaultCausaleCol"));
+        mInfoDialogClassType = DataCache.retrieveItem(getIntent().getStringExtra("keyInfoDialogClassType"));
 
         mBindings = DataBindingUtil.setContentView(this, R.layout.activity_spedizione);
 
@@ -157,6 +173,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         mFlagShowCodForn = customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE);
         mDivideByGrpMerc = customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC);
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        mEnableQuantityReset = sharedPreferences.getBoolean("picking_uscita_enable_quantity_reset", true);
+
         mBindings.setLifecycleOwner(this);
         mBindings.setSpedizioneView(this);
 
@@ -191,7 +210,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 mTestateOrdini,
                 mColliRegistrati,
                 reportNameSpedizioneChiudiOrdine,
-                mGestioneCol, mSegnoCol, mDefaultCausaleUL);
+                mGestioneCol, mSegnoCol, mDefaultCausaleUL,
+                mEnableQuantityReset);
     }
 
     @Override
@@ -236,15 +256,15 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
             this.noItemsToPick.set(!isThereAnyItemToPick(updatedData));
         });
 
-        SpedizioneListAdapter spedizioneListAdapter = new SpedizioneListAdapter(this, mSpedizioneMutableData);
+        SpedizioneListAdapter spedizioneListAdapter = new SpedizioneListAdapter(this, mSpedizioneMutableData, mInfoDialogClassType, getSupportFragmentManager());
         this.mBindings.spedizionePickingList.setAdapter(spedizioneListAdapter);
         this.mBindings.spedizionePickingList.setLayoutManager(new LinearLayoutManager(this));
 
         spedizioneListAdapter.setOnItemClicked((clickedItem, refMtbColt) -> {
             if (!noLUPresent.get() &&
                     ((SettingsManager.iDB().isFlagSpedizioneEnableManualPick() &&
-                    clickedItem.getSitArtOrdDTO().isFlagEnablePickManuale())  ||
-                    clickedItem.getTempPickData() != null)) {
+                            clickedItem.getSitArtOrdDTO().isFlagEnablePickManuale()) ||
+                            clickedItem.getTempPickData() != null)) {
                 this.mViewmodel.dispatchOrdineRow(clickedItem, refMtbColt);
             }
         });
@@ -261,7 +281,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
         List<SpedizioneListModel> sortedList = null;
 
-        if(!mDivideByGrpMerc) {
+        if (!mDivideByGrpMerc) {
             Stream.of(tmpList)
                     .forEach(x -> {
                         SpedizioneListModel spedizioneListModel = new SpedizioneListModel();
@@ -324,10 +344,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
                             for (MtbColt mtbColtToPick : x.getMtbColts()) {
 
-                                if(UtilityBigDecimal.equalsTo(qtaColOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaColOrdCounter, BigDecimal.ZERO))
+                                if (UtilityBigDecimal.equalsTo(qtaColOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaColOrdCounter, BigDecimal.ZERO))
                                     break;
 
-                                if(UtilityBigDecimal.equalsTo(numCnfOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(numCnfOrdCounter, BigDecimal.ZERO))
+                                if (UtilityBigDecimal.equalsTo(numCnfOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(numCnfOrdCounter, BigDecimal.ZERO))
                                     break;
 
                                 SpedizioneListModel cloneModel = (SpedizioneListModel) spedizioneListModel.clone();
@@ -348,7 +368,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                     BigDecimal numCnfOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter);
 
                                     BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter);
-                                    if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue;
+                                    if (UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO))
+                                        continue;
                                     cloneModel.setQtaTot(qtaTot);
 
                                     numCnfOrdCounter = numCnfOrdCounter.subtract(numCnfOrdToSubstract);
@@ -372,7 +393,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                     BigDecimal qtaOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter);
 
                                     BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter);
-                                    if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue;
+                                    if (UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO))
+                                        continue;
                                     cloneModel.setQtaTot(qtaTot);
                                     qtaColOrdCounter = qtaColOrdCounter.subtract(qtaOrdToSubstract);
 
@@ -458,7 +480,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
                         String groupTitle = String.format("%s - %s", x.getSitArtOrdDTO().getDescrizioneMgrp(), x.getSitArtOrdDTO().getDescrizioneMsgr());
 
-                        if(!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneMsfa())) {
+                        if (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneMsfa())) {
                             groupTitle += " - " + x.getSitArtOrdDTO().getDescrizioneMsfa();
                         }
 
@@ -488,10 +510,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
                             for (MtbColt mtbColtToPick : x.getMtbColts()) {
 
-                                if(UtilityBigDecimal.equalsTo(qtaColOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaColOrdCounter, BigDecimal.ZERO))
-                                break;
+                                if (UtilityBigDecimal.equalsTo(qtaColOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaColOrdCounter, BigDecimal.ZERO))
+                                    break;
 
-                                if(UtilityBigDecimal.equalsTo(numCnfOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(numCnfOrdCounter, BigDecimal.ZERO))
+                                if (UtilityBigDecimal.equalsTo(numCnfOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(numCnfOrdCounter, BigDecimal.ZERO))
                                     break;
 
                                 SpedizioneListModel cloneModel = (SpedizioneListModel) spedizioneListModel.clone();
@@ -511,7 +533,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                     BigDecimal numCnfOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter);
 
                                     BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter);
-                                    if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue;
+                                    if (UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO))
+                                        continue;
                                     cloneModel.setQtaTot(qtaTot);
 
                                     numCnfOrdCounter = numCnfOrdCounter.subtract(numCnfOrdToSubstract);
@@ -533,7 +556,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                     BigDecimal qtaOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter);
 
                                     BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter);
-                                    if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue;
+                                    if (UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO))
+                                        continue;
                                     cloneModel.setQtaTot(qtaTot);
                                     qtaColOrdCounter = qtaColOrdCounter.subtract(qtaOrdToSubstract);
 
@@ -598,7 +622,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     public void addExtraItem() {
         DialogScanArtView
                 .newInstance((status, mtbAart, ean128Model, mtbColr) -> {
-                    if(status == DialogConsts.Results.YES) {
+                    if (status == DialogConsts.Results.YES) {
                         this.mViewmodel.dispatchExtraItem(mtbAart, ean128Model, mtbColr);
                     }
                 })
@@ -742,7 +766,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     public void onError(Exception ex) {
         this.closeProgress();
 
-        if(ex instanceof InvalidPesoKGException) {
+        if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
             UtilityExceptions.defaultException(this, ex, mCurrentProgress);

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

@@ -94,6 +94,7 @@ public class SpedizioneViewModel {
     private boolean mShouldAskPesoLU;
     private String mReportNameSpedizioneChiudiOrdine;
     private boolean mIsNewLU;
+    private boolean mEnableQuantityReset;
 
     private MtbColt mCurrentMtbColt = null;
 
@@ -135,7 +136,8 @@ public class SpedizioneViewModel {
                      String reportNameSpedizioneChiudiOrdine,
                      GestioneEnum gestioneCol,
                      int segnoCol,
-                     Integer defaultCausaleUL) {
+                     Integer defaultCausaleUL,
+                     boolean enableQuantityReset) {
         this.sendOnLoadingStarted();
 
         this.mDefaultCodMdep = codMdep;
@@ -147,6 +149,7 @@ public class SpedizioneViewModel {
         this.mShouldAskPesoLU = shouldAskPesoLU;
         this.mReportNameSpedizioneChiudiOrdine = reportNameSpedizioneChiudiOrdine;
         this.mDefaultCausaleOfUL = defaultCausaleUL;
+        this.mEnableQuantityReset = enableQuantityReset;
 
         if (enableGiacenza) {
             mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
@@ -1335,7 +1338,7 @@ public class SpedizioneViewModel {
                     .setNumCollo(value.getNumCollo())
                     .setGestione(value.getGestione())
                     .setSerCollo(value.getSerCollo())
-                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setRiga(value.getMtbColr().get(value.getMtbColr().size() - 1).getRiga())
                     .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
@@ -1674,59 +1677,44 @@ public class SpedizioneViewModel {
         this.mCurrentMtbColt = null;
 
 
-        for (PickingObjectDTO pickingObjectDTO : mPickingList.getValue()) {
+        if(mEnableQuantityReset) {
+            for (PickingObjectDTO pickingObjectDTO : mPickingList.getValue()) {
 
-            List<MtbColr> withdrawMtbColrList = pickingObjectDTO.getWithdrawMtbColrs();
+                List<MtbColr> withdrawMtbColrList = pickingObjectDTO.getWithdrawMtbColrs();
 
-            for (MtbColr withdrawMtbColr : withdrawMtbColrList) {
-                pickingObjectDTO.getSitArtOrdDTO().setNumCnfOrd(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd().subtract(withdrawMtbColr.getNumCnf()));
-                pickingObjectDTO.getSitArtOrdDTO().setQtaOrd(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd().subtract(withdrawMtbColr.getQtaCol()));
+                for (MtbColr withdrawMtbColr : withdrawMtbColrList) {
+                    pickingObjectDTO.getSitArtOrdDTO().setNumCnfOrd(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd().subtract(withdrawMtbColr.getNumCnf()));
+                    pickingObjectDTO.getSitArtOrdDTO().setQtaOrd(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd().subtract(withdrawMtbColr.getQtaCol()));
 
 
-                if (pickingObjectDTO.getMtbColts() != null) {
+                    if (pickingObjectDTO.getMtbColts() != null) {
 
-                    Optional<MtbColr> optionalMtbColrReference = Stream.of(pickingObjectDTO.getMtbColts())
-                            .filter(y -> withdrawMtbColr.getRefMtbColr() != null &&
-                                    withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) &&
-                                    withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) &&
-                                    withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) &&
-                                    withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) &&
-                                    UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodMart() : null) &&
-                                    UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodTagl(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodTagl() : null) &&
-                                    UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodCol(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodCol() : null))
-                            .map(y -> y.getMtbColr().get(0))
-                            .findFirst();
+                        Optional<MtbColr> optionalMtbColrReference = Stream.of(pickingObjectDTO.getMtbColts())
+                                .filter(y -> withdrawMtbColr.getRefMtbColr() != null &&
+                                        withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) &&
+                                        withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) &&
+                                        withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) &&
+                                        withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) &&
+                                        UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodMart() : null) &&
+                                        UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodTagl(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodTagl() : null) &&
+                                        UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodCol(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodCol() : null))
+                                .map(y -> y.getMtbColr().get(0))
+                                .findFirst();
 
 
-                    if (optionalMtbColrReference.isPresent()) {
-                        //looking for real refMtbColr instance
-                        MtbColr mtbColr = optionalMtbColrReference.get();
+                        if (optionalMtbColrReference.isPresent()) {
+                            //looking for real refMtbColr instance
+                            MtbColr mtbColr = optionalMtbColrReference.get();
+
+                            mtbColr.setNumCnf(mtbColr.getNumCnf().subtract(withdrawMtbColr.getNumCnf()));
+                            mtbColr.setQtaCol(mtbColr.getQtaCol().subtract(withdrawMtbColr.getQtaCol()));
+                        }
 
-                        mtbColr.setNumCnf(mtbColr.getNumCnf().subtract(withdrawMtbColr.getNumCnf()));
-                        mtbColr.setQtaCol(mtbColr.getQtaCol().subtract(withdrawMtbColr.getQtaCol()));
                     }
-
-//                    Stream.of(pickingObjectDTO.getMtbColts())
-//                            .filter(x -> Objects.equals(x.getNumCollo(), withdrawMtbColr.getNumColloRif()) &&
-//                                    x.getDataColloS().equals(withdrawMtbColr.getDataColloRifS()) &&
-//                                    x.getSerCollo().equalsIgnoreCase(withdrawMtbColr.getSerColloRif()) &&
-//                                    x.getGestione().equalsIgnoreCase(withdrawMtbColr.getGestioneRif()))
-//                            .forEach(x -> {
-//                                List<MtbColr> mtbColrList = x.getMtbColr();
-
-//                            Stream.of(mtbColrList)
-//                                    .filter(y -> y.getCodMart().equalsIgnoreCase(withdrawMtbColr.getCodMart()) &&
-//                                            UtilityString.equalsIgnoreCase(y.getPartitaMag(), withdrawMtbColr.getPartitaMag()) &&
-//                                            UtilityString.equalsIgnoreCase(y.getCodCol(), withdrawMtbColr.getCodCol()) &&
-//                                            UtilityString.equalsIgnoreCase(y.getCodTagl(), withdrawMtbColr.getCodTagl()))
-//                                    .for
-
-
-//                            });
                 }
-            }
 
-            pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>());
+                pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>());
+            }
         }
 
         this.mIsNewLU = false;

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

@@ -8,29 +8,37 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 
+import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupHeaderBinding;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupItemBinding;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 
 public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<SpedizioneListAdapter.SubheaderHolder, SpedizioneListAdapter.SingleItemViewHolder> {
 
-    private Context mContext;
+    private final Context mContext;
+    private final Class<? extends BaseDialogRowInfoView> mInfoDialogClassType;
+    private final FragmentManager mFragmentManager;
     private final List<SpedizioneListModel> mDataset = new ArrayList<>();
 
     private RunnableArgss<PickingObjectDTO, MtbColt> mOnItemClicked;
@@ -57,8 +65,10 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
     }
 
 
-    public SpedizioneListAdapter(AppCompatActivity context, ObservableArrayList<SpedizioneListModel> mutableDataSet) {
+    public SpedizioneListAdapter(AppCompatActivity context, ObservableArrayList<SpedizioneListModel> mutableDataSet, Class<? extends BaseDialogRowInfoView> infoDialogClassType, FragmentManager fragmentManager) {
         this.mContext = context;
+        this.mInfoDialogClassType = infoDialogClassType;
+        this.mFragmentManager = fragmentManager;
 
         mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
             @Override
@@ -113,8 +123,8 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingObjectDTO.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(mContext.getResources().getDrawable(!pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
-        holder.mBinding.qtaEvasa.setTextColor(mContext.getResources().getColor(!pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
         holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
@@ -137,6 +147,16 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         holder.mBinding.untMis.setText(pickingObjectDTO.getUntMis());
         holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE);
 
+        if (mInfoDialogClassType != null) {
+            holder.mBinding.infoRow.setVisibility(View.VISIBLE);
+            holder.mBinding.infoRow.setOnClickListener(new OnSingleClickListener() {
+                @Override
+                public void onSingleClick(View v) {
+                    openInfoDialog(pickingObjectDTO);
+                }
+            });
+        }
+
         holder.mBinding.getRoot().setOnClickListener(v -> {
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel(), pickingObjectDTO.getSourceMtbColt());
@@ -166,4 +186,20 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
     }
 
 
+    private void openInfoDialog(SpedizioneListModel item) {
+        try {
+            Constructor<?> cons = Class.forName(mInfoDialogClassType.getName()).getConstructors()[0];
+            BaseDialogRowInfoView object = (BaseDialogRowInfoView) cons.newInstance(item, (Runnable) () -> {
+
+            }, (Runnable) () -> {
+
+            });
+            object.show(mFragmentManager, "tag");
+
+        } catch (Exception e) {
+            UtilityExceptions.defaultException(this.mContext, e);
+        }
+
+    }
+
 }

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

@@ -0,0 +1,31 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.row_info;
+
+import org.jetbrains.annotations.NotNull;
+
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.gest.spedizione.core.SpedizioneListModel;
+
+public abstract class BaseDialogRowInfoView extends BaseDialogFragment implements IBaseDialogRowInfoView {
+
+    private final SpedizioneListModel mSpedizioneListModel;
+    private final Runnable mOnComplete;
+    private final Runnable mOnAbort;
+
+    public BaseDialogRowInfoView(@NotNull SpedizioneListModel spedizioneListModel, @NotNull Runnable onComplete, @NotNull Runnable onAbort) {
+        this.mSpedizioneListModel = spedizioneListModel;
+        this.mOnComplete = onComplete;
+        this.mOnAbort = onAbort;
+    }
+
+    protected SpedizioneListModel getSpedizioneListModel() {
+        return mSpedizioneListModel;
+    }
+
+    protected Runnable getOnComplete() {
+        return mOnComplete;
+    }
+
+    protected Runnable getOnAbort() {
+        return mOnAbort;
+    }
+}

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

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.row_info;
+
+public interface IBaseDialogRowInfoView {
+}

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

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogRowInfoProdFabbisognoLineeProdComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogRowInfoProdFabbisognoLineeProdComponent create();
+    }
+
+    void inject(DialogRowInfoProdFabbisognoLineeProdView dialogRowInfoProdFabbisognoLineeProdView);
+}

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

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+
+@Module(subcomponents = DialogRowInfoProdFabbisognoLineeProdComponent.class)
+public class DialogRowInfoProdFabbisognoLineeProdModule {
+
+
+    @Provides
+    DialogRowInfoProdFabbisognoLineeProdViewModel providesDialogRowInfoProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer prodFabbisognoLineeProdRESTConsumer) {
+        return new DialogRowInfoProdFabbisognoLineeProdViewModel(prodFabbisognoLineeProdRESTConsumer);
+    }
+
+}

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

@@ -0,0 +1,113 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.databinding.DialogRowInfoProdFabbisognoLineeProdBinding;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.gest.spedizione.core.SpedizioneListModel;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
+
+public class DialogRowInfoProdFabbisognoLineeProdView extends BaseDialogRowInfoView implements DialogRowInfoProdFabbisognoLineeProdViewModel.Listener {
+
+
+    @Inject
+    DialogRowInfoProdFabbisognoLineeProdViewModel mViewModel;
+
+    private Context mContext;
+    private DialogRowInfoProdFabbisognoLineeProdBinding mBindings;
+
+    public DialogRowInfoProdFabbisognoLineeProdView(@NotNull SpedizioneListModel spedizioneListModel, @NotNull Runnable onComplete, @NotNull Runnable onAbort) {
+        super(spedizioneListModel, onComplete, onAbort);
+    }
+
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.mContext = getActivity();
+
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_row_info_prod_fabbisogno_linee_prod, container, false);
+
+        MainApplication.appComponent
+                .dialogRowInfoProdFabbisognoLineeProdComponent()
+                .create()
+                .inject(this);
+
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(true);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        this.mViewModel.setListener(this);
+
+        return mBindings.getRoot();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        SitArtOrdDTO sitArtOrdDTO = getSpedizioneListModel().getOriginalModel().getSitArtOrdDTO();
+
+        this.mViewModel.getFabbisognoList().removeObservers(this);
+        this.mViewModel.getFabbisognoList().observe(this, this::onFabbisognoListLoaded);
+
+        this.mViewModel.init(
+                sitArtOrdDTO.getCodMart(),
+                sitArtOrdDTO.getCodMdep(),
+                (Date) sitArtOrdDTO.getExtraInfo().get("dataInizio"),
+                (Date) sitArtOrdDTO.getExtraInfo().get("dataFine"));
+    }
+
+    private void onFabbisognoListLoaded(List<ProdFabbisognoLineeProdDTO> fabbisognoList) {
+        for (int i = 0; i < fabbisognoList.size(); i++) {
+            String currentKey = fabbisognoList.get(i).getCodJfas();
+
+            ViewGroup.LayoutParams lparams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            TextView tv = new TextView(this.mContext);
+            tv.setLayoutParams(lparams);
+            tv.setText(currentKey);
+
+            this.mBindings.contentView.addView(tv);
+        }
+    }
+
+    @Override
+    public void onError(Exception ex) {
+        UtilityExceptions.defaultException(this.mContext, ex);
+        dismiss();
+    }
+
+    @Override
+    public void onLoadingStarted() {
+        this.mBindings.loadingView.setVisibility(View.VISIBLE);
+        this.mBindings.contentView.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void onLoadingEnded() {
+        this.mBindings.loadingView.setVisibility(View.GONE);
+        this.mBindings.contentView.setVisibility(View.VISIBLE);
+    }
+}

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

@@ -0,0 +1,61 @@
+package it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod;
+
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+
+public class DialogRowInfoProdFabbisognoLineeProdViewModel {
+
+    private final ProdFabbisognoLineeProdRESTConsumer mProdFabbisognoLineeProdRESTConsumer;
+
+    private final MutableLiveData<List<ProdFabbisognoLineeProdDTO>> mFabbisognoList = new MutableLiveData<>();
+
+    private Listener mListener;
+
+
+    public DialogRowInfoProdFabbisognoLineeProdViewModel(ProdFabbisognoLineeProdRESTConsumer mProdFabbisognoLineeProdRESTConsumer) {
+        this.mProdFabbisognoLineeProdRESTConsumer = mProdFabbisognoLineeProdRESTConsumer;
+    }
+
+
+    public void init(String codMart, String codMdep, Date startDate, Date endDate) {
+        this.sendOnLoadingStarted();
+
+        this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(codMart, startDate, endDate, codMdep, fabbisognoList -> {
+            this.mFabbisognoList.postValue(fabbisognoList);
+            this.sendOnLoadingEnded();
+        }, this::sendError);
+    }
+
+
+    public MutableLiveData<List<ProdFabbisognoLineeProdDTO>> getFabbisognoList() {
+        return mFabbisognoList;
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+    public interface Listener extends ILoadingListener {
+
+        void onError(Exception ex);
+
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java

@@ -24,7 +24,7 @@ import it.integry.integrywmsnative.ui.ElevatedToolbar;
 
 public class UltimeConsegneClienteFragment extends Fragment implements ITitledFragment, IScrollableFragment, IFilterableFragment {
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private UltimeConsegneClienteViewModel mViewModel;
@@ -71,23 +71,18 @@ public class UltimeConsegneClienteFragment extends Fragment implements ITitledFr
         titleText.setText(context.getText(R.string.ultime_consegne_cliente_title).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
     @Override
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
-        this.mOnPreDestroyList.add(onPreDestroy);
-    }
-
     @Override
     public void onFilterClick() {
         mViewModel.openFilterDialog();
     }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java

@@ -27,7 +27,7 @@ import it.integry.integrywmsnative.ui.ElevatedToolbar;
  */
 public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFragment, IScrollableFragment, IFilterableFragment {
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private UltimiArriviFornitoreViewModel mViewModel;
@@ -74,20 +74,11 @@ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFr
         titleText.setText(context.getText(R.string.ultime_arrivi_fornitore_title).toString());
     }
 
-    @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
-    }
-
     @Override
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;
     }
 
-    @Override
-    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
-        this.mOnPreDestroyList.add(onPreDestroy);
-    }
 
 
 
@@ -98,5 +89,8 @@ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFr
     }
 
 
-
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
 }

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

@@ -29,7 +29,7 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment
     private VersamentoMerceViewModel mVersamentoMerceViewModel;
     private VersamentoMerceHelper mHelper;
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
 
     private int barcodeScannerIstanceID = -1;
 
@@ -92,7 +92,7 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment
     }
 
     @Override
-    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
-        this.mOnPreDestroyList.add(onActionBarPreDestroy);
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
     }
 }

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

@@ -18,6 +18,7 @@ import android.widget.TextView;
 
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 
 import java.util.HashMap;
@@ -66,22 +67,22 @@ public class DialogSimpleMessageHelper {
         switch (type) {
             case INFO:
                 colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.light_blue_300);
-                titleIconRes = mContext.getResources().getDrawable(R.drawable.ic_info_78dp);
+                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_info_78dp, null);
                 break;
 
             case SUCCESS:
                 colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.green_300);
-                titleIconRes = mContext.getResources().getDrawable(R.drawable.ic_done_white_24dp);
+                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_done_white_24dp, null);
                 break;
 
             case WARNING:
                 colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.yellow_600);
-                titleIconRes = mContext.getResources().getDrawable(R.drawable.ic_warning_white_24dp);
+                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_warning_white_24dp, null);
                 break;
 
             case ERROR:
                 colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.red_300);
-                titleIconRes = mContext.getResources().getDrawable(R.drawable.ic_mood_bad_24dp);
+                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_mood_bad_24dp, null);
                 break;
         }
 

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

@@ -117,6 +117,13 @@ public class DialogInputQuantityV2ViewModel {
                     this.mtbAart.get().getBarCode() != null &&
                     (ean13PesoModel.getPrecode().contains(this.mtbAart.get().getBarCode()) || this.mtbAart.get().getBarCode().contains(ean13PesoModel.getPrecode()))) {
                 this.setQtaTot(BigDecimal.valueOf(ean13PesoModel.getPeso()));
+                this.setNumCnf(UtilityBigDecimal.divideAndRoundToInteger(this.getQtaTot(), this.mtbAart.get().getQtaCnf()));
+
+                if (!this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
+                    if (UtilityBigDecimal.equalsTo(this.getNumCnf(), BigDecimal.ZERO))
+                        this.setNumCnf(BigDecimal.ONE);
+                    this.setQtaCnf(UtilityBigDecimal.divide(this.getQtaTot(), this.getNumCnf()));
+                }
             }
 
             onComplete.run();
@@ -146,6 +153,13 @@ public class DialogInputQuantityV2ViewModel {
                     this.setNumCnf(BigDecimal.valueOf(ean128Model.Count));
                 } else if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0) {
                     this.setQtaTot(BigDecimal.valueOf(ean128Model.NetWeightKg));
+                    this.setNumCnf(UtilityBigDecimal.divideAndRoundToInteger(this.getQtaTot(), this.mtbAart.get().getQtaCnf()));
+
+                    if (!this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
+                        if (UtilityBigDecimal.equalsTo(this.getNumCnf(), BigDecimal.ZERO))
+                            this.setNumCnf(BigDecimal.ONE);
+                        this.setQtaCnf(UtilityBigDecimal.divide(this.getQtaTot(), this.getNumCnf()));
+                    }
                 }
 
                 this.mListener.onDataChanged();
@@ -306,7 +320,7 @@ public class DialogInputQuantityV2ViewModel {
         newValue = UtilityBigDecimal.getLowerBetween(newValue, totalQtaAvailable);
 
         //Se è piu' grande della qta da prelevare e non posso aggiungere qta extra allora ricalcolo
-        if (!canOverflowOrderQuantity) {
+        if (!canOverflowOrderQuantity && this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
             newValue = UtilityBigDecimal.getLowerBetween(newValue, totalQtaOrd);
             this.internalQtaTot = newValue;
             this.mListener.onDataChanged();

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.view.dialogs.scan_art;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
@@ -55,17 +56,11 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
         mOnItemChoosed = onItemChoosed;
     }
 
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.initBarcode();
-    }
-
-
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         this.mContext = getActivity();
+        this.initBarcode();
 
         mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_scan_art, container, false);
 
@@ -85,17 +80,19 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
             dismiss();
         });
 
-
-        getDialog().setOnDismissListener(dialog -> {
-            BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
-            BarcodeManager.enable();
-        });
-
         return mBindings.getRoot();
     }
 
 
 
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+        BarcodeManager.enable();
+        super.onDismiss(dialog);
+    }
+
+
     private void initBarcode() {
         mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessfull(onScanSuccessfull)

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
+    android:width="128dp"
+    android:height="128dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
 

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
+    android:width="128dp"
+    android:height="128dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
   <path

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
+    android:width="128dp"
+    android:height="128dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
   <path

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="250dp"
-    android:height="105dp"
+    android:width="200dp"
+    android:height="84dp"
     android:viewportWidth="250"
     android:viewportHeight="105">
 

app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml

@@ -7,14 +7,14 @@
         android:layout_height="wrap_content"
         android:background="@color/full_white">
 
-        <LinearLayout
-            android:id="@+id/content_view"
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/content_view_child"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="8dp">
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
@@ -49,7 +49,8 @@
                     tools:text="BADGE 2" />
 
 
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/primary_unt_mis"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="end"
@@ -84,39 +85,95 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/unt_mis"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:textAllCaps="true"
+                        android:textColor="@android:color/black"
+                        android:textStyle="bold"
+                        tools:text="cnf" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/descrizione"
+                    android:layout_alignParentStart="true"
+                    android:layout_toStartOf="@id/secondary_unt_mis"
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:textColor="@android:color/black"
+                    android:textSize="16sp"
+                    tools:text="DESCRIZIONE" />
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/secondary_unt_mis"
+                    android:layout_alignParentEnd="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:alpha="0.8">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/sec_qta_evasa"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:textColor="@color/green_700"
+                        android:textStyle="bold"
+                        tools:text="QTA" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" / "
+                        android:textStyle="bold" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/sec_qta_tot"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textColor="@android:color/black"
+                        tools:text="QTA" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/sec_unt_mis"
+                        style="@style/AppTheme.NewMaterial.Text.ExtraSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
                         android:textAllCaps="true"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
-                        tools:text="cnf"/>
+                        android:textStyle="bold"
+                        tools:text="cnf" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </LinearLayout>
+            </RelativeLayout>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/descrizione"
-                style="@style/AppTheme.NewMaterial.Text.Medium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textColor="@android:color/black"
-                android:textSize="16sp"
-                tools:text="DESCRIZIONE" />
 
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
         <View
             android:id="@+id/deactivated_over_bg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/content_view"
-            android:layout_alignBottom="@id/content_view"
-            android:background="@android:color/black"
-            android:alpha="0.15" />
+            android:layout_alignTop="@id/content_view_child"
+            android:layout_alignBottom="@id/content_view_child"
+            android:alpha="0.15"
+            android:background="@android:color/black" />
 
     </RelativeLayout>
 </layout>

app/src/main/res/layout/dialog_ask_magazzino_prossimita.xml

@@ -73,21 +73,21 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_linea_prod"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/production_line">
+<!--                    <com.google.android.material.textfield.TextInputLayout-->
+<!--                        android:id="@+id/input_linea_prod"-->
+<!--                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:hint="@string/production_line">-->
 
-                        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
-                            android:id="@+id/dropdown_linea_prod"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:singleLine="true"
-                            android:ellipsize="end"/>
+<!--                        <androidx.appcompat.widget.AppCompatAutoCompleteTextView-->
+<!--                            android:id="@+id/dropdown_linea_prod"-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:singleLine="true"-->
+<!--                            android:ellipsize="end"/>-->
 
-                    </com.google.android.material.textfield.TextInputLayout>
+<!--                    </com.google.android.material.textfield.TextInputLayout>-->
 
 
                     <androidx.appcompat.widget.LinearLayoutCompat

app/src/main/res/layout/dialog_custom_content_hashmap_viewmodel.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -13,41 +12,43 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.40" />
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.40" />
 
-    <TextView
-        android:id="@+id/dialog_content_hashmap_key"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        tools:text="TextView"
-        android:textColor="@android:color/black"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toStartOf="@+id/guideline"
-        app:layout_constraintStart_toStartOf="parent" />
+        <TextView
+            android:id="@+id/dialog_content_hashmap_key"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
+            android:textColor="@android:color/black"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toStartOf="@+id/guideline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="TextView" />
 
-    <TextView
-        android:id="@+id/dialog_content_hashmap_value"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        tools:text="TextView"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintEnd_toEndOf="parent" />
+        <TextView
+            android:id="@+id/dialog_content_hashmap_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/guideline"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="TextView" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </RelativeLayout>
 
-<!--<LinearLayout-->
+    <!--<LinearLayout-->
     <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
     <!--android:layout_width="match_parent"-->
     <!--android:layout_height="wrap_content"-->
@@ -56,18 +57,18 @@
     <!--android:weightSum="1">-->
 
     <!--<android.support.v7.widget.AppCompatTextView-->
-        <!--android:id="@+id/dialog_content_hashmap_key"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="Key"-->
-        <!--android:textColor="@android:color/black"-->
-        <!--android:layout_weight="0.4"/>-->
+    <!--android:id="@+id/dialog_content_hashmap_key"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:text="Key"-->
+    <!--android:textColor="@android:color/black"-->
+    <!--android:layout_weight="0.4"/>-->
 
     <!--<android.support.v7.widget.AppCompatTextView-->
-        <!--android:id="@+id/dialog_content_hashmap_value"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="Value"-->
-        <!--android:layout_weight="0.6"/>-->
+    <!--android:id="@+id/dialog_content_hashmap_value"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:text="Value"-->
+    <!--android:layout_weight="0.6"/>-->
 
-<!--</LinearLayout>-->
+    <!--</LinearLayout>-->

app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="0dp">
+
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/title_text"
+                    style="@style/TextViewMaterial.DialogTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/info" />
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/loading_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <!--                    <androidx.appcompat.widget.AppCompatTextView-->
+                    <!--                        style="@style/TextViewMaterial.DialogTitle"-->
+                    <!--                        android:layout_width="match_parent"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:gravity="center_horizontal"-->
+                    <!--                        android:text="@string/loading" />-->
+
+                    <ProgressBar
+                        android:id="@+id/progressBar"
+                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true" />
+
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/content_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:gravity="center_horizontal">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:text="Linee di impegno"
+                        android:layout_marginBottom="8dp"/>
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/content_view_child"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+            </LinearLayout>
+        </ScrollView>
+
+
+    </androidx.cardview.widget.CardView>
+</layout>

app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml

@@ -11,14 +11,23 @@
 
     </data>
 
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="2dp"
-        android:paddingEnd="4dp">
+        android:paddingEnd="4dp"
+        android:orientation="horizontal">
 
 
+
+        <View
+            android:id="@+id/empty_view"
+            android:layout_width="8dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp" />
+
         <RelativeLayout
             android:id="@+id/ordine_lavorazione_main_list_group_item_container_root"
             android:layout_width="match_parent"
@@ -89,7 +98,7 @@
             </RelativeLayout>
         </RelativeLayout>
 
-    </RelativeLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
 </layout>

app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml

@@ -32,7 +32,7 @@
                 android:id="@+id/badge1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="BADGE 1"
+                tools:text="BADGE 1"
                 android:background="@drawable/badge1_round_corner"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
@@ -49,7 +49,6 @@
                 style="@android:style/TextAppearance.Small"
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="4dp"
-                android:layout_toStartOf="@id/compilato_da"
                 android:layout_below="@id/badge1"
                 android:singleLine="true"
                 android:ellipsize="end"

app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml

@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <import type="android.view.View" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
         <variable
             name="articolo"
             type="it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="8dp">
 
         <LinearLayout
-
             android:id="@+id/linearLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             app:layout_constraintEnd_toStartOf="@+id/qta_box"
-            app:layout_constraintStart_toStartOf="parent">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -65,9 +68,9 @@
             android:layout_height="wrap_content"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
@@ -79,8 +82,8 @@
                 android:paddingRight="6dp"
                 android:paddingBottom="2dp"
                 android:text="@{UtilityNumber.decimalToString(articolo.qtaOrd) + `\n` + articolo.untMis}"
-                android:textSize="16sp"
                 android:textColor="@android:color/white"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 tools:text="280.45\nCONF" />
 

app/src/main/res/layout/picking_resi_main_list__item.xml

@@ -9,7 +9,7 @@
     android:focusable="true">
 
     <LinearLayout
-        android:id="@+id/content_view"
+        android:id="@+id/content_view_child"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -101,8 +101,8 @@
         android:id="@+id/deactivated_over_bg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/content_view"
-        android:layout_alignBottom="@id/content_view"
+        android:layout_alignTop="@id/content_view_child"
+        android:layout_alignBottom="@id/content_view_child"
         android:background="@android:color/black"
         android:alpha="0.15" />
 

app/src/main/res/layout/spedizione_main_list__group_item.xml

@@ -8,14 +8,14 @@
         android:layout_height="wrap_content"
         android:background="@color/full_white">
 
-        <LinearLayout
-            android:id="@+id/content_view"
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/content_view_child"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="8dp">
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
@@ -35,7 +35,7 @@
                     style="@style/AppTheme.NewMaterial.Text.Small"/>
 
 
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
@@ -84,12 +84,25 @@
                         android:textColor="@android:color/black"
                         android:layout_marginStart="4dp"
                         android:textAllCaps="true"
+                        android:layout_gravity="center_vertical"
                         style="@style/AppTheme.NewMaterial.Text.Small"
                         tools:text="cnf"/>
 
-                </LinearLayout>
 
-            </LinearLayout>
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/info_row"
+                        android:layout_width="22sp"
+                        android:layout_height="22sp"
+                        android:layout_marginStart="8dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="fitCenter"
+                        android:background="@drawable/ic_info_78dp"
+                        android:backgroundTint="@color/colorPrimary"
+                        android:visibility="gone"/>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/descrizione"
@@ -110,8 +123,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_alignParentStart="true"
-                    android:layout_toStartOf="@+id/vendita_ordine_inevaso_main_list_group_item_badge2">
+                    android:layout_alignParentStart="true">
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/subdescrizione1"
@@ -153,14 +165,14 @@
 
 
 
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
         <View
             android:id="@+id/deactivated_over_bg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/content_view"
-            android:layout_alignBottom="@id/content_view"
+            android:layout_alignTop="@id/content_view_child"
+            android:layout_alignBottom="@id/content_view_child"
             android:background="@android:color/black"
             android:alpha="0.15" />
 

app/src/main/res/layout/switch_item.xml

@@ -1,11 +0,0 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Switch
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
-</RelativeLayout>

app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml

@@ -6,7 +6,7 @@
     android:background="@color/full_white">
 
     <LinearLayout
-        android:id="@+id/content_view"
+        android:id="@+id/content_view_child"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -156,8 +156,8 @@
         android:id="@+id/deactivated_over_bg"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignTop="@id/content_view"
-        android:layout_alignBottom="@id/content_view"
+        android:layout_alignTop="@id/content_view_child"
+        android:layout_alignBottom="@id/content_view_child"
         android:background="@android:color/black"
         android:alpha="0.15" />
 

app/src/main/res/values-it/strings.xml

@@ -19,7 +19,7 @@
     <string name="accettazione_ordine_inevaso_title_multiple_order">Ordini di accettazione</string>
     <string name="vendita_title_fragment">Spedizione</string>
     <string name="rettifica_giacenze_fragment_title">Rettifica giacenze</string>
-    <string name="prod_fabbisogno_linee_prod_title">Fabbisogno linee prod.</string>
+    <string name="prod_fabbisogno_linee_prod_title">Approvvig. linee prod.</string>
     <string name="versamento_merce_fragment_title">Posizionamento merce</string>
     <string name="error">Errore</string>
     <string name="ops">Ops</string>
@@ -35,6 +35,7 @@
     <string name="scan_item">Scansiona il codice a barre di un <b>articolo</b></string>
     <string name="please_open_lu">Prima di procedere apri una <b>nuova UL</b></string>
     <string name="extra_item">Articolo extra</string>
+    <string name="info">Info</string>
     <string name="lu_info">Info UL</string>
 
 
@@ -65,7 +66,7 @@
     <string name="warehouse">Magazzino</string>
 
     <!-- SETTINGS -->
-    <string name="general_settings">Settaggi generali</string>
+    <string name="general_settings">Impostazioni</string>
 
     <plurals name="references">
         <item quantity="one">referenza</item>

app/src/main/res/values/colors.xml

@@ -43,6 +43,8 @@
     <color name="green_500">#4CAF50</color>
     <color name="green_600">#43A047</color>
     <color name="green_700">#388E3C</color>
+    <color name="green_800">#2e7d32</color>
+    <color name="green_900">#1b5e20</color>
 
 
     <color name="gray_100">#F5F5F5</color>

app/src/main/res/values/strings.xml

@@ -78,6 +78,7 @@
     <string name="action_close_order">Close order</string>
     <string name="action_show_created_ul">Show already created LU</string>
     <string name="dialog_input_peso_lu_description">Insert info about LU TYPE and NET / GROSS weight</string>
+    <string name="info">Info</string>
     <string name="lu_info">LU\'s info</string>
 
 

app/src/main/res/values/styles.xml

@@ -23,6 +23,10 @@
     <style name="AppTheme.NewMaterial.Text" parent = "AppTheme.NewMaterial">
         <item name="android:textStyle">normal</item>
     </style>
+    <style name="AppTheme.NewMaterial.Text.ExtraSmall" parent = "AppTheme.NewMaterial.Text">
+        <item name="android:textColor">@color/gray_600</item>
+        <item name="android:textSize">12sp</item>
+    </style>
     <style name="AppTheme.NewMaterial.Text.Small" parent = "AppTheme.NewMaterial.Text">
         <item name="android:textColor">@color/gray_600</item>
         <item name="android:textSize">14sp</item>

app/src/main/res/xml/app_preferences.xml

@@ -1,30 +1,42 @@
 <androidx.preference.PreferenceScreen
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <PreferenceCategory
+        app:title="@string/accettazione_title_fragment"/>
+
     <SwitchPreferenceCompat
-        app:key="notifications"
-        app:title="Enable message notifications"/>
+        app:key="picking_ingresso_enable_sec_unt_mis"
+        app:title="Abilita seconda unità di misura"
+        app:defaultValue="true"/>
 
-    <Preference
-        app:key="feedback"
-        app:title="Send feedback"
-        app:summary="Report technical issues or suggest new features"/>
+    <PreferenceCategory
+        app:title="@string/vendita_title_fragment"/>
+
+    <SwitchPreferenceCompat
+        app:key="picking_uscita_enable_quantity_reset"
+        app:title="Resetta le quantità ad ogni Chiudi UL"
+        app:defaultValue="true"/>
+
+<!--    <Preference-->
+<!--        app:key="feedback"-->
+<!--        app:title="Send feedback"-->
+<!--        app:summary="Report technical issues or suggest new features"/>-->
 
 
-    <ListPreference
-        app:key="check_in_printer"
-        app:title="@string/check_in_printer"
-        app:summary="%s"
-        app:entries="@array/printerTypes"
-        app:entryValues="@array/printerTypes"
-        app:defaultValue="0" />
+<!--    <ListPreference-->
+<!--        app:key="check_in_printer"-->
+<!--        app:title="@string/check_in_printer"-->
+<!--        app:summary="%s"-->
+<!--        app:entries="@array/printerTypes"-->
+<!--        app:entryValues="@array/printerTypes"-->
+<!--        app:defaultValue="0" />-->
 
-    <ListPreference
-        app:key="check_out_printer"
-        app:title="@string/check_out_printer"
-        app:summary="%s"
-        app:entries="@array/printerTypes"
-        app:entryValues="@array/printerTypes"
-        app:defaultValue="0" />
+<!--    <ListPreference-->
+<!--        app:key="check_out_printer"-->
+<!--        app:title="@string/check_out_printer"-->
+<!--        app:summary="%s"-->
+<!--        app:entries="@array/printerTypes"-->
+<!--        app:entryValues="@array/printerTypes"-->
+<!--        app:defaultValue="0" />-->
 
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/backup_descriptor.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- Exclude specific shared preferences that contain GCM registration Id -->
+</full-backup-content>

barcode_kaiteki/build.gradle

@@ -11,11 +11,18 @@ android {
         versionCode 1
         versionName "1.1.1"
     }
+
     compileOptions {
         kotlinOptions.freeCompilerArgs += ['-module-name', "barcode.kaiteki"]
         targetCompatibility = JavaVersion.VERSION_1_8
         sourceCompatibility = JavaVersion.VERSION_1_8
     }
+
+    // For Kotlin projects
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -28,9 +35,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.android.material:material:1.3.0-alpha03'
 
     api 'androidx.camera:camera-core:1.0.0-alpha03'

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.10'
+        kotlin_version = '1.4.31'
     }
 
     repositories {
@@ -12,11 +12,11 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:perf-plugin:1.3.3'
+        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.google.firebase:perf-plugin:1.3.5'
 
         // Add the Firebase Crashlytics Gradle plugin.
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

build_azienda.bat

@@ -26,11 +26,11 @@ rem rename %OUTTEXTFILE% %INTEXTFILE%
 
 rem cd ..
 
-RMDIR app\build\generated /S /Q 
-RMDIR app\build\intermediates /S /Q 
-RMDIR app\build\reports /S /Q 
-RMDIR app\build\test-results /S /Q 
-RMDIR app\build\tmp /S /Q 
+rem RMDIR app\build\generated /S /Q 
+rem RMDIR app\build\intermediates /S /Q 
+rem RMDIR app\build\reports /S /Q 
+rem RMDIR app\build\test-results /S /Q 
+rem RMDIR app\build\tmp /S /Q 
 
 XCOPY dynamic_%nome_azienda%\src\main\java\it\integry app\src\main\java\it\integry\ /E /Y
 CALL gradlew app:build --stacktrace

dynamic__base/build.gradle

@@ -1,18 +1,15 @@
 apply plugin: 'com.android.dynamic-feature'
 
 android {
-    compileSdkVersion 28
-
-
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-
-
     }
+
     compileOptions {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'

dynamic_frudis/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.dynamic-feature'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java

@@ -27,7 +27,7 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
                                 .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment)
                                 .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
                                 .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1)))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
 
                         .addItem(new MenuItem()
                                 .setID(it.integry.integrywmsnative.R.id.nav_free_picking)
@@ -61,7 +61,7 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
                                 .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
                                 .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_lavorazione)
                                 .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1)))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
 
                         .addItem(new MenuItem()
                                 .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale)

dynamic_gramm/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: "com.android.dynamic-feature"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java

@@ -47,7 +47,7 @@ public class MenuConfigurationGRAMM extends BaseMenuConfiguration {
                                         .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment)
                                         .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
                                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
-                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1)))
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_free_picking)
@@ -80,7 +80,7 @@ public class MenuConfigurationGRAMM extends BaseMenuConfiguration {
                                         .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
                                         .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_lavorazione)
                                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
-                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1)))
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_free_lav_picking)
@@ -91,7 +91,7 @@ public class MenuConfigurationGRAMM extends BaseMenuConfiguration {
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_prod_posizionamento_da_ord)
-                                        .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title)
+                                        .setTitleText(it.integry.integrywmsnative.R.string.prod_fabbisogno_linee_prod_title)
                                         .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_merce)
                                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
                                         .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance))

dynamic_ime/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.dynamic-feature'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java

@@ -46,7 +46,7 @@ public class MenuConfigurationIME extends BaseMenuConfiguration {
                                         .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment)
                                         .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
                                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
-                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1)))
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_free_picking)
@@ -79,7 +79,7 @@ public class MenuConfigurationIME extends BaseMenuConfiguration {
                                         .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
                                         .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_picking_lavorazione)
                                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
-                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1)))
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
                 ).addGroup(
                         new MenuGroup()
                                 .setGroupText(it.integry.integrywmsnative.R.string.internal_handling)

dynamic_saporiveri/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.dynamic-feature'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

dynamic_saporiveri_pv/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.dynamic-feature'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

dynamic_vgalimenti/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.dynamic-feature'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }

dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java

@@ -34,7 +34,7 @@ public class MenuConfigurationVG extends BaseMenuConfiguration {
                                         .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment)
                                         .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
                                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
-                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1)))
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_free_picking)

honeywellscannerlibrary/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

keyobardemulatorscannerlibrary/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -21,6 +21,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
 }
 

pointmobilescannerlibrary/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -21,6 +21,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
 }
 

zebrascannerlibrary/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -20,6 +20,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
 }