Finish v1.24.1(269)

Aggiunto ulteriore controllo su licenza

.idea/runConfigurations/app_base.xml

@@ -15,6 +15,7 @@
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -45,7 +46,7 @@
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Callstack Sample" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>

.idea/runConfigurations/app_vglimenti.xml

@@ -15,6 +15,7 @@
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -45,7 +46,7 @@
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Callstack Sample" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 265
-    def appVersionName = '1.23.10'
+    def appVersionCode = 269
+    def appVersionName = '1.24.1'
 
     signingConfigs {
         release {
@@ -85,6 +85,7 @@ android {
     dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti"]
 
 
+
 }
 
 dependencies {
@@ -138,7 +139,6 @@ dependencies {
     implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
     implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
     implementation 'com.github.fede87:StatusBarAlert:1.0.1'
-    testImplementation 'junit:junit:4.13.2'
     implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
@@ -157,11 +157,14 @@ dependencies {
     implementation project(':barcode_base_android_library')
     implementation project(':honeywellscannerlibrary')
     implementation project(':keyobardemulatorscannerlibrary')
-    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
-    androidTestImplementation 'org.testng:testng:7.4.0'
 
 
     implementation 'com.github.RaviKoradiya:LiveAdapter:1.3.4'
+
+    // Required -- JUnit 4 framework
+//    testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"
+//    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+//    androidTestImplementation 'org.testng:testng:7.4.0'
 }
 
 repositories {

app/src/androidTest/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModelTest.java

@@ -1,8 +0,0 @@
-package it.integry.integrywmsnative.gest.spedizione;
-
-class SpedizioneViewModelTest {
-
-    @org.junit.jupiter.api.Test
-    void createNewLU() {
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java

@@ -18,7 +18,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 
-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 7, exportSchema = false)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 8, exportSchema = false)
 @TypeConverters({
         DateConverter.class
 })

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java

@@ -4,7 +4,9 @@ import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
 import androidx.room.Query;
+import androidx.room.RawQuery;
 import androidx.room.Update;
+import androidx.sqlite.db.SupportSQLiteQuery;
 
 import java.util.List;
 
@@ -45,6 +47,9 @@ public interface ArticoloGrigliaDao {
     @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode) AND id_griglia = :idGriglia LIMIT 1")
     Integer getIdArticoloByGrigliaAndBarcodeAndCodMart(int idGriglia, String barCode, String codMart);
 
+    @RawQuery(observedEntities = ArticoloGriglia.class)
+    List<ArticoloGriglia> getArticoli(SupportSQLiteQuery query);
+
     @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId")
     List<ArticoloGriglia> getArticoliFromGriglia(int grigliaId);
 

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java

@@ -27,7 +27,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 public class ArticoloGriglia {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "articolo_griglia_id")
-    private int articoloGrigliaId;
+    private Integer articoloGrigliaId;
 
     @ColumnInfo(name = "cod_mart")
     private String codMart;
@@ -74,11 +74,11 @@ public class ArticoloGriglia {
     @ColumnInfo(name = "new_no_promo")
     private boolean newNoPromo = false;
 
-    public int getArticoloGrigliaId() {
+    public Integer getArticoloGrigliaId() {
         return articoloGrigliaId;
     }
 
-    public void setArticoloGrigliaId(int articoloGrigliaId) {
+    public void setArticoloGrigliaId(Integer articoloGrigliaId) {
         this.articoloGrigliaId = articoloGrigliaId;
     }
 

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java

@@ -87,7 +87,7 @@ public class ArticoloOrdine {
         return articoloOrdineId;
     }
 
-    public void setArticoloOrdineId(int articoloOrdineId) {
+    public void setArticoloOrdineId(Integer articoloOrdineId) {
         this.articoloOrdineId = articoloOrdineId;
     }
 

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/implementations/ArticoliGrigliaDataSource.java

@@ -5,7 +5,14 @@ import com.annimon.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
@@ -24,27 +31,21 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
         this.mArticoloGrigliaDao = articoloGrigliaDao;
     }
 
-    public void saveArticoliToGriglia(List<ArticoloGriglia> articoli, Griglia griglia, Runnable onSuccess, RunnableArgs<Exception> onFail) {
+    public void saveArticoliToGriglia(List<ArticoloGriglia> updatedArts, Griglia griglia, Runnable onSuccess, RunnableArgs<Exception> onFail) {
         execute(() -> {
             try {
-                List<ArticoloGriglia> toUpdate = new ArrayList<>();
-                List<ArticoloGriglia> toInsert = new ArrayList<>();
-                List<String> codMarts = new ArrayList<>();
-                for (ArticoloGriglia art : articoli) {
-                    Integer id = mArticoloGrigliaDao.getIdArticoloByGrigliaAndBarcodeAndCodMart(griglia.getGrigliaId(), art.getBarCode(), art.getCodMart());
-                    codMarts.add(art.getCodMart());
-                    if (id != null) {
-                        art.setArticoloGrigliaId(id);
-                        toUpdate.add(art);
-                    } else {
-                        toInsert.add(art);
-                    }
-                }
+                var tmp = calcItemsToInsertAndUpdate(updatedArts);
+                var toInsert = (List<ArticoloGriglia>) tmp.get("toInsert");
+                var toUpdate = (List<ArticoloGriglia>) tmp.get("toUpdate");
+                var codMarts = (List<String>) tmp.get("codMarts");
+
                 mArticoloGrigliaDao.insertAll(toInsert);
                 mArticoloGrigliaDao.updateAll(toUpdate);
+
                 List<ArticoloGriglia> articoliGriglia = mArticoloGrigliaDao.getArticoliFromGriglia(griglia.getGrigliaId());
                 List<ArticoloGriglia> toDelete = Stream.of(articoliGriglia).filter(articolo -> !codMarts.contains(articolo.getCodMart())).toList();
                 mArticoloGrigliaDao.deleteList(toDelete);
+
                 onSuccess.run();
             } catch (Exception e) {
                 onFail.run(e);
@@ -52,6 +53,52 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
         });
     }
 
+    private HashMap<String, Object> calcItemsToInsertAndUpdate(List<ArticoloGriglia> updatedArts) throws InterruptedException, ExecutionException {
+        var toInsert = new ArrayList<ArticoloGriglia>();
+        var toUpdate = new ArrayList<ArticoloGriglia>();
+        var codMarts = new ArrayList<String>();
+
+        int cores = Runtime.getRuntime().availableProcessors();
+        ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(cores);
+        List<Callable<ArticoloGriglia>> calls = new ArrayList<>();
+
+        for (int i = 0; i < updatedArts.size(); i++) {
+            int finalI = i;
+            Callable<ArticoloGriglia> callableTask = () -> {
+                var updatedArt = updatedArts.get(finalI);
+                Integer id = mArticoloGrigliaDao.getIdArticoloByGrigliaAndBarcodeAndCodMart(updatedArt.getIdGriglia(), updatedArt.getBarCode(), updatedArt.getCodMart());
+
+                if (id != null) {
+                    updatedArt.setArticoloGrigliaId(id);
+                }
+
+                return updatedArt;
+            };
+
+            calls.add(callableTask);
+        }
+
+        List<Future<ArticoloGriglia>> futures = executor.invokeAll(calls, Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+
+        for (Future<ArticoloGriglia> future : futures) {
+            if (future.isDone()) {
+                codMarts.add(future.get().getCodMart());
+                if (future.get().getArticoloGrigliaId() == null) toInsert.add(future.get());
+                else toUpdate.add(future.get());
+            } else {
+                future.cancel(true);
+            }
+        }
+
+        var tmp = new HashMap<String, Object>();
+
+        tmp.put("toInsert", toInsert);
+        tmp.put("toUpdate", toUpdate);
+        tmp.put("codMarts", codMarts);
+
+        return tmp;
+    }
+
     public void findArticoloByBarcodeAndGriglia(String barcode, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onFail) {
         execute(() -> {
             try {

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

@@ -4,7 +4,7 @@ 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/exception/NotValidLicenseException.java

@@ -0,0 +1,8 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class NotValidLicenseException extends Exception {
+
+    public NotValidLicenseException() {
+        super("Licenza non valida");
+    }
+}

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

@@ -59,7 +59,7 @@ public class BaseActivity extends AppCompatActivity {
 
     protected void openProgress() {
         BarcodeManager.disable();
-        if (!progressOpened) {
+        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
             this.progressOpened = true;
             runOnUiThread(() -> {
                 this.mCurrentProgress.show(getSupportFragmentManager(), "tag");

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

@@ -1,28 +1,28 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableList;
+import androidx.databinding.ObservableList.OnListChangedCallback;
 
-public abstract class OnListGeneralChangedCallback extends ObservableList.OnListChangedCallback {
+public abstract class OnListGeneralChangedCallback<T> extends OnListChangedCallback<ObservableList<T>> {
 
 
     @Override
-    public void onItemRangeChanged(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeChanged(ObservableList<T> sender, int positionStart, int itemCount) {
         onChanged(sender);
     }
 
     @Override
-    public void onItemRangeInserted(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeInserted(ObservableList<T> sender, int positionStart, int itemCount) {
         onChanged(sender);
     }
 
     @Override
-    public void onItemRangeMoved(ObservableList sender, int fromPosition, int toPosition, int itemCount) {
+    public void onItemRangeMoved(ObservableList<T> sender, int fromPosition, int toPosition, int itemCount) {
         onChanged(sender);
     }
 
     @Override
-    public void onItemRangeRemoved(ObservableList sender, int positionStart, int itemCount) {
+    public void onItemRangeRemoved(ObservableList<T> sender, int positionStart, int itemCount) {
         onChanged(sender);
     }
 

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

@@ -2,12 +2,16 @@ package it.integry.integrywmsnative.core.model;
 
 import androidx.databinding.ObservableArrayList;
 
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+
 import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
@@ -105,11 +109,40 @@ public class MtbColt extends EntityBase {
         }
     }
 
-    public MtbColt initDefaultFields() {
+    public MtbColt initDefaultFields(GestioneEnum gestioneEnum) {
+        setGestione(gestioneEnum);
         setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
         setPreparatoDa(SettingsManager.i().getUser().getFullname());
         setOraInizPrep(UtilityDate.getDateInstance());
-        setCodAnag(SettingsManager.iDB().getDefaultCodAnag());
+
+        String codAnagToUse = null;
+        switch (gestioneEnum) {
+            case ACQUISTO:
+            case LAVORAZIONE:
+                if(SettingsManager.iDB().getInternalCodAnags() == null) break;
+
+                Optional<InternalCodAnagsDTO> optCodAnagForn = Stream.of(SettingsManager.iDB().getInternalCodAnags())
+                        .filter(InternalCodAnagsDTO::isFornitore)
+                        .findFirst();
+
+                if(optCodAnagForn.isEmpty()) break;
+
+                codAnagToUse = optCodAnagForn.get().getCodAnag();
+                break;
+            case VENDITA:
+                if(SettingsManager.iDB().getInternalCodAnags() == null) break;
+
+                Optional<InternalCodAnagsDTO> optCodAnagClie = Stream.of(SettingsManager.iDB().getInternalCodAnags())
+                        .filter(InternalCodAnagsDTO::isCliente)
+                        .findFirst();
+
+                if(optCodAnagClie.isEmpty()) break;
+
+                codAnagToUse = optCodAnagClie.get().getCodAnag();
+                break;
+        }
+
+        setCodAnag(codAnagToUse);
 
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/model/dto/InternalCodAnagsDTO.java

@@ -0,0 +1,35 @@
+package it.integry.integrywmsnative.core.model.dto;
+
+public class InternalCodAnagsDTO {
+
+    private String codAnag;
+    private boolean isCliente;
+    private boolean isFornitore;
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public InternalCodAnagsDTO setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public boolean isCliente() {
+        return isCliente;
+    }
+
+    public InternalCodAnagsDTO setCliente(boolean cliente) {
+        isCliente = cliente;
+        return this;
+    }
+
+    public boolean isFornitore() {
+        return isFornitore;
+    }
+
+    public InternalCodAnagsDTO setFornitore(boolean fornitore) {
+        isFornitore = fornitore;
+        return this;
+    }
+}

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

@@ -104,10 +104,9 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     public void createColloLavorazione(int segno, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToCreate = new MtbColt()
-                .setSegno(segno)
-                .setGestione(GestioneEnum.LAVORAZIONE);
+                .setSegno(segno);
 
-        mtbColtToCreate.initDefaultFields();
+        mtbColtToCreate.initDefaultFields(GestioneEnum.LAVORAZIONE);
 
         mtbColtToCreate
                 .setOperation(CommonModelConsts.OPERATION.INSERT);
@@ -123,9 +122,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void createColloScaricoDaCarico(MtbColt sourceMtbColt, MtbDepoPosizione posizione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
-                .initDefaultFields()
+                .initDefaultFields(GestioneEnum.LAVORAZIONE)
                 .setCodAnag(null)
-                .setGestione(GestioneEnum.LAVORAZIONE)
                 .setSegno(-1)
                 .setCodTcol(sourceMtbColt.getCodTcol())
                 .setPesoKg(sourceMtbColt.getPesoKg())
@@ -176,9 +174,8 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
-                .initDefaultFields()
+                .initDefaultFields(GestioneEnum.LAVORAZIONE)
                 .setCodAnag(null)
-                .setGestione(GestioneEnum.LAVORAZIONE)
                 .setSegno(-1)
                 .setCodTcol(sourceMtbColt.getCodTcol())
 //                .setPesoKg(sourceMtbColt.getPesoKg())
@@ -246,9 +243,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void createColloFromEtichettaAnonima(String barcode, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt mtbColtToCreate = new MtbColt()
-                .setGestione(gestione);
-
-        mtbColtToCreate.initDefaultFields();
+                .initDefaultFields(gestione);
 
         Integer customNumCollo = UtilityBarcode.getNumColloFromULAnonima(barcode);
         String customSerCollo = CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE;

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

@@ -6,6 +6,7 @@ import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -41,32 +42,35 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
         PVOrdiniAcquistoRESTConsumerService ordiniARestService = RESTBuilder.getService(PVOrdiniAcquistoRESTConsumerService.class);
         ordiniARestService
                 .getArticoliListino(codAlis)
-                .enqueue(new Callback<ServiceRESTResponse<GrigliaDTO>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<GrigliaDTO>> call, Response<ServiceRESTResponse<GrigliaDTO>> response) {
                         analyzeAnswer(response, "getArticoliListino", griglia -> {
 
                             UtilityThread.executeParallel(() -> {
+                                var startTime = new Date().getTime();
+
                                 List<ArticoloDTO> listaArticoli = new ArrayList<>();
+
                                 Stream.of(griglia.getGrigliaAcquistiChild())
-                                        .map(ArticoloDTO::getCodMart)
-                                        .distinct()
-                                        .withoutNulls()
-                                        .forEach(art -> {
-                                            List<ArticoloDTO> inList = Stream.of(griglia.getGrigliaAcquistiChild())
-                                                    .filter(x -> x.getCodMart().equalsIgnoreCase(art))
-                                                    .toList();
-                                            if (inList.size() > 1) {
-                                                for (ArticoloDTO articolo : inList) {
+                                        .groupBy(ArticoloDTO::getCodMart)
+                                        .forEach(entry -> {
+
+                                            if(entry.getValue().size() == 1) {
+                                                listaArticoli.add(entry.getValue().get(0));
+                                            } else {
+                                                for (ArticoloDTO articolo : entry.getValue()) {
                                                     if (!articolo.getBarCode().endsWith(articolo.getCodMart())) {
                                                         listaArticoli.add(articolo);
                                                     }
                                                 }
-                                            } else {
-                                                listaArticoli.add(inList.get(0));
                                             }
+
                                         });
+
                                 griglia.setGrigliaAcquistiChild(listaArticoli);
+
+                                Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime));
                                 onSuccess.run(griglia);
                             }, false);
                         }, onFailed);

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

@@ -53,7 +53,7 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
         String codMdep = null;
 
         PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class);
-        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<ServiceRESTResponse<List<MtbDepoPosizione>>>() {
+        posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MtbDepoPosizione>>> call, Response<ServiceRESTResponse<List<MtbDepoPosizione>>> response) {
                 analyzeAnswer(response, "getAvailablePosizioni", (m) -> {

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

@@ -5,6 +5,7 @@ import android.util.Log;
 import java.util.ArrayList;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.exception.NotValidLicenseException;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
 import it.integry.integrywmsnative.core.rest.model.EsitoType;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
@@ -41,7 +42,9 @@ public class _BaseRESTConsumer {
             if (response.code() == 404) {
                 Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url().toString() + ")");
                 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()));
             }

app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java

@@ -30,23 +30,27 @@ public class ServerStatusChecker {
     private Runnable runnableCode = new Runnable() {
         @Override
         public void run() {
-            if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) {
-                UtilityServer.isEmsApiAvailable(SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), mInternalCallback);
+            if (shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) {
+                UtilityServer.isEmsApiAvailable(
+                        SettingsManager.i().getServer().getHost(),
+                        SettingsManager.i().getServer().getPort(),
+                        () -> mInternalCallback.run(true),
+                        ex -> mInternalCallback.run(false));
                 handler.postDelayed(this, MILLIS_DELAY);
             }
         }
     };
 
-    public void addCallback(RunnableArgs<Boolean> callback){
+    public void addCallback(RunnableArgs<Boolean> callback) {
         this.mCallback.add(callback);
     }
 
-    public void removeCallback(RunnableArgs<Boolean> callback){
+    public void removeCallback(RunnableArgs<Boolean> callback) {
         this.mCallback.remove(callback);
     }
 
 
-    public static void init(){
+    public static void init() {
         instance.shouldExecute = true;
 
         instance.handler.post(instance.runnableCode);

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import it.integry.integrywmsnative.core.model.Azienda;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 
@@ -15,14 +16,15 @@ public class DBSettingsModel {
     private List<MtbDepoPosizione> availablePosizioni = null;
 
     private Azienda datiAzienda = null;
+    private List<InternalCodAnagsDTO> internalCodAnags = null;
 
     private boolean enableCheckPartitaMagCheckPickingV;
     private boolean flagMultiClienteOrdV;
-    private String defaultCodAnag;
+    private boolean flagUseCodAnagAziendale;
     private String defaultCausaleRettificaGiacenze;
     private DistribuzioneColloDTO.CriterioDistribuzione defaultCriterioDistribuzione;
     private boolean flagAskClienteInPickingLibero;
-    private boolean flagAllowEmptyClienteInPickingLibero;
+    private boolean flagPickLiberoAllowEmptyCliente;
 
     private boolean flagCanAddExtraItemSpedizione;
     private boolean flagCanAutoOpenNewULAccettazione;
@@ -42,6 +44,7 @@ public class DBSettingsModel {
     private String reportNameSpedizionChiudiOrdine;
     private int onNumCnfInputChanged = 1;
     private boolean flagAccettazioneUseQtaOrd = false;
+    private boolean flagPickLiberoAllowEmptyDest = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -79,6 +82,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public List<InternalCodAnagsDTO> getInternalCodAnags() {
+        return internalCodAnags;
+    }
+
+    public DBSettingsModel setInternalCodAnags(List<InternalCodAnagsDTO> internalCodAnags) {
+        this.internalCodAnags = internalCodAnags;
+        return this;
+    }
+
     public List<AvailableCodMdepsDTO> getAvailableCodMdep() {
         return availableCodMdep;
     }
@@ -105,12 +117,12 @@ public class DBSettingsModel {
         return this;
     }
 
-    public String getDefaultCodAnag() {
-        return defaultCodAnag;
+    public boolean isFlagUseCodAnagAziendale() {
+        return flagUseCodAnagAziendale;
     }
 
-    public DBSettingsModel setDefaultCodAnag(String defaultCodAnag) {
-        this.defaultCodAnag = defaultCodAnag;
+    public DBSettingsModel setFlagUseCodAnagAziendale(boolean flagUseCodAnagAziendale) {
+        this.flagUseCodAnagAziendale = flagUseCodAnagAziendale;
         return this;
     }
 
@@ -141,12 +153,12 @@ public class DBSettingsModel {
         return this;
     }
 
-    public boolean isFlagAllowEmptyClienteInPickingLibero() {
-        return flagAllowEmptyClienteInPickingLibero;
+    public boolean isFlagPickLiberoAllowEmptyCliente() {
+        return flagPickLiberoAllowEmptyCliente;
     }
 
-    public DBSettingsModel setFlagAllowEmptyClienteInPickingLibero(boolean flagAllowEmptyClienteInPickingLibero) {
-        this.flagAllowEmptyClienteInPickingLibero = flagAllowEmptyClienteInPickingLibero;
+    public DBSettingsModel setFlagPickLiberoAllowEmptyCliente(boolean flagPickLiberoAllowEmptyCliente) {
+        this.flagPickLiberoAllowEmptyCliente = flagPickLiberoAllowEmptyCliente;
         return this;
     }
 
@@ -312,4 +324,13 @@ public class DBSettingsModel {
         this.flagAccettazioneUseQtaOrd = flagAccettazioneUseQtaOrd;
         return this;
     }
+
+    public boolean isFlagPickLiberoAllowEmptyDest() {
+        return flagPickLiberoAllowEmptyDest;
+    }
+
+    public DBSettingsModel setFlagPickLiberoAllowEmptyDest(boolean flagPickLiberoAllowEmptyDest) {
+        this.flagPickLiberoAllowEmptyDest = flagPickLiberoAllowEmptyDest;
+        return this;
+    }
 }

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

@@ -4,7 +4,9 @@ import android.content.Context;
 
 import com.annimon.stream.Stream;
 import com.google.firebase.perf.metrics.Trace;
+import com.google.gson.reflect.TypeToken;
 
+import java.lang.reflect.Type;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,6 +15,7 @@ import java.util.List;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbGestSetup;
+import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
@@ -88,21 +91,19 @@ public class SettingsManager {
                 onFailed.run(new Exception("Errore durante il caricamento dei dati. Riavviare l'applicazione!"));
         };
 
-        onProgress.run("dati azienda");
-        loadDatiAzienda(() -> {
 
-            onProgress.run("profili");
-            loadAvailableProfiles(() -> {
 
-                onProgress.run("depositi");
-                loadAvailableCodMdeps(() -> {
+        onProgress.run("depositi");
+        loadAvailableCodMdeps(() -> {
 
-                    onProgress.run("posizioni");
-                    loadAvailablePosizioni(() -> {
+            onProgress.run("posizioni");
+            loadAvailablePosizioni(() -> {
 
-                        onProgress.run("impostazioni");
-                        loadGestSetupValues(tmpOnComplete, tmpOnFailed);
-                    }, tmpOnFailed);
+                onProgress.run("impostazioni");
+                loadGestSetupValues(() -> {
+
+                    onProgress.run("dati azienda");
+                    loadDatiAzienda(tmpOnComplete, tmpOnFailed);
                 }, tmpOnFailed);
             }, tmpOnFailed);
         }, tmpOnFailed);
@@ -113,7 +114,26 @@ public class SettingsManager {
         SystemRESTConsumer.getAzienda(datiAzienda -> {
             SettingsManager.iDB().setDatiAzienda(datiAzienda);
 
-            if (onComplete != null) onComplete.run();
+            if(!SettingsManager.iDB().isFlagUseCodAnagAziendale()) {
+                onComplete.run();
+                return;
+            }
+
+            String internalCodAnagsQuery = "SELECT ga.cod_anag,\n" +
+                    "       CAST(CASE WHEN vc.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_cliente,\n" +
+                    "       CAST(CASE WHEN af.cod_anag IS NOT NULL THEN 1 ELSE 0 END AS BIT) AS is_fornitore\n" +
+                    "FROM azienda\n" +
+                    "INNER JOIN gtb_anag ga on azienda.part_iva = ga.part_iva\n" +
+                    "LEFT OUTER JOIN vtb_clie vc on ga.cod_anag = vc.cod_anag AND vc.flag_stato = 'A'\n" +
+                    "LEFT OUTER JOIN atb_forn af on ga.cod_anag = af.cod_anag AND af.flag_stato = 'A'";
+
+            Type type = new TypeToken<List<InternalCodAnagsDTO>>() {}.getType();
+            SystemRESTConsumer.<List<InternalCodAnagsDTO>>processSqlStatic(internalCodAnagsQuery, type, internalCodAnagsList -> {
+                SettingsManager.iDB().setInternalCodAnags(internalCodAnagsList);
+
+                if (onComplete != null) onComplete.run();
+            }, onFailed);
+
         }, onFailed);
     }
 
@@ -193,7 +213,7 @@ public class SettingsManager {
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SETUP")
-                .setKeySection("COD_ANAG_DEFAULT"));
+                .setKeySection("FLAG_USE_COD_ANAG_AZIENDALE"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SETUP")
@@ -282,16 +302,20 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE")
                 .setKeySection("FLAG_USE_QTA_ORD"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("FLAG_ALLOW_EMPTY_DEST"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
             dbSettingsModelIstance.setDefaultCausaleRettificaGiacenze(getValueFromList(list, "SETUP", "DEFAULT_CAUSALE_RETTIFICA_GIACENZE", String.class));
             dbSettingsModelIstance.setEnableCheckPartitaMagCheckPickingV(getValueFromList(list, "SETUP", "ENABLE_CHECK_PARTITA_MAG_PICKING_V", Boolean.class));
             dbSettingsModelIstance.setFlagMultiClienteOrdV(getValueFromList(list, "SETUP", "FLAG_MULTI_CLIENTE_ORD_VENDITA", Boolean.class));
-            dbSettingsModelIstance.setDefaultCodAnag(getValueFromList(list, "SETUP", "COD_ANAG_DEFAULT", String.class));
+            dbSettingsModelIstance.setFlagUseCodAnagAziendale(getValueFromList(list, "SETUP", "FLAG_USE_COD_ANAG_AZIENDALE", Boolean.class));
             dbSettingsModelIstance.setDefaultCriterioDistribuzione(getValueFromList(list, "SETUP", "DEFAULT_CRITERIO_DISTRIBUZIONE", String.class));
             dbSettingsModelIstance.setFlagAskClienteInPickingLibero(getValueFromList(list, "PICKING_LIBERO", "FLAG_ASK_CLIENTE", Boolean.class));
-            dbSettingsModelIstance.setFlagAllowEmptyClienteInPickingLibero(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_CLIENTE", Boolean.class));
+            dbSettingsModelIstance.setFlagPickLiberoAllowEmptyCliente(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_CLIENTE", Boolean.class));
             dbSettingsModelIstance.setFlagCanAddExtraItemSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_ITEMS", Boolean.class));
             dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(getValueFromList(list, "ACCETTAZIONE", "FLAG_AUTO_OPEN_NEW_UL", Boolean.class));
             dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class));
@@ -309,6 +333,7 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class));
             dbSettingsModelIstance.setDocInterniCheckFornitore(getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class));
             dbSettingsModelIstance.setFlagAccettazioneUseQtaOrd(getValueFromList(list, "ACCETTAZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
+            dbSettingsModelIstance.setFlagPickLiberoAllowEmptyDest(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_DEST", Boolean.class));
 
             String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
             if (notePerdita != null) {

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

@@ -5,14 +5,16 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 
+import it.integry.integrywmsnative.core.exception.NotValidLicenseException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.gest.login.exception.ServerNotReachableException;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
 public class UtilityServer {
 
-    public static void isHostReachable(final String serverAddress, final int serverTCPport, final RunnableArgs<Boolean> callback){
+    public static void isHostReachable(final String serverAddress, final int serverTCPport, final RunnableArgs<Boolean> callback) {
         new Thread(() -> {
 
             boolean connected = false;
@@ -36,7 +38,7 @@ public class UtilityServer {
         }).start();
     }
 
-    public static void isEmsApiAvailable(final String serverAddress, final int serverTCPport, final RunnableArgs<Boolean> callback) {
+    public static void isEmsApiAvailable(final String serverAddress, final int serverTCPport, final Runnable onComplete, final RunnableArgs<Exception> onFailed) {
         new Thread(() -> {
             OkHttpClient client = new OkHttpClient();
 
@@ -46,11 +48,16 @@ public class UtilityServer {
 
             try {
                 Response response = client.newCall(request).execute();
-                boolean status = response.isSuccessful();
                 response.close();
-                callback.run(status);
+
+                if (response.code() == 200) onComplete.run();
+                else if (response.code() == 404)
+                    onFailed.run(new ServerNotReachableException(serverAddress, serverTCPport, null));
+                else if (response.code() == 550)
+                    onFailed.run(new NotValidLicenseException());
+                else onFailed.run(new Exception("Errore non identificato (STATUS: " + response.code() + ")"));
             } catch (IOException e) {
-                callback.run(false);
+                onFailed.run(new ServerNotReachableException(serverAddress, serverTCPport, e));
             }
 
         }).start();

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

@@ -317,12 +317,13 @@ public class AccettazionePickingViewModel {
             barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
         }
 
+        String finalBarcodeProd = barcodeProd;
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
 
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
             } else {
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
             }
 
         }, this::sendError);
@@ -372,8 +373,7 @@ public class AccettazionePickingViewModel {
 
                 MtbColt mtbColt = new MtbColt();
                 mtbColt
-                        .initDefaultFields()
-                        .setGestione(defaultGestioneOfUL)
+                        .initDefaultFields(defaultGestioneOfUL)
                         .setAnnotazioni(additionalNotes)
                         .setPosizione(defaultPosAccettazione)
                         .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);

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

@@ -15,7 +15,6 @@ import it.integry.integrywmsnative.core.utility.UtilityServer;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.login.exception.InvalidServerCodAziendaException;
 import it.integry.integrywmsnative.gest.login.exception.InvalidUserDepositException;
-import it.integry.integrywmsnative.gest.login.exception.ServerNotReachableException;
 import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumer;
 
 public class LoginViewModel {
@@ -52,13 +51,10 @@ public class LoginViewModel {
             final String host = u.getHost();
             final int port = u.getPort();
 
-            UtilityServer.isEmsApiAvailable(host, port, value1 -> {
+            UtilityServer.isEmsApiAvailable(host, port, () -> {
 
-                if (value1) { //Is online
                     mLoginRESTConsumer.authenticate(host, port, username, password, loginDTO -> {
 
-                        SettingsManager.iDB().setAvailableProfiles(loginDTO.getAvailableProfiles());
-
                         SettingsManager.i().createUserSession();
                         SettingsManager.i().getUser().setFullname(!UtilityString.isNullOrEmpty(loginDTO.getFull_name()) ? loginDTO.getFull_name() : username);
 
@@ -73,11 +69,7 @@ public class LoginViewModel {
                     }, this::sendError);
 
 
-                } else { //Is not online
-                    this.sendError(new ServerNotReachableException(host, port, null));
-                }
-
-            });
+                }, this::sendError);
         }, ex -> {
             this.sendError(new InvalidServerCodAziendaException(codAzienda, ex));
         });

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

@@ -205,6 +205,7 @@ public class PickingLiberoViewModel {
             barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
         }
 
+        String finalBarcodeProd = barcodeProd;
         mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 MtbAart articolo = mtbAartList.get(0);
@@ -216,11 +217,11 @@ public class PickingLiberoViewModel {
                     this.dispatchArt(articolo, ean128Model);
                     onComplete.run();
                 } else {
-                    this.sendError(new NoResultFromBarcodeException());
+                    this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
                 }
 
             } else {
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
             }
 
         }, this::sendError);
@@ -243,8 +244,7 @@ public class PickingLiberoViewModel {
         this.sendOnLoadingStarted();
 
         MtbColt mtbColt = new MtbColt();
-        mtbColt.initDefaultFields();
-        mtbColt.setGestione(mDefaultGestione)
+        mtbColt.initDefaultFields(mDefaultGestione)
                 .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE ? "PICKING LIBERO" : null)
                 .setCodAnag(SettingsManager.iDB().getProduzioneDefaultCodAnag())
                 .setSegno(-1)

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

@@ -30,6 +30,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
@@ -125,8 +126,7 @@ public class PickingResiViewModel {
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
         MtbColt mtbColt = new MtbColt();
-        mtbColt.initDefaultFields();
-        mtbColt.setGestione(mDefaultGestioneOfLU)
+        mtbColt.initDefaultFields(GestioneEnum.fromString(mDefaultGestioneOfLU))
                 .setSegno(mDefaultSegnoOfLU)
                 .setCodAnag(mDefaultCodAnagOfLU)
                 .setCodMdep(mDefaultCodMdepOfLU)

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java

@@ -13,14 +13,13 @@ import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.annimon.stream.Stream;
-
-import java.math.BigDecimal;
-import java.util.List;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
 
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.BR;
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
@@ -33,8 +32,8 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.ActivityPvOrdineAcquistoEditBinding;
+import it.integry.integrywmsnative.databinding.FragmentPvArticoliOrdineAcquistoListSingleItemBinding;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloView;
-import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.ui.OrdineAcquistoArtListAdapter;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.ui.OrdineAcquistoArtListModel;
 import it.integry.integrywmsnative.ui.FabMenuCustomAnimations;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
@@ -133,16 +132,17 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
     }
 
     private void initRecyclerView() {
-        this.mViewModel.getArticoli().observe(this, updatedData -> {
-            this.mArticoliMutableData.clear();
-            this.mArticoliMutableData.addAll(convertDataModelToListModel(updatedData));
-//            this.noItemsToPick.set(!isThereAnyItemToPick(updatedData));
+
+        var itemType = new Type<ArticoloOrdine, FragmentPvArticoliOrdineAcquistoListSingleItemBinding>(R.layout.fragment_pv_articoli_ordine_acquisto__list_single_item, BR.articolo);
+        itemType.onClick(x -> {
+            this.selectAction(x.getBinding().getArticolo());
+            return null;
         });
 
-        var mAdapter = new OrdineAcquistoArtListAdapter(this, mArticoliMutableData)
-                .setOnItemClicked(this::selectAction);
+        new LiveAdapter(this.mViewModel.getArticoli(), this)
+                .map(ArticoloOrdine.class, itemType)
+                .into(mBinding.articoliOrdineList);
 
-        mBinding.articoliOrdineList.setAdapter(mAdapter);
         mBinding.articoliOrdineList.setHasFixedSize(true);
         mBinding.articoliOrdineList.setLayoutManager(new LinearLayoutManager(this));
 
@@ -151,20 +151,6 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
         mBinding.articoliOrdineList.addItemDecoration(itemDecorator);
     }
 
-    private List<OrdineAcquistoArtListModel> convertDataModelToListModel
-            (List<ArticoloOrdine> dataList) {
-        return Stream.of(dataList)
-                .distinctBy(ArticoloOrdine::getArticoloOrdineId)
-                .sortBy(x -> x.getDataIns().getTime())
-                .map(x -> new OrdineAcquistoArtListModel()
-                        .setBadge1(x.getCodMart())
-                        .setDescription(x.getDescrizione())
-                        .setQuantity(BigDecimal.valueOf(x.getQtaOrd()))
-                        .setUntMis(x.getUntMis())
-                        .setOriginalModel(x))
-                .toList();
-    }
-
 
     private void selectAction(ArticoloOrdine articoloOrdine) {
         mBinding.closeActivityFab.close(false);

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditModule.java

@@ -22,7 +22,6 @@ public class PVOrdineAcquistoEditModule {
     }
 
     @Provides
-    @Singleton
     PVOrdineAcquistoEditViewModel providesPvOrdineAcquistoEditViewModel(OrdineRepository ordineRepository,
                                                                         GrigliaRepository grigliaRepository,
                                                                         ArticoliOrdineRepository articoliOrdineRepository,

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java

@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -90,10 +91,10 @@ public class PVOrdineAcquistoEditViewModel {
         var newList = this.mArticoli.getValue();
 
         var alreadySavedItem = Stream.of(newList)
-                .filter(x -> Objects.equals(x.getArticoloOrdineId(), articolo.getArticoloOrdineId()))
+                .filter(x -> Objects.equals(x.getCodMart(), articolo.getCodMart()))
                 .findFirst();
 
-        if(alreadySavedItem.isPresent()) newList.remove(alreadySavedItem.get());
+        if (alreadySavedItem.isPresent()) newList.remove(alreadySavedItem.get());
 
         newList.add(articolo);
         this.mArticoli.postValue(newList);
@@ -154,20 +155,36 @@ public class PVOrdineAcquistoEditViewModel {
 
     private void checkArticolo(Ordine ordine, String barcode, RunnableArgs<ArticoloOrdine> onSuccess, RunnableArgs<Exception> onFail) {
         try {
-            mArticoliOrdineRepository.findArticoloByScanAndOrdine(ordine, barcode, (articolo) -> {
-                if (articolo != null) {
-                    onSuccess.run(articolo);
-                } else {
-                    mArticoloGrigliaRepository.findArticoloByScanAndGriglia(barcode, ordine.getIdGriglia(), artGrid -> {
-                        if (artGrid != null) {
-                            onSuccess.run(artGrid.convertToArticoloOrdine(ordine));
+            mArticoloGrigliaRepository.findArticoloByScanAndGriglia(barcode, ordine.getIdGriglia(), artGrid -> {
+                if (artGrid != null) {
+
+
+                    mArticoliOrdineRepository.findArticoloByScanAndOrdine(ordine, barcode, (articolo) -> {
+                        if (articolo != null) {
+
+                            articolo
+                                    .setQtaPrevistaVendita(BigDecimal.valueOf(artGrid.getQtaPrevistaVendita()))
+                                    .setQtaProposta(BigDecimal.valueOf(artGrid.getQtaProposta()))
+                                    .setGiacenza(BigDecimal.valueOf(artGrid.getGiacenza()))
+                                    .setMediaSett(artGrid.getMediaSett());
+
+                            articolo.setQtaMinOrdinabile(artGrid.getQtaMinOrdinabile());
+                            articolo.setMerceDaRic(artGrid.getMerceDaRic());
+                            articolo.setNewNoPromo(artGrid.isNewNoPromo());
+                            articolo.setFlagQtaMultipla(artGrid.getFlagQtaMultipla());
+
+                            onSuccess.run(articolo);
                         } else {
-                            onFail.run(new Exception("L' articolo ( " + barcode + " ) non  è presente nella griglia"));
+                            onSuccess.run(artGrid.convertToArticoloOrdine(ordine));
                         }
                     }, onFail);
+
+                } else {
+                    onFail.run(new Exception("L' articolo ( " + barcode + " ) non  è presente nella griglia"));
                 }
             }, onFail);
 
+
         } catch (Exception e) {
             onFail.run(e);
         }

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/helper/OrdineAcquistoPvHelper.java

@@ -40,7 +40,7 @@ public class OrdineAcquistoPvHelper {
         updateGriglia(griglia, onSave, onFail);
     }
 
-    public void updateGriglia(Griglia griglia, RunnableArgs<Griglia> onSave, RunnableArgs<Exception> onFail) {
+    public void updateGriglia(Griglia griglia, RunnableArgs<Griglia> onSaved, RunnableArgs<Exception> onFail) {
         PVOrdiniAcquistoRESTConsumer.getArticoliListinoStatic(griglia.getCodAlis(), dto -> {
             mContext.runOnUiThread(() -> {
                 if (dto.getGrigliaAcquistiChild().size() <= 0) {
@@ -50,7 +50,13 @@ public class OrdineAcquistoPvHelper {
                 griglia.setDescrLisa(dto.getDescrLisa());
                 griglia.setDescrDepo(dto.getDescrDepo());
                 griglia.setCountArticoli(dto.getGrigliaAcquistiChild().size());
-                mGrigliaRepository.saveGriglia(griglia, id -> saveLisAToGriglia(dto.getGrigliaAcquistiChild(), griglia, onSave, onFail), onFail);
+
+
+                mGrigliaRepository.saveGriglia(griglia, id -> {
+                    saveLisAToGriglia(dto.getGrigliaAcquistiChild(), griglia, grigliaResult -> {
+                        onSaved.run(grigliaResult);
+                    }, onFail);
+                }, onFail);
             });
         }, onFail);
     }

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

@@ -150,13 +150,14 @@ public class RettificaGiacenzeViewModel {
             barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
         }
 
+        String finalBarcodeProd = barcodeProd;
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
             if (onComplete != null) onComplete.run();
 
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 this.dispatchArt(mtbAartList.get(0), pickData);
             } else {
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
             }
 
         }, this::sendError);

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

@@ -626,12 +626,13 @@ public class SpedizioneViewModel {
             barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
         }
 
+        String finalBarcodeProd = barcodeProd;
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
 
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
             } else {
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
             }
 
         }, this::sendError);
@@ -1318,8 +1319,7 @@ public class SpedizioneViewModel {
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
         MtbColt mtbColt = new MtbColt();
-        mtbColt.initDefaultFields();
-        mtbColt.setGestione(mDefaultGestioneOfUL)
+        mtbColt.initDefaultFields(mDefaultGestioneOfUL)
                 .setSegno(mDefaultSegnoCol)
                 .setRifOrd(mDefaultRifOrdOfUL)
                 .setNumOrd(mDefaultNumOrdOfUL)

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

@@ -125,6 +125,7 @@ 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(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.badge1.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.white, 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());

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/dto/DialogAskClienteDestinatarioDTO.java

@@ -94,7 +94,7 @@ public class DialogAskClienteDestinatarioDTO {
 
     @Override
     public String toString() {
-        return String.format("%s (%s)", getDestinatario(), getCodVdes());
+        return getDestinatario() + (getCodVdes() != null ? (" (" + getCodVdes() + ")") : "");
     }
 
     public VtbDest toVtbDestModel() {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java

@@ -145,7 +145,12 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
 
 
     private void initializeAdapter(ArrayList<DialogAskClienteClienteDTO> items) {
-        DialogAskCliente_Page1_Cliente_ArrayAdapter adapter = new DialogAskCliente_Page1_Cliente_ArrayAdapter(mContext, items);
+
+        var orderedList = Stream.of(items)
+                .sortBy(x -> x.getRagSoc() != null ? x.getRagSoc() : "")
+                .toList();
+
+        DialogAskCliente_Page1_Cliente_ArrayAdapter adapter = new DialogAskCliente_Page1_Cliente_ArrayAdapter(mContext, orderedList);
 
         AutoCompleteTextView editTextDropdownCliente = mBinding.dropdownCliente;
         editTextDropdownCliente.setThreshold(0);
@@ -177,7 +182,7 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
 
 
     private boolean validateCliente() {
-        if (SettingsManager.iDB().isFlagAllowEmptyClienteInPickingLibero() && mBinding.inputCliente.getEditText().getText().toString().trim().length() == 0) {
+        if (SettingsManager.iDB().isFlagPickLiberoAllowEmptyCliente() && mBinding.inputCliente.getEditText().getText().toString().trim().length() == 0) {
             return true;
         } else return getCurrentCliente() != null;
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Cliente_ArrayAdapter.java

@@ -20,13 +20,13 @@ import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskCliente
 
 public class DialogAskCliente_Page1_Cliente_ArrayAdapter extends ArrayAdapter<DialogAskClienteClienteDTO> implements Filterable {
 
-    private Context mContext;
-    private List<DialogAskClienteClienteDTO> mDataset;
+    private final Context mContext;
+    private final List<DialogAskClienteClienteDTO> mDataset;
     private List<DialogAskClienteClienteDTO> mDatasetAllItems;
 
-    private ListFilter listFilter = new ListFilter();
+    private final ListFilter listFilter = new ListFilter();
 
-    public DialogAskCliente_Page1_Cliente_ArrayAdapter(@NonNull Context context, @NonNull ArrayList<DialogAskClienteClienteDTO> list) {
+    public DialogAskCliente_Page1_Cliente_ArrayAdapter(@NonNull Context context, @NonNull List<DialogAskClienteClienteDTO> list) {
         super(context, 0 , list);
         mContext = context;
         mDataset = list;
@@ -37,13 +37,15 @@ public class DialogAskCliente_Page1_Cliente_ArrayAdapter extends ArrayAdapter<Di
     public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
         View listItem = convertView;
         if(listItem == null) {
-            listItem = LayoutInflater.from(mContext).inflate(R.layout.dropdown_simple_item, parent, false);
+            listItem = LayoutInflater.from(mContext).inflate(R.layout.dropdown_simple_item_w_subtitle, parent, false);
         }
 
         if(position < mDataset.size()) {
-            AppCompatTextView textView = listItem.findViewById(R.id.text);
+            AppCompatTextView textView = listItem.findViewById(R.id.title);
+            AppCompatTextView subTitle = listItem.findViewById(R.id.subtitle);
 
             textView.setText(mDataset.get(position).getRagSoc());
+            subTitle.setText(mDataset.get(position).getCodAnag());
 
             return listItem;
         }
@@ -59,7 +61,7 @@ public class DialogAskCliente_Page1_Cliente_ArrayAdapter extends ArrayAdapter<Di
     }
 
     public class ListFilter extends Filter {
-        private Object lock = new Object();
+        private final Object lock = new Object();
 
         @Override
         protected FilterResults performFiltering(CharSequence prefix) {
@@ -81,7 +83,7 @@ public class DialogAskCliente_Page1_Cliente_ArrayAdapter extends ArrayAdapter<Di
                 ArrayList<DialogAskClienteClienteDTO> matchValues = new ArrayList<>();
 
                 for (DialogAskClienteClienteDTO dataItem : mDatasetAllItems) {
-                    if (dataItem.getRagSoc().toLowerCase().startsWith(searchStrLowerCase)) {
+                    if (dataItem.getRagSoc().toLowerCase().contains(searchStrLowerCase)) {
                         matchValues.add(dataItem);
                     }
                 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1_Commessa_ArrayAdapter.java

@@ -23,7 +23,7 @@ public class DialogAskCliente_Page1_Commessa_ArrayAdapter extends ArrayAdapter<S
     private List<String> mDataset = new ArrayList<>();
     private List<String> mDatasetAllItems;
 
-    private DialogAskCliente_Page1_Commessa_ArrayAdapter.ListFilter listFilter = new DialogAskCliente_Page1_Commessa_ArrayAdapter.ListFilter();
+    private final DialogAskCliente_Page1_Commessa_ArrayAdapter.ListFilter listFilter = new DialogAskCliente_Page1_Commessa_ArrayAdapter.ListFilter();
 
     public DialogAskCliente_Page1_Commessa_ArrayAdapter(@NonNull Context context) {
         super(context, 0);
@@ -56,7 +56,7 @@ public class DialogAskCliente_Page1_Commessa_ArrayAdapter extends ArrayAdapter<S
     }
 
     public class ListFilter extends Filter {
-        private Object lock = new Object();
+        private final Object lock = new Object();
 
         @Override
         protected FilterResults performFiltering(CharSequence prefix) {
@@ -78,7 +78,7 @@ public class DialogAskCliente_Page1_Commessa_ArrayAdapter extends ArrayAdapter<S
                 ArrayList<String> matchValues = new ArrayList<>();
 
                 for (String dataItem : mDatasetAllItems) {
-                    if (dataItem.toLowerCase().startsWith(searchStrLowerCase)) {
+                    if (dataItem.toLowerCase().contains(searchStrLowerCase)) {
                         matchValues.add(dataItem);
                     }
                 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.databinding.DialogAskClientePage2Binding;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO;
 
@@ -57,6 +58,12 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
             return;
         }
 
+        if(SettingsManager.iDB().isFlagPickLiberoAllowEmptyDest()) {
+            filteredDestinatari.add(new DialogAskClienteDestinatarioDTO()
+                    .setCodAnag(null)
+                    .setDestinatario("Nessuno"));
+        }
+
         initializeAdapter(filteredDestinatari);
 
 
@@ -95,7 +102,11 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
 
 
     private void initializeAdapter(List<DialogAskClienteDestinatarioDTO> items) {
-        DialogAskCliente_Page2_ArrayAdapter adapter = new DialogAskCliente_Page2_ArrayAdapter(mContext, items);
+        var orderedList = Stream.of(items)
+                .sortBy(x -> x.getCodAnag() != null ? x.getCodAnag() : "")
+                .toList();
+
+        DialogAskCliente_Page2_ArrayAdapter adapter = new DialogAskCliente_Page2_ArrayAdapter(mContext, orderedList);
 
 
         AutoCompleteTextView editTextFilledExposedDropdown = mBinding.dropdownDestinatario;
@@ -105,7 +116,9 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
 
 
     private boolean validateDestinatario() {
-        return getCurrentDestinatario() != null;
+        if (SettingsManager.iDB().isFlagPickLiberoAllowEmptyDest() && getCurrentDestinatario() == null) {
+            return true;
+        } else return getCurrentDestinatario() != null;
     }
 
     public DialogAskClienteDestinatarioDTO getCurrentDestinatario() {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2_ArrayAdapter.java

@@ -11,6 +11,7 @@ import android.widget.Filterable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,14 +22,15 @@ import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskCliente
 
 public class DialogAskCliente_Page2_ArrayAdapter extends ArrayAdapter<DialogAskClienteDestinatarioDTO> implements Filterable {
 
-    private Context mContext;
-    private List<DialogAskClienteDestinatarioDTO> mDataset;
+    private final Context mContext;
+    private final List<DialogAskClienteDestinatarioDTO> mDataset;
     private List<DialogAskClienteDestinatarioDTO> mDatasetAllItems;
 
-    private ListFilter listFilter = new ListFilter();
+    private final ListFilter listFilter = new ListFilter();
 
     public DialogAskCliente_Page2_ArrayAdapter(@NonNull Context context, @NonNull List<DialogAskClienteDestinatarioDTO> list) {
         super(context, 0 , list);
+
         mContext = context;
         mDataset = list;
     }
@@ -43,18 +45,21 @@ public class DialogAskCliente_Page2_ArrayAdapter extends ArrayAdapter<DialogAskC
 
         if(position < mDataset.size()) {
 
+            var item = mDataset.get(position);
+
             AppCompatTextView destinatario = listItem.findViewById(R.id.destinatario);
-            destinatario.setText(UtilityString.capitalizeWords(mDataset.get(position).toString()));
+            destinatario.setText(UtilityString.capitalizeWords(item.getDestinatario() + (item.getCodVdes() != null ? ("(" + item.getCodVdes() + ")") : "")));
+            if(item.getCodVdes() == null) destinatario.setTextColor(ContextCompat.getColor(mContext, R.color.gray_800));
 
             AppCompatTextView subtitle = listItem.findViewById(R.id.subtitle);
 
             StringBuilder subtitleStr = new StringBuilder();
             if(!UtilityString.isNullOrEmpty(mDataset.get(position).getCitta())) {
-                subtitleStr.append(UtilityString.capitalizeWords(mDataset.get(position).getCitta()) + " - ");
+                subtitleStr.append(UtilityString.capitalizeWords(item.getCitta())).append(" - ");
             }
 
             if(!UtilityString.isNullOrEmpty(mDataset.get(position).getIndirizzo())) {
-                subtitleStr.append(UtilityString.capitalizeWords(mDataset.get(position).getIndirizzo()));
+                subtitleStr.append(UtilityString.capitalizeWords(item.getIndirizzo()));
             }
 
             subtitle.setText(subtitleStr);
@@ -95,7 +100,7 @@ public class DialogAskCliente_Page2_ArrayAdapter extends ArrayAdapter<DialogAskC
                 ArrayList<DialogAskClienteDestinatarioDTO> matchValues = new ArrayList<>();
 
                 for (DialogAskClienteDestinatarioDTO dataItem : mDatasetAllItems) {
-                    if (dataItem.toString().toLowerCase().startsWith(searchStrLowerCase)) {
+                    if (dataItem.toString().toLowerCase().contains(searchStrLowerCase)) {
                         matchValues.add(dataItem);
                     }
                 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java

@@ -37,11 +37,9 @@ import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDialog;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsLayoutBinding;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
-import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
 
@@ -62,7 +60,6 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
     private final List<DialogChooseArtsFromListaArtsItemModel> mDataset;
 
     private int mBarcodeScannerIstanceID;
-    private DialogProgressView mCurrentProgress;
     private MtbAart selectedArt;
 
     public static DialogChooseArtsFromListaArts newInstance(List<MtbColr> listaMtbColr, RunnableArgs<List<MtbColr>> onItemsChoosed, Runnable onAbort) {
@@ -385,20 +382,4 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
         this.dismiss();
     }
 
-    protected void openProgress() {
-        requireActivity().runOnUiThread(() -> {
-            if (this.mCurrentProgress == null) {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-            }
-        });
-    }
-
-    protected void closeProgress() {
-        requireActivity().runOnUiThread(() -> {
-            if (mCurrentProgress != null) {
-                mCurrentProgress.dismiss();
-                mCurrentProgress = null;
-            }
-        });
-    }
 }

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

@@ -5,13 +5,17 @@ import dagger.Provides;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 
 @Module(subcomponents = DialogScanArtComponent.class)
 public class DialogScanArtModule {
 
     @Provides
-    DialogScanArtViewModel providesDialogScanArtViewModel(BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        return new DialogScanArtViewModel(barcodeRESTConsumer, colliMagazzinoRESTConsumer, articoloRESTConsumer);
+    DialogScanArtViewModel providesDialogScanArtViewModel(BarcodeRESTConsumer barcodeRESTConsumer,
+                                                          ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                                          ArticoloRESTConsumer articoloRESTConsumer,
+                                                          PosizioniRESTConsumer posizioniRESTConsumer) {
+        return new DialogScanArtViewModel(barcodeRESTConsumer, colliMagazzinoRESTConsumer, articoloRESTConsumer, posizioniRESTConsumer);
     }
 
 }

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

@@ -12,6 +12,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 
+import com.annimon.stream.Stream;
+
 import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
@@ -84,7 +86,6 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
     }
 
 
-
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
@@ -107,14 +108,28 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
         this.openProgress();
 
         this.mViewModel.processBarcodeDTO(data, (status, mtbAart, ean128Model, mtbColrList) -> {
-            if(mtbColrList != null && mtbColrList.size() > 0) {
-                DialogChooseArtFromListaMtbColrView.make(getActivity(), mtbColrList, mtbColrChose -> {
+
+            var filteredMtbColrList = mtbColrList;
+
+            if (mtbAart != null) {
+                filteredMtbColrList = Stream.of(filteredMtbColrList)
+                        .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
+                        .toList();
+            }
+
+            if (filteredMtbColrList != null && filteredMtbColrList.size() > 1) {
+                DialogChooseArtFromListaMtbColrView.make(getActivity(), filteredMtbColrList, mtbColrChose -> {
                     mOnItemChoosed.run(status, mtbAart, ean128Model, mtbColrChose);
                 }).show();
+
+            } else if (filteredMtbColrList != null && filteredMtbColrList.size() == 1) {
+                mOnItemChoosed.run(status, mtbAart, ean128Model, filteredMtbColrList.get(0));
+
             } else {
                 mOnItemChoosed.run(status, mtbAart, ean128Model, null);
             }
 
+
             BarcodeManager.enable();
             this.closeProgress();
 

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

@@ -7,16 +7,21 @@ import java.util.List;
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 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.NoResultFromBarcodeException;
+import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgssss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityPosizione;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 
@@ -25,15 +30,20 @@ public class DialogScanArtViewModel {
     private final BarcodeRESTConsumer mBarcodeRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
+    private final PosizioniRESTConsumer mPosizioniRESTConsumer;
 
     private boolean mForceOnlyUL;
 
     private Listener mListener;
 
-    public DialogScanArtViewModel(BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+    public DialogScanArtViewModel(BarcodeRESTConsumer barcodeRESTConsumer,
+                                  ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                  ArticoloRESTConsumer articoloRESTConsumer,
+                                  PosizioniRESTConsumer posizioniRESTConsumer) {
         this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
+        this.mPosizioniRESTConsumer = posizioniRESTConsumer;
     }
 
     public DialogScanArtViewModel setForceOnlyUL(boolean forceOnlyUL) {
@@ -50,15 +60,19 @@ public class DialogScanArtViewModel {
             //Cerco l'UL presente all'interno della posizione
 //            this.executeEtichettaPosizione(barcodeScanDTO.getStringValue(), onComplete);
 
-        } else if(UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
+        } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
-        } else if(UtilityBarcode.isEanPeso(barcodeScanDTO) && !mForceOnlyUL){
+
+        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO) && !mForceOnlyUL) {
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
-        } else if (!mForceOnlyUL){
-            this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
+
         } else {
-            this.sendError(new Exception("Barcode non valido"));
+            this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
+
         }
+//        else {
+//            this.sendError(new Exception("Barcode non valido"));
+//        }
     }
 
 
@@ -67,15 +81,15 @@ public class DialogScanArtViewModel {
 
             String barcodeProd = null;
 
-            if(ean128Model.Sscc != null) barcodeProd = ean128Model.Sscc;
-            if(ean128Model.Gtin != null) barcodeProd = ean128Model.Gtin;
-            if(ean128Model.Content != null) barcodeProd = ean128Model.Content;
+            if (ean128Model.Sscc != null) barcodeProd = ean128Model.Sscc;
+            if (ean128Model.Gtin != null) barcodeProd = ean128Model.Gtin;
+            if (ean128Model.Content != null) barcodeProd = ean128Model.Content;
 
 
-            if(!UtilityString.isNullOrEmpty(barcodeProd)) {
+            if (!UtilityString.isNullOrEmpty(barcodeProd)) {
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
-                } else if(!mForceOnlyUL) {
+                } else if (!mForceOnlyUL) {
                     if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
                         barcodeProd = barcodeProd.substring(1);
                     }
@@ -86,7 +100,7 @@ public class DialogScanArtViewModel {
                 }
             } else {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
         }, this::sendError);
     }
@@ -117,23 +131,48 @@ public class DialogScanArtViewModel {
         }, this::sendError);
     }
 
+    private void executePosizione(MtbDepoPosizione posizione, MtbAart articolo, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, List<MtbColr>> onComplete) {
+        this.mPosizioniRESTConsumer.getBancaliInPosizione(posizione, mtbColtList -> {
 
-    private void loadArticolo(@NotNull String barcodeProd, Ean128Model ean128Model, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, List<MtbColr>> onComplete) {
-        if(barcodeProd.length() == 14) {
-//            barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd);
-            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
-        }
-
-        this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
-            if(mtbAartList != null && mtbAartList.size() > 0) {
-                onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null);
+            if (mtbColtList == null || mtbColtList.size() == 0) {
+                this.sendError(new NoLUFoundException());
+            } else if (mtbColtList.size() == 1) {
+                this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
+                    onComplete.run(DialogConsts.Results.YES, articolo, null, mtbColt.getMtbColr());
+                }, this::sendError);
             } else {
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new TooManyLUFoundInMonoLUPositionException());
             }
+
         }, this::sendError);
     }
 
 
+    private void loadArticolo(@NotNull String barcodeProd, Ean128Model ean128Model, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, List<MtbColr>> onComplete) {
+        if (barcodeProd.length() == 14) {
+            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
+        }
+
+        String finalBarcodeProd = barcodeProd;
+        this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
+            if (mtbAartList != null && mtbAartList.size() > 0) {
+
+                MtbAart firstArt = mtbAartList.get(0);
+                MtbDepoPosizione firstArtPosition = UtilityPosizione.getFromCache(firstArt.getPosizione());
+
+                if (firstArtPosition != null && firstArtPosition.isFlagMonoCollo() && mForceOnlyUL) {
+                    this.executePosizione(firstArtPosition, firstArt, onComplete);
+                } else if (!mForceOnlyUL) {
+                    onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null);
+                } else {
+                    this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+                }
+
+            } else {
+                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+            }
+        }, this::sendError);
+    }
 
 
     private void sendError(Exception ex) {

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

@@ -155,7 +155,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginTop="16dp"
-                android:layout_marginBottom="92dp"
                 android:paddingStart="2dp"
                 android:paddingEnd="2dp"
                 android:clipToPadding="false"
@@ -163,7 +162,8 @@
                 android:scrollbars="vertical"
                 app:layout_constraintTop_toBottomOf="@id/header_content"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/scan_art_spinner"

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

@@ -1,38 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingStart="16dp"
-    android:paddingEnd="16dp"
     android:paddingTop="8dp"
+    android:paddingEnd="16dp"
     android:paddingBottom="8dp">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/destinatario"
+        style="@style/AppTheme.NewMaterial.Text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="?attr/textAppearanceSubtitle1"
-        tools:text="Destinatario"
-        style="@style/AppTheme.NewMaterial.Text"/>
+        tools:text="Destinatario" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/subtitle"
+        style="@style/AppTheme.NewMaterial.Text.Small"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        android:textColor="@color/gray_800"
+        tools:text="Città" />
 
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textAppearance="?attr/textAppearanceSubtitle1"
-            tools:text="Città"
-            style="@style/AppTheme.NewMaterial.Text.Small"/>
-    </LinearLayout>
-
-</LinearLayout>
+</androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -4,9 +4,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.cardview.widget.CardView
-        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
@@ -21,17 +22,17 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingStart="24dp"
-                android:paddingEnd="24dp"
                 android:paddingTop="24dp"
+                android:paddingEnd="24dp"
                 android:paddingBottom="12dp">
 
-                <TextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/title_text"
+                    style="@style/TextViewMaterial.Dialog.HeadlineText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
-                    android:text="@string/extra_item"
-                    android:gravity="center_horizontal"/>
+                    android:gravity="center_horizontal"
+                    android:text="@string/extra_item" />
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="wrap_content"
@@ -45,32 +46,31 @@
                         android:id="@+id/progressBar"
                         style="?android:attr/progressBarStyle"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                        android:layout_height="wrap_content" />
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="16sp"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginStart="8dp"
                         android:layout_marginEnd="12dp"
-                        android:layout_gravity="center_vertical"
                         android:gravity="center_horizontal"
-                        style="@style/AppTheme.NewMaterial.Text"
-                        android:text="@string/scan_item"/>
+                        android:text="@string/scan_item"
+                        android:textSize="16sp" />
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/button_no"
+                    style="@style/Button.DangerOutline"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    style="@style/Button.DangerOutline"
-                    app:strokeColor="@color/red_400"
-                    app:layout_constraintTop_toTopOf="parent"
                     android:layout_gravity="center_horizontal"
-                    android:text="@string/abort"/>
+                    android:layout_marginTop="16dp"
+                    android:text="@string/abort"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:strokeColor="@color/red_400" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -78,5 +78,4 @@
     </androidx.cardview.widget.CardView>
 
 
-
 </layout>

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:orientation="vertical"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="8dp">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        style="@style/AppTheme.NewMaterial.Text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        tools:text="Destinatario" />
+
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/subtitle"
+        style="@style/AppTheme.NewMaterial.Text.Small"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        android:textColor="@color/gray_800"
+        tools:text="Città" />
+
+</androidx.appcompat.widget.LinearLayoutCompat>

barcode_base_library/.gitignore

@@ -1 +0,0 @@
-/build

barcode_base_library/build.gradle

@@ -1,5 +0,0 @@
-apply plugin: 'java-library'
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-}

barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/exception/BarcodeAdapterNotFoundException.java

@@ -1,9 +0,0 @@
-package it.integry.barcode_base_android_library.exception;
-
-public class BarcodeAdapterNotFoundException extends Exception {
-
-    public BarcodeAdapterNotFoundException(String adapterName) {
-        super("L'adapter " + adapterName + " non è stato rilevato sul dispositivo corrente");
-    }
-
-}

barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/extension/RunnableArgs.java

@@ -1,7 +0,0 @@
-package it.integry.barcode_base_android_library.extension;
-
-public interface RunnableArgs<T> {
-
-    void run(T data);
-
-}

barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java

@@ -1,22 +0,0 @@
-package it.integry.barcode_base_android_library.interfaces;
-
-
-import it.integry.barcode_base_android_library.extension.RunnableArgs;
-import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
-import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-
-public interface BarcodeReaderInterface {
-
-    boolean isRightAdapter();
-
-    void init(Runnable onDeviceReady) throws BarcodeAdapterNotFoundException;
-
-    void deinit();
-
-    void register(RunnableArgs<BarcodeScanDTO> onScanSuccessfull, RunnableArgs<Exception> onScanFailed);
-
-    String getAdapterName();
-
-    //void onKeyEvent(KeyEvent keyEvent);
-
-}

barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeScanDTO.java

@@ -1,55 +0,0 @@
-package it.integry.barcode_base_android_library.model;
-
-public class BarcodeScanDTO {
-
-    private BarcodeType type;
-    private String stringValue;
-    private byte[] byteValue;
-    private String name;
-    private int decodingTime;
-
-    public BarcodeType getType() {
-        return type;
-    }
-
-    public BarcodeScanDTO setType(BarcodeType type) {
-        this.type = type;
-        return this;
-    }
-
-    public String getStringValue() {
-        return stringValue;
-    }
-
-    public BarcodeScanDTO setStringValue(String stringValue) {
-        this.stringValue = stringValue;
-        return this;
-    }
-
-    public byte[] getByteValue() {
-        return byteValue;
-    }
-
-    public BarcodeScanDTO setByteValue(byte[] byteValue) {
-        this.byteValue = byteValue;
-        return this;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public BarcodeScanDTO setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public int getDecodingTime() {
-        return decodingTime;
-    }
-
-    public BarcodeScanDTO setDecodingTime(int decodingTime) {
-        this.decodingTime = decodingTime;
-        return this;
-    }
-}

barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/model/BarcodeType.java

@@ -1,91 +0,0 @@
-package it.integry.barcode_base_android_library.model;
-
-public enum BarcodeType {
-
-    NIL(0),
-    AIRLINE_2OF5_13_DIGIT(1),
-    AIRLINE_2OF5_15_DIGIT(2),
-    AZTEC(3),
-    AUSTRALIAN_POSTAL(4),
-    BOOKLAND_EAN(5),
-    BPO(6),
-    CANPOST(7),
-    CHINAPOST(8),
-    CHINESE_2OF5(9),
-    CODABAR(10),
-    CODABLOCK(11),
-    CODE11(12),
-    CODE128(13),
-    CODE16K(14),
-    CODE32(15),
-    CODE39(16),
-    CODE49(17),
-    CODE93(18),
-    COMPOSITE(19),
-    COUPON_CODE(20),
-    DATAMATRIX(21),
-    DISCRETE_2OF5(22),
-    DUTCH_POSTAL(23),
-    EAN128(24),
-    EAN13(25),
-    EAN8(26),
-    GS1_DATABAR_14(27),
-    GS1_DATABAR_EXPANDED(28),
-    GS1_DATABAR_LIMITED(29),
-    HONGKONG_2OF5(30),
-    IATA_2OF5(31),
-    IDTAG(32),
-    INTERLEAVED_2OF5(33),
-    ISBT128(34),
-    JAPANESE_POSTAL(35),
-    KOREAN_POSTAL(36),
-    MATRIX_2OF5(37),
-    MAXICODE(38),
-    MESA(39),
-    MICRO_PDF417(40),
-    MICRO_QR(41),
-    MSI(42),
-    NEC_2OF5(43),
-    OCR(44),
-    PDF417(45),
-    PLESSEY(46),
-    POSICODE(47),
-    POST_US4(48),
-    QR(49),
-    STRAIGHT_2OF5(50),
-    STANDARD_2OF5(51),
-    TELEPEN(52),
-    TLCODE39(53),
-    TRIOPTIC(54),
-    UK_POSTAL(55),
-    UPCA(56),
-    UPCE(57),
-    UPCE1(58),
-    US_PLANET(59),
-    US_POSTNET(60),
-    USPS_4CB(61),
-    RSS(62),
-    LABEL(63),
-    HANXIN(64),
-    GRIDMATRIX(65),
-    INFO_MAIL(66),
-    INTELLIGENT_MAIL(67),
-    SWEDENPOST(68),
-    LAST(69);
-
-    private Integer text;
-    BarcodeType(Integer text) {
-        this.text = text;
-    }
-    public Integer getValue() {
-        return this.text;
-    }
-
-    public static BarcodeType fromInt(Integer text) {
-        for (BarcodeType b : BarcodeType.values()) {
-            if (b.text.equals(text)) return b;
-        }
-        return null;
-    }
-
-}