Finish v1.26.1(284)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 278
-    def appVersionName = '1.25.1'
+    def appVersionCode = 284
+    def appVersionName = '1.26.1'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidConnectionException.java

@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.exception;
+
+import java.util.Locale;
+
+public class InvalidConnectionException extends Exception {
+
+
+    public InvalidConnectionException(String host, int port, Throwable cause) {
+        super(String.format(Locale.ITALY, "Impossibile stabilire la connessione con il server (%s:%d)", host, port), cause);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/exception/NoResultFromBarcodeException.java

@@ -4,6 +4,11 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 
 public final class NoResultFromBarcodeException extends Exception {
+
+    public NoResultFromBarcodeException() {
+        super(UtilityResources.getString(R.string.no_result_from_barcode));
+    }
+
     public NoResultFromBarcodeException(String barcode) {
         super(UtilityResources.getString(R.string.no_result_from_barcode) + " (" + barcode + ")");
     }

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

@@ -1,7 +1,6 @@
 package it.integry.integrywmsnative.core.expansion;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -55,37 +54,31 @@ public abstract class BaseFragment extends Fragment {
     }
 
     public void onLoadingStarted() {
-        BarcodeManager.disable();
         this.openProgress();
     }
 
     public void onLoadingEnded() {
         this.closeProgress();
-        BarcodeManager.enable();
     }
 
     private void openProgress() {
-        Log.d("PROGRESS DIALOG", "OPENED");
-        new Thread(() -> {
+        BarcodeManager.disable();
         if (!progressOpened && !this.mCurrentProgress.isAdded()) {
             this.progressOpened = true;
             requireActivity().runOnUiThread(() -> {
                 this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
             });
         }
-        }).start();
     }
 
     private void closeProgress() {
-        Log.d("PROGRESS DIALOG", "CLOSED");
-        new Thread(() -> {
+        BarcodeManager.enable();
         if (progressOpened) {
             this.progressOpened = false;
             requireActivity().runOnUiThread(() -> {
                 mCurrentProgress.dismiss();
             });
         }
-        }).start();
     }
 
     public void onError(Exception ex) {

app/src/main/java/it/integry/integrywmsnative/core/expansion/view/ExtendedSectionedRecyclerView.java

@@ -21,13 +21,13 @@ public abstract class ExtendedSectionedRecyclerView<T, SH extends RecyclerView.V
     public ExtendedSectionedRecyclerView(ObservableArrayList<T> myDataset) {
         mDataset.addAll(myDataset);
 
-        myDataset.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+        myDataset.addOnListChangedCallback(new OnListGeneralChangedCallback<T>() {
             @Override
-            public void onChanged(ObservableList sender) {
+            public void onChanged(ObservableList<T> sender) {
                 mDataset.clear();
                 mDataset.addAll(sender);
-                notifyDataSetChanged();
                 notifyDataChanged();
+                notifyDataSetChanged();
                 checkIfEmpty();
             }
         });

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

@@ -0,0 +1,40 @@
+package it.integry.integrywmsnative.core.report;
+
+import com.google.gson.annotations.SerializedName;
+
+public enum ReportType {
+
+    @SerializedName("0")
+    ETICHETTA_SSCC_ACCETTAZIONE(0),
+    @SerializedName("1")
+    ETICHETTA_SSCC_LAVORAZIONE(1),
+    @SerializedName("2")
+    ETICHETTA_SSCC_SPEDIZIONE(2),
+    @SerializedName("3")
+    WMS_SPEDIZIONE_ETICHETTE_SSCC_ORD(3),
+    @SerializedName("4")
+    WMS_SPEDIZIONE_PACKING_LIST_ORD(4),
+    @SerializedName("5")
+    STAMPA_LISTINI_VENDITA(5);
+
+    private final int value;
+
+    ReportType(int value) {
+        this.value = value;
+    }
+
+    public static ReportType from(Object value) {
+        int castValue = (int) value;
+        for (ReportType b : ReportType.values()) {
+            if (b.value == castValue)
+                return b;
+        }
+        return null;
+    }
+
+
+    public int getValue() {
+        return this.value;
+    }
+
+}

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

@@ -5,6 +5,7 @@ import java.net.SocketTimeoutException;
 import java.util.HashMap;
 
 import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
+import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 
 /**
  * Created by GiuseppeS on 22/03/2018.
@@ -15,12 +16,17 @@ public class CommonRESTException {
     private static String MESSAGE_KEY = "message";
     private static String EXCEPTION_KEY = "exception";
 
-    private static HashMap<String, HashMap<String, Object>> bindingExceptions = new HashMap() {{
-        put("Printer not found", new HashMap<String, Object>(){{
+    private static final HashMap<String, HashMap<String, Object>> bindingExceptions = new HashMap<>() {{
+        put("Printer not found", new HashMap<>() {{
             put(MESSAGE_KEY, "Stampante non trovata");
             put(EXCEPTION_KEY, NoPrintersFoundException.class);
         }});
 
+        put("barcode non letto correttamente", new HashMap<>() {{
+            put(MESSAGE_KEY, "Barcode non letto correttamente");
+            put(EXCEPTION_KEY, NoResultFromBarcodeException.class);
+        }});
+
 
     }};
 
@@ -42,13 +48,11 @@ public class CommonRESTException {
 
         for(String key : bindingExceptions.keySet()) {
             if(message.contains(key)) {
-                Class classType = (Class) bindingExceptions.get(key).get(EXCEPTION_KEY);
+                Class<?> classType = (Class<?>) bindingExceptions.get(key).get(EXCEPTION_KEY);
 
                 try {
                     return (Exception) classType.newInstance();
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (InstantiationException e) {
+                } catch (IllegalAccessException | InstantiationException e) {
                     e.printStackTrace();
                 }
             }

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

@@ -21,6 +21,7 @@ public class RESTBuilder {
         return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true);
 
     }
+
     public static <T> T getService(final Class<T> service, int timeout) {
         return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, true, timeout);
 
@@ -62,4 +63,13 @@ public class RESTBuilder {
 
         return retrofit.create(service);
     }
+
+
+    public static String getDefaultHost() {
+        return SettingsManager.i().getServer().getHost();
+    }
+
+    public static int getDefaultPort() {
+        return SettingsManager.i().getServer().getPort();
+    }
 }

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

@@ -245,7 +245,14 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         MtbColt mtbColtToCreate = new MtbColt()
                 .initDefaultFields(gestione);
 
-        Integer customNumCollo = UtilityBarcode.getNumColloFromULAnonima(barcode);
+        Integer customNumCollo = null;
+
+        try {
+            customNumCollo = UtilityBarcode.getNumColloFromULAnonima(barcode);
+        } catch (Exception ex) {
+            onFailed.run(ex);
+        }
+
         String customSerCollo = CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE;
 
         if (customNumCollo != null) {

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

@@ -6,11 +6,11 @@ import java.util.List;
 
 import javax.inject.Singleton;
 
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbGestSetup;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.GestSetupDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -80,7 +80,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
 
     public static void getValues(List<StbGestSetup> stbGestSetupList, RunnableArgs<List<StbGestSetup>> onComplete, RunnableArgs<Exception> onFailed) {
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
-        service.getGestSetupValues(stbGestSetupList).enqueue(new Callback<ServiceRESTResponse<List<StbGestSetup>>>() {
+        service.getGestSetupValues(stbGestSetupList).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<StbGestSetup>>> call, Response<ServiceRESTResponse<List<StbGestSetup>>> response) {
                 analyzeAnswer(response, "GestSetup", onComplete, onFailed);

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

@@ -12,9 +12,11 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.report.ReportType;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.JasperDTO;
 import it.integry.integrywmsnative.core.rest.model.JasperPairDTO;
+import it.integry.integrywmsnative.core.rest.model.ReportTypeDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -115,4 +117,43 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
+    public void printReportType(ReportType reportType, String codMdep, String codAnag, HashMap<String, Object> params, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        ReportTypeDTO reportTypeDTO = new ReportTypeDTO();
+        reportTypeDTO.setReportType(reportType);
+        reportTypeDTO.setCodAnag(codAnag);
+        reportTypeDTO.setCodMdep(codMdep);
+
+        Stream.of(params)
+                .forEach(x -> reportTypeDTO.getParams().add(new JasperPairDTO(x.getKey(), x.getValue())));
+
+        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
+        printerService
+                .printReportType(reportTypeDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                        analyzeAnswer(response, "printReportType", data -> {
+                            onComplete.run();
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                        if (t.getMessage().contains("Printer not found")) {
+                            onFailed.run(new NoPrintersFoundException());
+                        } else onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void printReportType(ReportType reportType, HashMap<String, Object> params, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        printReportType(reportType, null, null, params, onComplete, onFailed);
+    }
+
+    public void printReportType(ReportType reportType, String codMdep, HashMap<String, Object> params, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        printReportType(reportType, codMdep, null, params, onComplete, onFailed);
+    }
+
+
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.JasperDTO;
+import it.integry.integrywmsnative.core.rest.model.ReportTypeDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -26,6 +27,11 @@ public interface PrinterRESTConsumerService {
             @Body JasperDTO jasperDTO
     );
 
+    @POST("printReportType")
+    Call<ServiceRESTResponse<Object>> printReportType(
+            @Body ReportTypeDTO reportTypeDTO
+    );
+
     @POST("wms/printEtichettaSSCC")
     Call<ServiceRESTResponse<Object>> printCollo(
             @Body MtbColt mtbColtToPrint

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

@@ -15,6 +15,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
+import java.net.ConnectException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -23,6 +24,7 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.CommonConst;
+import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
@@ -47,12 +49,14 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
         nativeSqlDTO.nativeSql = nativeSql;
 
         SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service.processSql(nativeSqlDTO).enqueue(new Callback<>() {
+        service
+                .processSql(nativeSqlDTO)
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "ProcessSql", o -> {
                             Gson gson = new GsonBuilder()
-                            .registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> {
+                                    .registerTypeAdapter(Date.class, (JsonDeserializer<?>) (json, typeOfT, context) -> {
                                         try {
                                             return UtilityDate.recognizeDate(json.getAsString());
                                         } catch (Exception e) {
@@ -75,6 +79,10 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
                         Logger.e(t, "ProcessSQL");
+
+                        if (t instanceof ConnectException)
+                            onFailed.run(new InvalidConnectionException(RESTBuilder.getDefaultHost(), RESTBuilder.getDefaultPort(), t));
+                        else
                             onFailed.run(new Exception(t));
                     }
                 });

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

@@ -13,7 +13,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Response;
 
-public class _BaseRESTConsumer {
+public abstract class _BaseRESTConsumer {
 
     public static <T> void analyzeAnswer(Response<ServiceRESTResponse<T>> response, String logTitle, RunnableArgs<T> onComplete, RunnableArgs<Exception> onFailed) {
         if (response.isSuccessful()) {
@@ -31,7 +31,6 @@ public class _BaseRESTConsumer {
                     }
                 } else {
                     Log.e(logTitle, response.body().getErrorMessage());
-//                    callback.onFailed(new Exception(response.body().getErrorMessage()));
                     onFailed.run(CommonRESTException.tryRecognizeException(response.body().getErrorMessage()));
                 }
             } else {
@@ -67,7 +66,7 @@ public class _BaseRESTConsumer {
                     }
                 } else {
                     Log.e(logTitle, response.body().getErrorMessage());
-                    onFailed.run(new Exception(response.body().getErrorMessage()));
+                    onFailed.run(CommonRESTException.tryRecognizeException(response.body().getErrorMessage()));
                 }
             } else {
                 Log.e(logTitle, response.message());
@@ -77,7 +76,9 @@ public class _BaseRESTConsumer {
             if (response.code() == 404) {
                 Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata");
                 onFailed.run(new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")"));
-            } else {
+            } else if (response.code() == 550)
+                onFailed.run(new NotValidLicenseException());
+            else {
                 Log.e(logTitle, "Status " + response.code() + ": " + response.message());
                 onFailed.run(new Exception("Status " + response.code() + ": " + response.message()));
             }
@@ -114,7 +115,9 @@ public class _BaseRESTConsumer {
             if (responseList.code() == 404) {
                 Log.e(logTitle, "Errore " + responseList.code() + ": risorsa non trovata");
                 onFailed.run(new Exception("Errore " + responseList.code() + ": risorsa non trovata (" + logTitle + ")"));
-            } else {
+            } else if (responseList.code() == 550)
+                onFailed.run(new NotValidLicenseException());
+            else {
                 Log.e(logTitle, "Status " + responseList.code() + ": " + responseList.message());
                 onFailed.run(new Exception("Status " + responseList.code() + ": " + responseList.message()));
             }

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

@@ -0,0 +1,51 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.report.ReportType;
+
+public class ReportTypeDTO {
+
+
+    private ReportType reportType;
+    private String codAnag;
+    private String codMdep;
+    private List<JasperPairDTO> params = new ArrayList<>();
+
+    public List<JasperPairDTO> getParams() {
+        return params;
+    }
+
+    public ReportTypeDTO setParams(List<JasperPairDTO> params) {
+        this.params = params;
+        return this;
+    }
+
+    public ReportType getReportType() {
+        return reportType;
+    }
+
+    public ReportTypeDTO setReportType(ReportType reportType) {
+        this.reportType = reportType;
+        return this;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public ReportTypeDTO setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public ReportTypeDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+}

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

@@ -42,7 +42,8 @@ public class DBSettingsModel {
     private boolean flagOrdinaArticoliOnScan;
     private String docInterniCheckFornitore;
     private String produzioneDefaultCodAnag;
-    private String reportNameSpedizionChiudiOrdine;
+    private boolean flagPrintPackingListOnOrderClose;
+    private boolean flagPrintEtichetteOnOrderClose;
     private int onNumCnfInputChanged = 1;
     private boolean flagAccettazioneUseQtaOrd = false;
     private boolean flagPickLiberoAllowEmptyDest = false;
@@ -281,12 +282,21 @@ public class DBSettingsModel {
         return this;
     }
 
-    public String getReportNameSpedizionChiudiOrdine() {
-        return reportNameSpedizionChiudiOrdine;
+    public boolean isFlagPrintPackingListOnOrderClose() {
+        return flagPrintPackingListOnOrderClose;
     }
 
-    public DBSettingsModel setReportNameSpedizionChiudiOrdine(String reportNameSpedizionChiudiOrdine) {
-        this.reportNameSpedizionChiudiOrdine = reportNameSpedizionChiudiOrdine;
+    public DBSettingsModel setFlagPrintPackingListOnOrderClose(boolean flagPrintPackingListOnOrderClose) {
+        this.flagPrintPackingListOnOrderClose = flagPrintPackingListOnOrderClose;
+        return this;
+    }
+
+    public boolean isFlagPrintEtichetteOnOrderClose() {
+        return flagPrintEtichetteOnOrderClose;
+    }
+
+    public DBSettingsModel setFlagPrintEtichetteOnOrderClose(boolean flagPrintEtichetteOnOrderClose) {
+        this.flagPrintEtichetteOnOrderClose = flagPrintEtichetteOnOrderClose;
         return this;
     }
 

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

@@ -273,7 +273,11 @@ public class SettingsManager {
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
-                .setKeySection("REPORT_PACKING_LIST"));
+                .setKeySection("FLAG_PRINT_PACKING_LIST_ON_CLOSE"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_PRINT_ETICHETTE_ON_CLOSE"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -327,7 +331,8 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
-            dbSettingsModelIstance.setReportNameSpedizionChiudiOrdine(getValueFromList(list, "SPEDIZIONE", "REPORT_PACKING_LIST", String.class));
+//            dbSettingsModelIstance.setFlagPrintPackingListOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_PACKING_LIST_ON_CLOSE", Boolean.class));
+//            dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
             dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class));
             dbSettingsModelIstance.setDocInterniCheckFornitore(getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class));
@@ -344,9 +349,15 @@ public class SettingsManager {
             if (onNumCnfInputChanged != null) {
                 dbSettingsModelIstance.setOnNumCnfInputChanged(onNumCnfInputChanged);
             }
-
+            String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+            GestSetupRESTConsumer.getBooleanValue("PICKING", "SPEDIZIONE", "FLAG_PRINT_PACKING_LIST_ON_CLOSE", codMdep, (value) -> {
+                dbSettingsModelIstance.setFlagPrintPackingListOnOrderClose(value);
+                GestSetupRESTConsumer.getBooleanValue("PICKING", "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", codMdep, (gestSetupDTO) -> {
+                    dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(value);
                     if (onComplete != null) onComplete.run();
                 }, onFailed);
+            }, onFailed);
+        }, onFailed);
 
     }
 

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

@@ -59,7 +59,6 @@ public class UtilityBarcode {
     }
 
 
-
     public static boolean isEanPeso(BarcodeScanDTO barcodeScanDTO) {
         return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().startsWith("2");
     }
@@ -81,18 +80,19 @@ public class UtilityBarcode {
     }
 
 
-
-    public static Integer getNumColloFromULAnonima(String barcode) {
+    public static Integer getNumColloFromULAnonima(String barcode) throws Exception {
         if (!UtilityString.isNullOrEmpty(barcode)) {
             barcode = barcode.trim();
-
-            return Integer.parseInt(barcode.substring(3));
+            try {
+                return Integer.parseInt(barcode.substring(3, 10));
+            } catch (NumberFormatException nfex) {
+                throw new Exception("Impossibile leggere il numero collo dal barcode: " + barcode);
+            }
         } else
             return null;
     }
 
 
-
     public static Integer getAnnoColloFromULAnonima(String barcode) {
         if (barcode != null) {
             return Integer.parseInt(barcode.substring(1, 3));
@@ -101,7 +101,6 @@ public class UtilityBarcode {
     }
 
 
-
     public static String convertITF14toEAN13(String barcodeITF14) {
         String barcodeEAN13 = null;
 

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

@@ -11,14 +11,19 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.Logger;
 
 import it.integry.integrywmsnative.BuildConfig;
+import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
+import it.integry.integrywmsnative.core.exception.InvalidLUException;
+import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class UtilityExceptions {
 
-    private static final Class<? extends Exception>[] FIREBASE_IGNORED_EXCEPTIONS = new Class[] {
-
+    private static final Class<?>[] FIREBASE_IGNORED_EXCEPTIONS = new Class[] {
+            InvalidConnectionException.class,
+            InvalidLUGestioneException.class,
+            InvalidLUException.class
     };
 
     public static void defaultException(Context context, Exception ex, DialogProgressView progressDialog) {

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

@@ -302,6 +302,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
         }
 
+        if (!filterLayoutView.isAdded())
             filterLayoutView.show(getSupportFragmentManager(), "TAG");
     }
 
@@ -825,6 +826,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .setCanLUBeClosed(true)
                 .setCanOverflowOrderQuantity(canOverflowQuantity);
 
+        if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
                     .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                     .setOnComplete((resultDTO, shouldCloseLU) -> {

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

@@ -221,10 +221,16 @@ public class AccettazionePickingViewModel {
                 if (!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) {
                     this.sendError(new NotCurrentYearLUException());
                 } else {
+                    int numCollo = -1;
 
+                    try {
+                        numCollo = UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue());
                         this.createNewLU(
-                            UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()),
+                                numCollo,
                                 CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, true, onComplete);
+                    } catch (Exception ex) {
+                        this.sendError(ex);
+                    }
                 }
             } else {
                 this.sendError(new AlreadyUsedAnonymousLabelException());

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

@@ -31,8 +31,8 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.FragmentDocInterniBinding;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoViewModel;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormActivity;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListAdapter;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListModel;
@@ -201,6 +201,6 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
 
     @Override
     public void onDocumentEditRequest(SqlMtbColt document, GrigliaAcquistiDTO arts) {
-        requireActivity().startActivity(DocInterniEditFormActivity.newInstance(requireActivity(),document,arts));
+        requireActivity().startActivity(DocInterniEditFormActivity.newInstance(requireActivity(), document, arts, mViewModel.getTipoDoc()));
     }
 }

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

@@ -2,8 +2,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Stream;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -17,10 +15,10 @@ import it.integry.integrywmsnative.core.di.BindableInteger;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoViewModel;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO;
-import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 
@@ -141,6 +139,13 @@ public class DocInterniViewModel {
         return this.dtbTipi.getValue().getCodDtip();
     }
 
+    public TipiDocDTO getTipoDoc() {
+        if (this.dtbTipi.getValue() == null) {
+            return null;
+        }
+        return this.dtbTipi.getValue();
+    }
+
     private String getCodMgrp() {
         if (this.mtbGrup.getValue() == null) {
             return null;

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

@@ -148,8 +148,7 @@ public class DialogSelectDocInfoViewModel {
     public boolean requiresNote() {
         return this.getSelectedTipoDoc() != null &&
                 this.getSelectedTipoDoc().getGestioneDoc().equals("P") &&
-                this.getSelectedTipoDoc().getGestione().equals("L")
-        ;
+                this.getSelectedTipoDoc().getGestione().equals("L");
     }
 
     public boolean isInputValid() {

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

@@ -6,6 +6,7 @@ public class TipiDocDTO {
     private String descrizione;
     private String gestione;
     private String gestioneDoc;
+    private boolean requireNote = false;
 
     public String getCodDtip() {
         return codDtip;
@@ -38,7 +39,17 @@ public class TipiDocDTO {
     public void setGestioneDoc(String gestioneDoc) {
         this.gestioneDoc = gestioneDoc;
     }
+
     public String getLabel() {
         return this.codDtip + " - " + this.descrizione;
     }
+
+    public boolean isRequireNote() {
+        return requireNote;
+    }
+
+    public TipiDocDTO setRequireNote(boolean requireNote) {
+        this.requireNote = requireNote;
+        return this;
+    }
 }

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

@@ -39,6 +39,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.ActivityContabDocInterniEditBinding;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiChildDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui.DocumentRowsListAdapter;
 import it.integry.integrywmsnative.ui.FabMenuCustomAnimations;
@@ -52,6 +53,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     private static final String DATA_KEY_DOCUMENT = "document";
     private static final String DATA_KEY_PRODUCTS_LIST = "productsList";
+    private static final String DATA_KEY_TIPO_DOC = "docType";
 
     @Inject
     MtbColrRepository documentRowsRepository;
@@ -75,13 +77,15 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     public BindableBoolean isDocumentExportable = new BindableBoolean(false);
     private final ObservableArrayList<SqlMtbColr> documentRowsObservableList = new ObservableArrayList<>();
 
-    public static Intent newInstance(Context context, SqlMtbColt document, GrigliaAcquistiDTO productList) {
+    public static Intent newInstance(Context context, SqlMtbColt document, GrigliaAcquistiDTO productList, TipiDocDTO tipoDoc) {
         Intent myIntent = new Intent(context, DocInterniEditFormActivity.class);
 
         String doc = DataCache.addItem(document);
         String productsKey = DataCache.addItem(productList);
+        String docType = DataCache.addItem(tipoDoc);
         myIntent.putExtra(DATA_KEY_DOCUMENT, doc);
         myIntent.putExtra(DATA_KEY_PRODUCTS_LIST, productsKey);
+        myIntent.putExtra(DATA_KEY_TIPO_DOC, docType);
         return myIntent;
     }
 
@@ -96,7 +100,14 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         SqlMtbColt document = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_DOCUMENT));
         GrigliaAcquistiDTO griglia = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_PRODUCTS_LIST));
         List<GrigliaAcquistiChildDTO> productList = griglia.getGrigliaAcquistiChild();
-        this.initViewModel(document, productList);
+        TipiDocDTO docType = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_TIPO_DOC));
+
+        this.initViewModel();
+        this.viewModel.setDocument(document);
+        this.viewModel.setProductsList(productList);
+        this.viewModel.setTipoDoc(docType);
+
+
         this.initView();
         this.initBindables();
         this.initRecyclerView();
@@ -137,12 +148,9 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         binding.bottomSheetMtbColrEdit.init(binding.bottomSheetMtbColrEdit, binding.bottomSheetMtbColrEditBackground);
     }
 
-    private void initViewModel(SqlMtbColt document, List<GrigliaAcquistiChildDTO> productList) {
+    private void initViewModel() {
         this.viewModel.init();
         this.viewModel.setListeners(this);
-        this.viewModel.setDocument(document);
-        this.viewModel.setProductsList(productList);
-
     }
 
     private void initRecyclerView() {
@@ -239,6 +247,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                 .setCanOverflowOrderQuantity(false)
                 .setCanLUBeClosed(false)
                 .setNotesAllowed(true)
+                .setNotesMandatory(this.viewModel.isNotesMandatory())
                 .setDataScadMandatory(flagTracciabilita)
                 .setCanPartitaMagBeChanged(flagTracciabilita)
                 .setSuggestPartitaMag(data -> {
@@ -249,6 +258,8 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                     }
                     return partitaMag;
                 });
+
+        if (!dialogInputQuantityV2View.isAdded())
             dialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                     .setOnComplete((resultDTO, shouldCloseLU) -> {
                         this.onLoadingStarted();

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

@@ -26,6 +26,7 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ColloDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiChildDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2ResultDTO;
 
@@ -38,6 +39,7 @@ public class DocInterniEditFormViewModel {
     private final DocInterniRESTConsumer docInterniRESTConsumer;
     private DocInterniEditFormViewModel.Listener listener;
     private List<GrigliaAcquistiChildDTO> productsList;
+    private TipiDocDTO tipoDoc;
     private boolean isCheckPartitaMag = false;
     private JSONObject checkFornitoreRules = null;
     public MutableLiveData<SqlMtbColt> document = new MutableLiveData<>();
@@ -299,6 +301,15 @@ public class DocInterniEditFormViewModel {
         return Stream.of(productsList).filter(prod -> prod.codMart.equalsIgnoreCase(codMart)).findFirstOrElse(null);
     }
 
+    public DocInterniEditFormViewModel setTipoDoc(TipiDocDTO docType) {
+        this.tipoDoc = docType;
+        return this;
+    }
+
+    public boolean isNotesMandatory() {
+        return this.tipoDoc != null && this.tipoDoc.isRequireNote();
+    }
+
     public interface Listener extends ILoadingListener {
 
         void onError(Exception ex);

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

@@ -75,10 +75,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
     }
 
     public static MainFragment newInstance() {
-        MainFragment fragment = new MainFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
+        return new MainFragment();
     }
 
     @Override

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

@@ -42,6 +42,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
@@ -180,6 +181,8 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
         for (Runnable onPreDestroy : mOnPreDestroyList) {
             onPreDestroy.run();
         }
+
+        mViewModel.setListener(null);
         super.onDestroy();
     }
 
@@ -682,6 +685,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                 break;
         }
 
+        if (!filterLayoutView.isAdded())
             filterLayoutView.show(requireActivity().getSupportFragmentManager(), "TAG");
     }
 
@@ -689,12 +693,11 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
         this.onLoadingStarted();
 
-        this.mViewModel.processBarcodeDTO(data, () -> {
-            this.onLoadingEnded();
-        });
+        this.mViewModel.processBarcodeDTO(data, this::onLoadingEnded);
     };
 
     private void refreshList(List<OrdiniUscitaElencoDTO> filteredList) {
+        requireActivity().runOnUiThread(() -> {
             List<OrdiniUscitaElencoDTO> tmpList;
 
             if (filteredList != null) {
@@ -713,6 +716,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
             fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
                     .anyMatch(y -> y.getSelectedObservable().get()));
+        });
     }
 
     private List<OrdiniUscitaElencoListModel> convertDataModelToListModel(List<OrdiniUscitaElencoDTO> dataList) {
@@ -777,6 +781,17 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
         this.mViewModel.loadPicking(selectedOrders, this.mAppliedFilterViewModel.getSelectedMtbGrup());
     }
 
+    @Override
+    public void onFilterNumOrderApplied(List<OrdiniUscitaElencoDTO> filteredOrder) {
+        requireActivity().runOnUiThread(() -> {
+            var numOrders = Stream.of(filteredOrder)
+                    .map(OrdineInevasoDTO::getNumOrd)
+                    .distinct()
+                    .toList();
+            this.mAppliedFilterViewModel.setNumOrdFilter(numOrders);
+        });
+    }
+
     @Override
     public void onOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders) {
         refreshList(filteredOrders);

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

@@ -154,12 +154,15 @@ public class OrdiniUscitaElencoViewModel {
     public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
 
         RunnableArgs<List<OrdiniUscitaElencoDTO>> onBarcodeScanComplete = orderList -> {
-            onComplete.run();
             this.sendOnOrderFiltered(orderList);
+            onComplete.run();
         };
 
         if (UtilityBarcode.isBarcodeOrdineV(barcodeScanDTO)) {
-            this.executeEtichettaOrdineV(barcodeScanDTO.getStringValue(), onBarcodeScanComplete);
+            this.executeEtichettaOrdineV(barcodeScanDTO.getStringValue(), foundOrder -> {
+                this.sendOnFilterNumOrderApplied(foundOrder);
+                onComplete.run();
+            });
         } else if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
             this.executeEtichettaLU(barcodeScanDTO.getStringValue(), onBarcodeScanComplete);
         } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
@@ -196,10 +199,11 @@ public class OrdiniUscitaElencoViewModel {
         final String finalGestione = gestione;
         final Date finalDate = date;
 
-        List<OrdiniUscitaElencoDTO> filteredOrders = Stream.of(mOrderList.getValue())
-                .filter(x -> x.getNumOrd() == numOrd && x.getGestione().equalsIgnoreCase(finalGestione) && x.getDataOrdD().equals(finalDate)).toList();
+        List<OrdiniUscitaElencoDTO> foundItem = Stream.of(mOrderList.getValue())
+                .filter(x -> x.getNumOrd() == numOrd && x.getGestione().equalsIgnoreCase(finalGestione) && x.getDataOrdD().equals(finalDate))
+                .toList();
 
-        onComplete.run(filteredOrders);
+        onComplete.run(foundItem);
     }
 
 
@@ -284,6 +288,10 @@ public class OrdiniUscitaElencoViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    private void sendOnFilterNumOrderApplied(List<OrdiniUscitaElencoDTO> filteredOrder) {
+        if (this.mListener != null) mListener.onFilterNumOrderApplied(filteredOrder);
+    }
+
     private void sendOnOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders) {
         if (this.mListener != null) mListener.onOrderFiltered(filteredOrders);
     }
@@ -297,6 +305,8 @@ public class OrdiniUscitaElencoViewModel {
 
         void onError(Exception ex);
 
+        void onFilterNumOrderApplied(List<OrdiniUscitaElencoDTO> filteredOrder);
+
         void onOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders);
 
         void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts);

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

@@ -337,6 +337,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(canLUBeClosed);
 
+        if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                     .setOnComplete((resultDTO, shouldCloseLU) -> {
                         PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()

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

@@ -626,7 +626,7 @@ public class PickingLiberoViewModel {
                                 UtilityString.equalsIgnoreCase(x.getCodCol(), mtbColrToUpdate.getCodCol()) &&
                                 UtilityString.equalsIgnoreCase(x.getCodTagl(), mtbColrToUpdate.getCodTagl()) &&
                                 UtilityString.equalsIgnoreCase(x.getPartitaMag(), mtbColrToUpdate.getPartitaMag()))
-                        .single();
+                        .findFirstOrElse(null);
             }
 
 

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

@@ -318,6 +318,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
                 .setCanLUBeClosed(false)
                 .setCanPartitaMagBeChanged(false);
 
+        if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
                     .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                     .setOnComplete((resultDTO, shouldCloseLU) -> {

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

@@ -302,10 +302,16 @@ public class PickingResiViewModel {
                 if (!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) {
                     this.sendError(new NotCurrentYearLUException());
                 } else {
+                    int numCollo = -1;
 
+                    try {
+                        numCollo = UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue());
                         this.createNewLU(
-                            UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()),
+                                numCollo,
                                 CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, onComplete);
+                    } catch (Exception ex) {
+                        this.sendError(ex);
+                    }
                 }
             } else {
 

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

@@ -274,6 +274,7 @@ public class ProdOrdineProduzioneElencoFragment extends BaseFragment implements
                 break;
         }
 
+        if (!filterLayoutView.isAdded())
             filterLayoutView.show(requireActivity().getSupportFragmentManager(), "TAG");
 
     }
@@ -382,8 +383,6 @@ public class ProdOrdineProduzioneElencoFragment extends BaseFragment implements
     }
 
 
-
-
     private void initJtbComtCache(Runnable onComplete) {
         var jtbComts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrderList().getValue()))
                 .flatMap(x -> Stream.of(x.getCodJcom()))

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

@@ -201,6 +201,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                 .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
                 .setCanLUBeClosed(canLUBeClosed);
 
+        if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
                     .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                     .setOnComplete((resultDTO, shouldCloseLU) -> {
@@ -215,6 +216,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                     })
                     .setOnAbort(this::onLoadingEnded)
                     .show(requireActivity().getSupportFragmentManager(), "tag");
+        else this.onLoadingEnded();
     }
 
     @Override

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

@@ -378,6 +378,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(canLUBeClosed);
 
+        if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
                     .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                     .setOnComplete((resultDTO, shouldCloseLU) -> {
@@ -391,10 +392,10 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                         this.onLoadingStarted();
                         onComplete.run(pickedQuantityDTO, shouldCloseLU);
                     })
-                .setOnAbort(() -> {
-                    this.onLoadingEnded();
-                })
+                    .setOnAbort(this::onLoadingEnded)
                     .show(requireActivity().getSupportFragmentManager(), "tag");
+
+        else this.onLoadingEnded();
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.SpannableString;
+import android.widget.Toast;
 
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
@@ -191,9 +192,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         this.initBarcodeReader();
         this.initRecyclerView();
 
-
-        String reportNameSpedizioneChiudiOrdine = SettingsManager.iDB().getReportNameSpedizionChiudiOrdine();
-        closeOrderButtonEnabled.set(!UtilityString.isNullOrEmpty(reportNameSpedizioneChiudiOrdine));
+        closeOrderButtonEnabled.set(SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose());
 
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
@@ -203,7 +202,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         boolean shouldAskPesoLU = SettingsManager.iDB().isFlagAskPesoColloSpedizione();
         boolean useQtaOrd = SettingsManager.iDB().isFlagSpedizioneUseQtaOrd();
 
-        if (!mEnableFakeGiacenza) this.onLoadingStarted();
         mViewmodel.init(
                 codMdep,
                 !mEnableFakeGiacenza,
@@ -213,7 +211,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 mSitArtOrd,
                 mTestateOrdini,
                 mColliRegistrati,
-                reportNameSpedizioneChiudiOrdine,
                 mGestioneCol, mSegnoCol, mDefaultCausaleUL,
                 mEnableQuantityReset,
                 useQtaOrd);
@@ -695,7 +692,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         this.addExtraItemsEnabled.set(false);
         noLUPresent.set(true);
         this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
-        closeOrderButtonEnabled.set(!UtilityString.isNullOrEmpty(SettingsManager.iDB().getReportNameSpedizionChiudiOrdine()));
+        closeOrderButtonEnabled.set(SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose());
 
         if (this.mShouldCloseActivity) super.onBackPressed();
     }
@@ -810,6 +807,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 .setCanLUBeClosed(true)
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged);
 
+        if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
                     .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
                     .setOnComplete((resultDTO, shouldCloseLU) -> {
@@ -827,6 +825,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                         this.mViewmodel.resetMatchedRows();
                     })
                     .show(getSupportFragmentManager(), "tag");
+        else Toast.makeText(this, "Dialog già a video", Toast.LENGTH_LONG).show();
     }
 
     @Override

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

@@ -26,7 +26,6 @@ import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.exception.InvalidLUException;
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
-import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException;
 import it.integry.integrywmsnative.core.expansion.AtomicBigDecimal;
@@ -45,6 +44,7 @@ import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.report.ReportType;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
@@ -55,6 +55,7 @@ import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -91,7 +92,6 @@ public class SpedizioneViewModel {
     private boolean mEnableCheckPartitaMag;
     private boolean mCanOverflowOrderQuantity;
     private boolean mShouldAskPesoLU;
-    private String mReportNameSpedizioneChiudiOrdine;
     private boolean mIsNewLU;
     private boolean mEnableQuantityReset;
     private boolean mUseQtaOrd;
@@ -133,7 +133,6 @@ public class SpedizioneViewModel {
                      List<SitArtOrdDTO> pickingList,
                      List<OrdineUscitaInevasoDTO> testateOrdini,
                      List<MtbColt> colliRegistrati,
-                     String reportNameSpedizioneChiudiOrdine,
                      GestioneEnum gestioneCol,
                      int segnoCol,
                      Integer defaultCausaleUL,
@@ -148,7 +147,6 @@ public class SpedizioneViewModel {
         this.mEnableCheckPartitaMag = enableCheckPartitaMag;
         this.mCanOverflowOrderQuantity = canOverflowOrderQuantity;
         this.mShouldAskPesoLU = shouldAskPesoLU;
-        this.mReportNameSpedizioneChiudiOrdine = reportNameSpedizioneChiudiOrdine;
         this.mDefaultCausaleOfUL = defaultCausaleUL;
         this.mEnableQuantityReset = enableQuantityReset;
         this.mUseQtaOrd = useQtaOrd;
@@ -210,9 +208,9 @@ public class SpedizioneViewModel {
                         .distinct()
                         .toList();
 
-                if (foundGestioni != null && foundGestioni.size() > 1) {
+                if (foundGestioni.size() > 1) {
                     return;
-                } else if (foundGestioni != null && foundGestioni.size() == 1) {
+                } else if (foundGestioni.size() == 1) {
                     mDefaultGestioneOfUL = foundGestioni.get(0);
                 } else {
                     mDefaultGestioneOfUL = GestioneEnum.VENDITA;
@@ -511,10 +509,15 @@ public class SpedizioneViewModel {
                 if (!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) {
                     this.sendError(new NotCurrentYearLUException());
                 } else {
+                    int numCollo = -1;
 
-                    this.createNewLU(
-                            UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()),
+                    try {
+                        numCollo = UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue());
+                        this.createNewLU(numCollo,
                                 CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, onComplete);
+                    } catch (Exception ex) {
+                        this.sendError(ex);
+                    }
                 }
             } else {
 
@@ -1849,48 +1852,77 @@ public class SpedizioneViewModel {
     public void closeOrder() {
         this.sendOnLoadingStarted();
 
-        Runnable onComplete = () -> this.sendOnLoadingEnded();
-
-        this.mPrinterRESTConsumer.getAvailablePrinters(mDefaultCodMdep, PrinterRESTConsumer.Type.PRIMARIA, printerList -> {
-
-            if (printerList == null || printerList.size() == 0) {
-                this.sendError(new NoPrintersFoundException());
-                onComplete.run();
-                return;
+        Runnable printEtichetteOrderRunnable = () -> {
+            if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()) {
+                cyclicPrintListEtichette(
+                        this.mTestateOrdini.iterator(),
+                        this::sendOnLoadingEnded,
+                        ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));
             }
 
+        };
+
+        if (SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
 
             cyclicPrintPackingList(
                     this.mTestateOrdini.iterator(),
-                    printerList.get(0),
-                    onComplete,
-                    ex -> this.sendLUPrintError(ex, onComplete));
 
-        }, this::sendError);
+                    printEtichetteOrderRunnable,
+                    ex -> this.sendLUPrintError(ex, printEtichetteOrderRunnable));
+        } else {
+            printEtichetteOrderRunnable.run();
+        }
+
 
     }
 
-    private void cyclicPrintPackingList(@NotNull Iterator<OrdineUscitaInevasoDTO> sourceTestateOrdineVenditaIterator, String printerName, Runnable onComplete, RunnableArgs<Exception> onAbort) {
+    private void cyclicPrintPackingList(@NotNull Iterator<OrdineUscitaInevasoDTO> sourceTestateOrdineVenditaIterator, Runnable onComplete, RunnableArgs<Exception> onAbort) {
         if (sourceTestateOrdineVenditaIterator.hasNext()) {
-            singlePrintPackingList(sourceTestateOrdineVenditaIterator.next(), printerName, () -> {
-                cyclicPrintPackingList(sourceTestateOrdineVenditaIterator, printerName, onComplete, onAbort);
+            singlePrintPackingList(sourceTestateOrdineVenditaIterator.next(), () -> {
+                cyclicPrintPackingList(sourceTestateOrdineVenditaIterator, onComplete, onAbort);
             }, onAbort);
         } else {
             onComplete.run();
         }
     }
 
-    private void singlePrintPackingList(OrdineUscitaInevasoDTO ordineUscitaInevasoDTO, String printerName, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    private void cyclicPrintListEtichette(@NotNull Iterator<OrdineUscitaInevasoDTO> sourceTestateOrdineVenditaIterator, Runnable onComplete, RunnableArgs<Exception> onAbort) {
+        if (sourceTestateOrdineVenditaIterator.hasNext()) {
+            singlePrintListEtichette(sourceTestateOrdineVenditaIterator.next(), () -> {
+                cyclicPrintListEtichette(sourceTestateOrdineVenditaIterator, onComplete, onAbort);
+            }, onAbort);
+        } else {
+            onComplete.run();
+        }
+    }
+
+    private void singlePrintPackingList(OrdineUscitaInevasoDTO ordineUscitaInevasoDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         HashMap<String, Object> params = new HashMap<>();
         params.put("gestione", ordineUscitaInevasoDTO.getGestione());
         params.put("num_ord", ordineUscitaInevasoDTO.getNumOrd());
         params.put("data_ord", UtilityDate.formatDate(ordineUscitaInevasoDTO.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH));
 
-        this.mPrinterRESTConsumer.printReport(
-                printerName,
-                this.mReportNameSpedizioneChiudiOrdine,
+        this.mPrinterRESTConsumer.printReportType(
+                ReportType.WMS_SPEDIZIONE_PACKING_LIST_ORD,
+                SettingsManager.i().getUserSession().getDepo().getCodMdep(),
+                ordineUscitaInevasoDTO.getCodAnagOrd(),
+                params,
+                onComplete,
+                onFailed);
+
+    }
+
+    private void singlePrintListEtichette(OrdineUscitaInevasoDTO ordineUscitaInevasoDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("gestione", ordineUscitaInevasoDTO.getGestione());
+        params.put("num_ord", ordineUscitaInevasoDTO.getNumOrd());
+        params.put("data_ord", UtilityDate.formatDate(ordineUscitaInevasoDTO.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH));
+
+        this.mPrinterRESTConsumer.printReportType(
+                ReportType.WMS_SPEDIZIONE_ETICHETTE_SSCC_ORD,
+                SettingsManager.i().getUserSession().getDepo().getCodMdep(),
+                ordineUscitaInevasoDTO.getCodAnagOrd(),
                 params,
-                1,
                 onComplete,
                 onFailed);
 

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

@@ -203,6 +203,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
                 .setCanPartitaMagBeChanged(canBatchLotBeChanged)
                 .setCanLUBeClosed(false);
 
+        if (!mDialogInputQuantityV2View.isVisible())
             this.requireActivity().runOnUiThread(() -> {
                 mDialogInputQuantityV2View
                         .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
@@ -221,6 +222,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
                         .setOnAbort(this::onLoadingEnded)
                         .show(requireActivity().getSupportFragmentManager(), "tag");
             });
+        else this.onLoadingEnded();
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/InvalidNotesException.java

@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.view.dialogs.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class InvalidNotesException extends Exception {
+
+    public InvalidNotesException() {
+        super(UtilityResources.getString(R.string.empty_notes_input_message));
+    }
+
+}

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

@@ -30,6 +30,7 @@ public class DialogInputQuantityV2DTO {
     private boolean canPartitaMagBeChanged = true;
     private boolean isDataScadMandatory = false;
     private boolean isNotesAllowed = false;
+    private boolean isNotesMandatory = false;
     private boolean canLUBeClosed;
     private boolean saveOnImeDone = false;
 
@@ -229,6 +230,15 @@ public class DialogInputQuantityV2DTO {
         return this;
     }
 
+    public boolean isNotesMandatory() {
+        return isNotesMandatory;
+    }
+
+    public DialogInputQuantityV2DTO setNotesMandatory(boolean notesMandatory) {
+        isNotesMandatory = notesMandatory;
+        return this;
+    }
+
     public RunnableArgsWithReturn<DialogInputQuantityV2ViewModel, String> getSuggestPartitaMag() {
         return suggestPartitaMag;
     }

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

@@ -143,6 +143,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 .setQtaCnfAvailable(mDialogInputQuantityV2DTO.getQtaCnfAvailable())
                 .setPartitaMag(mDialogInputQuantityV2DTO.getPartitaMag())
                 .setNote(mDialogInputQuantityV2DTO.getNote())
+                .setIsNoteMandatory(mDialogInputQuantityV2DTO.isNotesMandatory())
                 .setSuggestPartitaMagRunnable(mDialogInputQuantityV2DTO.getSuggestPartitaMag())
                 .setDataScad(mDialogInputQuantityV2DTO.getDataScad());
 

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

@@ -18,6 +18,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.view.dialogs.exception.InvalidBatchLotException;
 import it.integry.integrywmsnative.view.dialogs.exception.InvalidExpireDateException;
+import it.integry.integrywmsnative.view.dialogs.exception.InvalidNotesException;
 import it.integry.integrywmsnative.view.dialogs.exception.InvalidQtaCnfQuantityException;
 import it.integry.integrywmsnative.view.dialogs.exception.InvalidQuantityException;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowNumCnfAvailableQuantityException;
@@ -50,6 +51,7 @@ public class DialogInputQuantityV2ViewModel {
 
     public Boolean shouldAskDataScad;
     public Boolean shouldShowDataScad;
+    public Boolean isNoteMandatory;
 
     private BigDecimal initialNumCnf;
     private BigDecimal initialQtaCnf;
@@ -403,7 +405,8 @@ public class DialogInputQuantityV2ViewModel {
             this.mListener.onError(new InvalidQtaCnfQuantityException());
             return false;
 
-        } else if (mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) {
+        }
+        if (mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) {
             if (suggestPartitaMagRunnable != null) {
                 internalPartitaMag = suggestPartitaMagRunnable.run(this);
                 if (internalPartitaMag == null) {
@@ -415,38 +418,45 @@ public class DialogInputQuantityV2ViewModel {
                 return false;
             }
 
-        } else if (this.shouldAskDataScad && UtilityString.isNullOrEmpty(internalPartitaMag)) {
+        }
+        if (this.shouldAskDataScad && UtilityString.isNullOrEmpty(internalPartitaMag)) {
 
             this.mListener.onError(new InvalidBatchLotException());
             return false;
 
-        } else if (this.shouldAskDataScad && this.internalDataScad == null) {
+        }
+        if (this.shouldAskDataScad && this.internalDataScad == null) {
 
             this.mListener.onError(new InvalidExpireDateException());
             return false;
 
-        } else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
+        }
+        if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
                 this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
 
             this.mListener.onError(new OverflowQtaTotOrderedQuantityException());
             return false;
 
-        } else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfOrd)) {
+        }
+        if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfOrd)) {
 
             this.mListener.onError(new OverflowNumCnfOrderedQuantityException());
             return false;
 
-        } else if (UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaAvailable)) {
+        }
+        if (UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaAvailable)) {
 
             this.mListener.onError(new OverflowQtaTotAvailableQuantityException());
             return false;
 
-        } else if (UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfAvailable)) {
+        }
+        if (UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfAvailable)) {
 
             this.mListener.onError(new OverflowNumCnfAvailableQuantityException());
             return false;
 
-        } else if (this.internalNumCnf == null || this.internalQtaCnf == null || this.internalQtaTot == null ||
+        }
+        if (this.internalNumCnf == null || this.internalQtaCnf == null || this.internalQtaTot == null ||
                 UtilityBigDecimal.equalsOrLowerThan(this.internalNumCnf, BigDecimal.ZERO) ||
                 UtilityBigDecimal.equalsOrLowerThan(this.internalQtaCnf, BigDecimal.ZERO) ||
                 UtilityBigDecimal.equalsOrLowerThan(this.internalQtaTot, BigDecimal.ZERO)) {
@@ -455,6 +465,10 @@ public class DialogInputQuantityV2ViewModel {
             return false;
 
         }
+        if (this.isNoteMandatory() && (this.internalNote == null || this.internalNote.length() <= 0)) {
+            this.mListener.onError(new InvalidNotesException());
+            return false;
+        }
 
         if (!UtilityString.isNullOrEmpty(this.internalPartitaMag))
             this.internalPartitaMag = this.internalPartitaMag.toUpperCase();
@@ -486,6 +500,14 @@ public class DialogInputQuantityV2ViewModel {
         return this;
     }
 
+    public Boolean isNoteMandatory() {
+        return isNoteMandatory;
+    }
+
+    public DialogInputQuantityV2ViewModel setIsNoteMandatory(Boolean noteMandatory) {
+        isNoteMandatory = noteMandatory;
+        return this;
+    }
 
     public MtbAart getMtbAart() {
         return this.mtbAart.get();

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

@@ -110,7 +110,7 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
 
             var filteredMtbColrList = mtbColrList;
 
-            if (mtbAart != null) {
+            if (mtbAart != null && filteredMtbColrList != null) {
                 filteredMtbColrList = Stream.of(filteredMtbColrList)
                         .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
                         .toList();

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

@@ -178,6 +178,7 @@
     <string name="invalid_production_line_error_message"><![CDATA[<b>Linea di produzione</b> non valida]]></string>
     <string name="expire_date_error_message"><![CDATA[La <b>data di scadenza</b> inserita non è valida]]></string>
     <string name="batch_lot_error_message"><![CDATA[Il <b>lotto</b> inserito non è valido]]></string>
+    <string name="empty_notes_input_message"><![CDATA[Il <b>campo note</b> deve essere compilato per il modulo corrente.]]></string>
     <string name="settings_category">Impostazioni</string>
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>

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

@@ -178,6 +178,7 @@
     <string name="invalid_production_line_error_message"><![CDATA[Invalid <b>production line</b>]]></string>
     <string name="expire_date_error_message"><![CDATA[The inserted <b>expire date</b> is not valid, please check it.]]></string>
     <string name="batch_lot_error_message"><![CDATA[The inserted <b>batch lot</b> is not valid, please check it.]]></string>
+    <string name="empty_notes_input_message"><![CDATA[The <b>notes field</b> requires to be filled in for the current form.]]></string>
     <string name="settings_category">Settings</string>
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>