Finish v1.24.3(271)

Implementata scrollview su DialogInputQuantity.
Corretta gestione cod anag in picking libero.

.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

@@ -1,13 +1,17 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.firebase-perf'
+
+if (!project.hasProperty("disable-performance-plugin")) {
+    apply plugin: 'com.google.firebase.firebase-perf'
+}
+
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 255
+    def appVersionCode = 271
-    def appVersionName = '1.23.0'
+    def appVersionName = '1.24.3'
 
     signingConfigs {
         release {
@@ -27,12 +31,12 @@ android {
         }
     }
 
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -94,33 +98,32 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:26.3.0')
+    implementation platform('com.google.firebase:firebase-bom:29.1.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-core'
-    implementation 'com.google.firebase:firebase-crash'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:17.6.0'
+    implementation 'com.google.android.gms:play-services-basement:18.0.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.1'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.35.1'
+    def dagger2_version = '2.40'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -135,12 +138,11 @@ 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'
 
     //SQLite ROOM
-    def room_version = "2.3.0"
+    def room_version = "2.4.1"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -154,12 +156,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'
-    implementation 'org.reflections:reflections:0.10.2'
+
+    // 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/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package it.integry.integrywmsnative;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("it.integry.integrywmsnative", appContext.getPackageName());
-    }
-}

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/AndroidManifest.xml

@@ -19,7 +19,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        android:fullBackupContent="@xml/backup_descriptor">
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
             android:screenOrientation="portrait"
@@ -40,7 +41,8 @@
         <activity
             android:name=".gest.main.MainActivity"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing">
+            android:windowSoftInputMode="adjustNothing"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CLIENTBARCODEACTIVITY" />
 
@@ -73,7 +75,8 @@
         <activity
             android:name=".SplashActivity"
             android:label="@string/app_name"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -5,6 +5,10 @@ import javax.inject.Singleton;
 import dagger.Component;
 import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;
+import it.integry.integrywmsnative.core.expansion.BaseActivityComponent;
+import it.integry.integrywmsnative.core.expansion.BaseActivityModule;
+import it.integry.integrywmsnative.core.expansion.BaseFragmentComponent;
+import it.integry.integrywmsnative.core.expansion.BaseFragmentModule;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneComponent;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneModule;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingComponent;
@@ -15,6 +19,8 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDo
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoModule;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormComponent;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliComponent;
@@ -45,6 +51,8 @@ import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamento
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeModule;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditComponent;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditModule;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloComponent;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloModule;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaComponent;
 import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaModule;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComponent;
@@ -59,10 +67,13 @@ import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviForn
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreModule;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceComponent;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceModule;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsModule;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialogComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
@@ -78,6 +89,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         RoomModule.class,
         SplashActivityModule.class,
         MainApplicationModule.class,
+        BaseActivityModule.class,
+        BaseFragmentModule.class,
         LoginModule.class,
         MainActivityModule.class,
         MainFragmentModule.class,
@@ -109,47 +122,97 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogChooseArtsFromListaArtsModule.class,
         DocInterniModule.class,
         DialogSelectDocInfoModule.class,
-        DocInterniEditFormModule.class
+        DocInterniEditFormModule.class,
+        DialogSelectDocRowsModule.class,
+        DialogAskClienteModule.class,
+        DialogEditArticoloModule.class
 })
 public interface MainApplicationComponent {
 
+    BaseActivityComponent.Factory baseActivityComponent();
+
+    BaseFragmentComponent.Factory baseFragmentComponent();
+
     SplashActivityComponent.Factory splashActivityComponent();
+
     LoginComponent.Factory loginActivityComponent();
+
     MainActivityComponent.Factory mainActivityComponent();
+
     MainFragmentComponent.Factory mainFragmentComponent();
+
     MainAccettazioneComponent.Factory mainAccettazioneComponent();
+
     ListaBancaliComponent.Factory listaBancaliComponent();
+
     ContenutoBancaleComponent.Factory contenutoBancaleComponent();
+
     PVOrdiniAcquistoGrigliaComponent.Factory pvOrdineAcquistoGrigliaComponent();
+
     PVOrdineAcquistoEditComponent.Factory pvOrdineAcquistoEditComponent();
+
     PickingLiberoComponent.Factory pickingLiberoComponent();
+
     RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
+
     SpedizioneComponent.Factory spedizioneComponent();
+
     AccettazionePickingComponent.Factory accettazionePickingComponent();
+
     UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
+
     UltimiArriviFornitoreComponent.Factory ultimiArriviFornitoreComponent();
+
     PickingResiComponent.Factory pickingResiComponent();
+
     OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
+
+    DialogAskClienteComponent.Factory dialogAskClienteComponent();
+
     DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
+
     DialogInputLUProdComponent.Factory dialogInputLUProdComponent();
+
     DialogScanArtComponent.Factory dialogScanArtComponent();
+
     DialogScanOrCreateLUComponent.Factory dialogScanOrCreateLUComponent();
+
     ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
+
     VersamentoMerceComponent.Factory versamentoMerceComponent();
+
     DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
+
     DialogChooseBatchLotComponent.Factory dialogChooseBatchLotComponent();
+
     DialogRowInfoProdFabbisognoLineeProdComponent.Factory dialogRowInfoProdFabbisognoLineeProdComponent();
+
     ProdRientroMerceComponent.Factory prodRientroMerceComponent();
+
     ProdRientroMerceOrderDetailComponent.Factory prodRientroMerceOrderDetailComponent();
+
     ProdOrdineProduzioneElencoComponent.Factory prodOrdineProduzioneElencoComponent();
+
     ProdRecuperoMaterialeComponent.Factory prodRecuperoMaterialeComponent();
+
     ProdVersamentoMaterialeComponent.Factory prodVersamentoMaterialeComponent();
+
     DialogChooseArtsFromListaArtsComponent.Factory dialogChooseArtsFromListaArtsComponent();
+
     DocInterniComponent.Factory docInterniComponent();
+
     DialogSelectDocInfoComponent.Factory dialogSelectMgrpDtipPairComponent();
+
+    DialogSelectDocRowsComponent.Factory dialogSelectDocRowsComponent();
+
     DocInterniEditFormComponent.Factory docInterniEditFormComponent();
 
+    InfoAggiuntiveLUDialogComponent.Factory infoAggiuntiveLUDialogComponent();
+
+    DialogEditArticoloComponent.Factory dialogEditArticoloComponent();
+
     void inject(MainApplication mainApplication);
+
     void inject(AppContext mainApplication);
 
 }

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

@@ -27,8 +27,11 @@ import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
 @Module
 public class MainApplicationModule {
@@ -71,6 +74,24 @@ public class MainApplicationModule {
         return new MenuService(menuRESTConsumer);
     }
 
+    @Provides
+    @Singleton
+    UpdatesManager provideUpdatesManager() {
+        return new UpdatesManager();
+    }
+
+    @Provides
+    @Singleton
+    DialogProgressView providesDialogProgressView() {
+        return DialogProgressView.newInstance();
+    }
+
+    @Provides
+    @Singleton
+    DialogInputQuantityV2View providesDialogInputQuantityV2View() {
+        return new DialogInputQuantityV2View();
+    }
+
     @Provides
     @Singleton
     OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {

app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java

@@ -16,7 +16,7 @@ public class CommonConst {
 
         public static String DEFAULT_ANONYMOUS_UL_SERIE = "UL";
 
-        public static int NUMBER_OF_DECIMAL_DIGITS = 3;
+        public static int NUMBER_OF_DECIMAL_DIGITS = 5;
     }
 
     public static class Files {

app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java

@@ -23,7 +23,7 @@ public class BarcodeCallbackDTO {
         return onScanSuccessfull;
     }
 
-    public BarcodeCallbackDTO setOnScanSuccessfull(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
+    public BarcodeCallbackDTO setOnScanSuccessful(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
         this.onScanSuccessfull = onScanSuccessfull;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/coollection/Coollection.java

@@ -1,49 +0,0 @@
-package it.integry.integrywmsnative.core.coollection;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Contains;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Equals;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.EqualsIgnoreCase;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.GreaterThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.IsNull;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.LessThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Not;
-import it.integry.integrywmsnative.core.coollection.query.Query;
-
-import java.util.Collection;
-
-public class Coollection {
-
-  public static <T> Query<T> from(Collection<T> collection) {
-    return new Query<T>(collection);
-  }
-
-  public static Matcher eq(Object value) {
-    return new Equals(value);
-  }
-
-  public static Matcher contains(String value) {
-    return new Contains(value);
-  }
-
-  public static Matcher eqIgnoreCase(String value) {
-    return new EqualsIgnoreCase(value);
-  }
-
-  public static Matcher not(Matcher matcher) {
-    return new Not(matcher);
-  }
-
-  public static Matcher greaterThan(Number value) {
-    return new GreaterThan(value);
-  }
-
-  public static Matcher lessThan(Number value) {
-    return new LessThan(value);
-  }
-
-  public static Matcher isNull() {
-    return new IsNull();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/Matcher.java

@@ -1,7 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher;
-
-public interface Matcher {
-
-  boolean match(Object value);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Contains.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Contains implements Matcher {
-
-  private final String matcherValue;
-
-  public Contains(String matcherValue) {
-    this.matcherValue = matcherValue;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return String.valueOf(value).contains(matcherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Equals.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Equals implements Matcher {
-
-  private final Object value;
-
-  public Equals(Object value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return value.equals(anotherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/EqualsIgnoreCase.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class EqualsIgnoreCase implements Matcher {
-
-  private final String value;
-
-  public EqualsIgnoreCase(String value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return (value).equalsIgnoreCase((String) anotherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/GreaterThan.java

@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class GreaterThan implements Matcher {
-
-  private final Number value;
-
-  public GreaterThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() > value.doubleValue();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/IsNull.java

@@ -1,12 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class IsNull implements Matcher {
-
-  @Override
-  public boolean match(Object value) {
-    return value == null;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/LessThan.java

@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class LessThan implements Matcher {
-
-  private final Number value;
-
-  public LessThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() < value.doubleValue();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Not.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Not implements Matcher {
-
-  private final Matcher matcher;
-
-  public Not(Matcher matcher) {
-    this.matcher = matcher;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return !matcher.match(value);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/Query.java

@@ -1,90 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.criteria.CriteriaList;
-import it.integry.integrywmsnative.core.coollection.query.order.Order;
-import it.integry.integrywmsnative.core.coollection.query.order.OrderCriteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.AndSpecification;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.OrSpecification;
-
-public class Query<T> {
-
-  private final Collection<T> collection;
-  private CriteriaList<T> criterias;
-  private OrderCriteria<T> orderCriteria;
-
-  public Query(Collection<T> collection) {
-    this.collection = collection;
-    criterias = new CriteriaList<T>();
-  }
-
-  public Query<T> where(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> and(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new AndSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> or(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new OrSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> orderBy(String method, Order order) {
-    orderCriteria = new OrderCriteria<T>(method, order);
-    return this;
-  }
-
-  public Query<T> orderBy(String method) {
-    return orderBy(method, Order.ASC);
-  }
-
-  public List<T> all() {
-    List<T> all = new ArrayList<T>();
-    for (T item : collection) {
-      if (criterias.match(item)) {
-        all.add(item);
-      }
-    }
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    return all;
-  }
-
-  public T first() {
-    List<T> all = cloneCollection(collection);
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    for (T item : all) {
-      if (criterias.match(item)) {
-        return item;
-      }
-    }
-    return null;
-  }
-
-  private List<T> cloneCollection(Collection<T> collection) {
-    List<T> list = new ArrayList<T>();
-    for (T item : collection) {
-      list.add(item);
-    }
-    return list;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/Criteria.java

@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-public class Criteria<T> {
-
-  private final String method;
-  private final Matcher matcher;
-  private Specification<T> specification;
-
-  public Criteria(String method, Matcher matcher) {
-    this.method = method;
-    this.matcher = matcher;
-  }
-
-  public void setSpecification(Specification<T> specification) {
-    this.specification = specification;
-  }
-
-  public Specification<T> specification() {
-    return specification;
-  }
-
-  public boolean match(T item) {
-    try {
-      Object value = Phanton.from(item).call(method);
-      return matcher.match(value);
-    } catch (Exception err) {
-      throw new RuntimeException(err);
-    }
-  }
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/CriteriaList.java

@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CriteriaList<T> {
-
-  private List<Criteria<T>> criterias;
-
-  public CriteriaList() {
-    criterias = new ArrayList<Criteria<T>>();
-  }
-
-  public void add(Criteria<T> criteria) {
-    criterias.add(criteria);
-  }
-
-  public boolean match(T item) {
-    if (criterias.size() == 0) {
-      return true;
-    }
-    if (criterias.size() == 1) {
-      return criterias.get(0).match(item);
-    }
-    boolean matched = true;
-    for (int i = criterias.size() - 1; i > 0; i--) {
-      Criteria<T> one = criterias.get(i);
-      Criteria<T> other = criterias.get(i - 1);
-      matched = matched && one.specification().match(item, one, other);
-    }
-    return matched;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/Order.java

@@ -1,5 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-public enum Order {
-  ASC, DESC
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderComparator.java

@@ -1,30 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-import java.util.Comparator;
-
-public class OrderComparator<T> implements Comparator<T> {
-
-  private final String method;
-
-  public OrderComparator(String method) {
-    this.method = method;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public int compare(T one, T other) {
-    Object oneValue = Phanton.from(one).call(method);
-    Object otherValue = Phanton.from(other).call(method);
-    if (oneValue == null || otherValue == null) {
-      return 0;
-    }
-    if (oneValue instanceof Comparable) {
-      return ((Comparable<Object>) oneValue).compareTo(otherValue);
-    } else {
-      return 0;
-    }
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderCriteria.java

@@ -1,24 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import java.util.Collections;
-import java.util.List;
-
-public class OrderCriteria<T> {
-
-  private final String method;
-  private final Order order;
-
-  public OrderCriteria(String method, Order order) {
-    this.method = method;
-    this.order = order;
-  }
-
-  public List<T> sort(List<T> list) {
-    Collections.sort(list, new OrderComparator<T>(method));
-    if (order == Order.DESC) {
-      Collections.reverse(list);
-    }
-    return list;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/Specification.java

@@ -1,9 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-
-public interface Specification<T> {
-
-  boolean match(T item, Criteria<T> one, Criteria<T> other);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/AndSpecification.java

@@ -1,13 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class AndSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) && other.match(item);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/OrSpecification.java

@@ -1,14 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class OrSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) || other.match(item);
-  }
-
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/reflection/Phanton.java

@@ -1,37 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.reflection;
-
-import java.lang.reflect.Field;
-
-public class Phanton<T> {
-
-  private final T target;
-  private Class<?> clazz;
-
-  private Phanton(T target) {
-    this.target = target;
-    clazz = target.getClass();
-  }
-
-  public static <T> Phanton<T> from(T target) {
-    return new Phanton<T>(target);
-  }
-
-  public Object call(String name) {
-    return invoke(name);
-  }
-
-  private Object invoke(String name) {
-    for (final Field field : clazz.getDeclaredFields()) {
-      try {
-        if (name.equals(field.getName())) {
-          field.setAccessible(Boolean.TRUE);
-          return field.get(target);
-        }
-      } catch (final IllegalAccessException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    throw new RuntimeException("No such property with name " + name);
-  }
-
-}

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

@@ -42,7 +42,7 @@ public class ColliDataRecoverService {
     }
 
     public boolean thereIsAnExistantSession() {
-        return mtbColtsSessions.size() > 0;
+        return mtbColtsSessions != null && mtbColtsSessions.size() > 0;
     }
 
     public List<Integer> getAllSessionIDs() {

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

@@ -4,6 +4,7 @@ import androidx.room.Database;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
 
+import it.integry.integrywmsnative.core.data_store.db.converter.BigDecimalConverter;
 import it.integry.integrywmsnative.core.data_store.db.converter.DateConverter;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
@@ -18,14 +19,13 @@ 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 = 5, exportSchema = false)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 8, exportSchema = false)
 @TypeConverters({
-        DateConverter.class
+        DateConverter.class,
+        BigDecimalConverter.class
 })
 public abstract class AppDatabase extends RoomDatabase {
 
-//    private AppDatabase mRoomInstance;
-
     public abstract ArticoloGrigliaDao articoloGrigliaDao();
 
     public abstract GrigliaDao grigliaDao();

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

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.data_store.db.converter;
+
+import androidx.room.TypeConverter;
+
+import java.math.BigDecimal;
+
+public class BigDecimalConverter {
+    @TypeConverter
+    public static BigDecimal fromFloat(Float value) {
+        return value == null ? null : BigDecimal.valueOf(value.doubleValue());
+    }
+
+    @TypeConverter
+    public static Float dateToTimestamp(BigDecimal value) {
+        return value == null ? null : value.floatValue();
+    }
+}

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

@@ -4,9 +4,10 @@ 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.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
@@ -21,10 +22,13 @@ public interface ArticoloGrigliaDao {
 
     @Insert
     void insertAll(List<ArticoloGriglia> articoli);
+
     @Insert
     Long insert(ArticoloGriglia articolo);
+
     @Update
     void updateAll(List<ArticoloGriglia> articoli);
+
     @Update
     void update(ArticoloGriglia articolo);
 
@@ -37,12 +41,18 @@ public interface ArticoloGrigliaDao {
     @Query("SELECT * FROM articoli_griglia WHERE cod_mart = :codMart AND id_griglia = :idGriglia LIMIT 1")
     ArticoloGriglia findArticoloByCodMartAndGriglia(String codMart, int idGriglia);
 
-    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan )AND id_griglia = :idGriglia LIMIT 1")
+    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan) AND id_griglia = :idGriglia LIMIT 1")
     ArticoloGriglia findArticoloByScanAndGriglia(String scan, int idGriglia);
 
-    @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode )AND id_griglia = :idGriglia LIMIT 1")
+    @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);
+
+    @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId AND new_no_promo = 1")
+    List<ArticoloGriglia> getNewArticoliInGriglia(int grigliaId);
 }

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

@@ -8,9 +8,8 @@ import androidx.room.Update;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
-import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.ArticoloOrdineWrapper;
 
 @Dao
 public interface ArticoloOrdineDao {
@@ -34,8 +33,17 @@ public interface ArticoloOrdineDao {
     @Update
     void update(ArticoloOrdine articolo);
 
-    @Query("SELECT * FROM articoli_ordine where id_ordine = :ordineId")
+    @Query("SELECT articoli_ordine.*," +
-    List<ArticoloOrdine> findArticoliByOrdine(int ordineId);
+            "articoli_griglia.gg_scadenza," +
+            "articoli_griglia.giacenza," +
+            "articoli_griglia.qta_prevista_vendita," +
+            "articoli_griglia.qta_proposta " +
+            "FROM articoli_ordine " +
+            "INNER JOIN ordini on articoli_ordine.id_ordine = ordini.ordine_id " +
+            "LEFT OUTER JOIN articoli_griglia " +
+            "on articoli_ordine.cod_mart = articoli_griglia.cod_mart  and ordini.id_griglia = articoli_griglia.id_griglia and articoli_ordine.bar_code = articoli_griglia.bar_code " +
+            "where id_ordine = :ordineId")
+    List<ArticoloOrdineWrapper> findArticoliByOrdine(int ordineId);
 
     @Query("SELECt * from articoli_ordine where cod_mart = :codMart and id_ordine = :ordineId LIMIT 1")
     ArticoloOrdine findArticoloByCodMartAndOrdine(int ordineId, String codMart);

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;
@@ -71,11 +71,14 @@ public class ArticoloGriglia {
     @ColumnInfo(name = "id_griglia")
     private int idGriglia;
 
-    public int getArticoloGrigliaId() {
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo = false;
+
+    public Integer getArticoloGrigliaId() {
         return articoloGrigliaId;
     }
 
-    public void setArticoloGrigliaId(int articoloGrigliaId) {
+    public void setArticoloGrigliaId(Integer articoloGrigliaId) {
         this.articoloGrigliaId = articoloGrigliaId;
     }
 
@@ -191,6 +194,14 @@ public class ArticoloGriglia {
         this.qtaProposta = qtaProposta;
     }
 
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
     public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
         ArticoloOrdine articolo = new ArticoloOrdine();
 
@@ -210,6 +221,7 @@ public class ArticoloGriglia {
         articolo.setGiacenza(BigDecimal.valueOf(this.getGiacenza()));
         articolo.setQtaPrevistaVendita(BigDecimal.valueOf(this.getQtaPrevistaVendita()));
         articolo.setQtaProposta(BigDecimal.valueOf(this.getQtaProposta()));
+        articolo.setNewNoPromo(this.isNewNoPromo());
 
         articolo.setQtaOrd(0);
 

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

@@ -29,7 +29,7 @@ import java.util.Date;
 public class ArticoloOrdine {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "articolo_ordine_id")
-    private int articoloOrdineId;
+    private Integer articoloOrdineId;
 
     @ColumnInfo(name = "cod_mart")
     private String codMart;
@@ -67,6 +67,8 @@ public class ArticoloOrdine {
     @ColumnInfo(name = "data_ins")
     private Date dataIns;
 
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo;
 
     @Ignore
     private int ggScadenza = 0;
@@ -80,12 +82,15 @@ public class ArticoloOrdine {
     @Ignore
     private BigDecimal qtaProposta = BigDecimal.ZERO;
 
+    @Ignore
+    private int bgTint;
 
-    public int getArticoloOrdineId() {
+
+    public Integer getArticoloOrdineId() {
         return articoloOrdineId;
     }
 
-    public void setArticoloOrdineId(int articoloOrdineId) {
+    public void setArticoloOrdineId(Integer articoloOrdineId) {
         this.articoloOrdineId = articoloOrdineId;
     }
 
@@ -221,14 +226,44 @@ public class ArticoloOrdine {
         return this;
     }
 
-    public BigDecimal getQtaCnfPrevistaVendita(){
+    public BigDecimal getQtaCnfPrevistaVendita() {
-        return qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf),0, RoundingMode.CEILING);
+        return qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
 
-    public BigDecimal getQtaCnfProposta(){
+    public BigDecimal getQtaCnfProposta() {
-        return qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf),0, RoundingMode.CEILING);
+        return qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
-    public BigDecimal getQtaCnfGiacenza(){
+
-        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf),0, RoundingMode.CEILING);
+    public BigDecimal getQtaCnfGiacenza() {
+        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
+    public float getCnfDaRic() {
+        return qtaCnf > 0.f ? merceDaRic * qtaCnf : 0;
+    }
+
+    public int checkQtaProposta() {
+        int check = 0;
+        if (!qtaProposta.equals(BigDecimal.ZERO)) {
+            check = BigDecimal.valueOf(qtaOrd).compareTo(qtaProposta);
+        }
+        return check;
+    }
+
+    public int getBgTint() {
+        return bgTint;
+    }
+
+    public ArticoloOrdine setBgTint(int bgTint) {
+        this.bgTint = bgTint;
+        return this;
     }
 }

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

@@ -16,4 +16,6 @@ public interface ArticoloGrigliaRepository {
 
     void findArticoloByScanAndGriglia(String scan, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onFail);
 
+    void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onFail);
+
 }

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<>();
+                var tmp = calcItemsToInsertAndUpdate(updatedArts);
-                List<ArticoloGriglia> toInsert = new ArrayList<>();
+                var toInsert = (List<ArticoloGriglia>) tmp.get("toInsert");
-                List<String> codMarts = new ArrayList<>();
+                var toUpdate = (List<ArticoloGriglia>) tmp.get("toUpdate");
-                for (ArticoloGriglia art : articoli) {
+                var codMarts = (List<String>) tmp.get("codMarts");
-                    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);
-                    }
-                }
                 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 {
@@ -89,4 +136,14 @@ public class ArticoliGrigliaDataSource extends Repository implements ArticoloGri
             }
         });
     }
+
+    public void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onFail) {
+        execute(() -> {
+            try {
+                onSuccess.run(mArticoloGrigliaDao.getNewArticoliInGriglia(idGriglia));
+            } catch (Exception e) {
+                onFail.run(e);
+            }
+        });
+    }
 }

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

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.data_store.db.repository.implementations;
 
+import com.annimon.stream.Stream;
+
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -11,6 +13,7 @@ import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.ArticoloOrdineWrapper;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
 public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdineRepository {
@@ -28,13 +31,15 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
                 List<ArticoloOrdine> toUpdate = new ArrayList<>();
                 List<ArticoloOrdine> toInsert = new ArrayList<>();
                 for (ArticoloOrdine art : articoli) {
-                    if (art.getArticoloOrdineId() > 0) {
+                    if (art.getArticoloOrdineId() != null && art.getArticoloOrdineId() > 0) {
                         toUpdate.add(art);
                     } else {
                         toInsert.add(art);
                     }
                 }
-                mArticoloOrdineDao.insertAll(toInsert);
+                for (ArticoloOrdine newArt : toInsert) {
+                    mArticoloOrdineDao.insert(newArt);
+                }
                 mArticoloOrdineDao.updateAll(toUpdate);
                 onSuccess.run();
 
@@ -48,7 +53,7 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
     public void saveArticoloToOrdine(ArticoloOrdine articolo, Runnable onSuccess, RunnableArgs<Exception> onFail) {
         execute(() -> {
             try {
-                if (articolo.getArticoloOrdineId() > 0) {
+                if (articolo.getArticoloOrdineId() != null && articolo.getArticoloOrdineId() > 0) {
                     mArticoloOrdineDao.update(articolo);
                 } else {
                     mArticoloOrdineDao.insert(articolo);
@@ -93,7 +98,15 @@ public class ArticoliOrdineDataSource extends Repository implements ArticoliOrdi
     public void findArticoliByOrdine(Ordine ordine, RunnableArgs<List<ArticoloOrdine>> onLoad, RunnableArgs<Exception> onError) {
         execute(() -> {
             try {
-                onLoad.run(mArticoloOrdineDao.findArticoliByOrdine(ordine.getOrdineId()));
+                List<ArticoloOrdineWrapper> list = mArticoloOrdineDao.findArticoliByOrdine(ordine.getOrdineId());
+                onLoad.run(Stream.of(list).map(x -> {
+                    ArticoloOrdine art = x.getArticoloOrdine();
+                    art.setGgScadenza(x.getGgScadenza());
+                    art.setGiacenza(x.getGiacenza());
+                    art.setQtaProposta(x.getQtaProposta());
+                    art.setQtaPrevistaVendita(x.getQtaPrevistaVendita());
+                    return art;
+                }).toList());
             } catch (Exception e) {
                 onError.run(e);
             }

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

@@ -1,35 +1,23 @@
 package it.integry.integrywmsnative.core.data_store.db.view_model;
 
-import androidx.room.ColumnInfo;
-
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 
 public class ArticoloDTO {
 
-    private String codMart;
+    public String codMart;
-
+    public String descrizione;
-    private String descrizione;
+    public String untMis;
-
+    public float qtaCnf;
-    private String untMis;
+    public String barcode;
-
+    public float merceDaRic;
-    private String barcode;
+    public float mediaSett;
-
+    public String flagQtaMultipla;
-    private String flagQtaMultipla;
+    public String flagTracciabilita;
-
+    public float qtaMinOrdinabile;
-    private float qtaCnf;
+    public boolean newNoPromo;
-
-    private float merceDaRic;
-
-    private float mediaSett;
-
-    private float qtaMinOrdinabile;
-
     private int ggScadenza;
-
     private float giacenza;
-
     private float qtaPrevistaVendita;
-
     private float qtaProposta;
 
 
@@ -145,6 +133,24 @@ public class ArticoloDTO {
         this.qtaProposta = qtaProposta;
     }
 
+    public String getFlagTracciabilita() {
+        return flagTracciabilita;
+    }
+
+    public ArticoloDTO setFlagTracciabilita(String flagTracciabilita) {
+        this.flagTracciabilita = flagTracciabilita;
+        return this;
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public ArticoloDTO setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+        return this;
+    }
+
     public ArticoloGriglia toArticoloGriglia() {
         ArticoloGriglia result = new ArticoloGriglia();
         result.setBarCode(this.getBarCode());
@@ -157,6 +163,7 @@ public class ArticoloDTO {
         result.setFlagQtaMultipla(this.getFlagQtaMultipla());
         result.setQtaMinOrdinabile(this.getQtaMinOrdinabile());
         result.setGgScadenza(this.ggScadenza);
+        result.setNewNoPromo(this.newNoPromo);
         result.setGiacenza(this.giacenza);
         result.setQtaPrevistaVendita(this.qtaPrevistaVendita);
         result.setQtaProposta(this.qtaProposta);

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

@@ -0,0 +1,65 @@
+package it.integry.integrywmsnative.core.data_store.db.wrappers;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Embedded;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
+
+public class ArticoloOrdineWrapper {
+    @Embedded
+    private ArticoloOrdine articoloOrdine;
+
+    @ColumnInfo(name = "gg_scadenza")
+    private int ggScadenza = 0;
+
+    @ColumnInfo(name = "giacenza")
+    private BigDecimal giacenza = BigDecimal.ZERO;
+
+    @ColumnInfo(name = "qta_prevista_vendita")
+    private BigDecimal qtaPrevistaVendita = BigDecimal.ZERO;
+
+    @ColumnInfo(name = "qta_proposta")
+    private BigDecimal qtaProposta = BigDecimal.ZERO;
+
+    public ArticoloOrdine getArticoloOrdine() {
+        return articoloOrdine;
+    }
+
+    public void setArticoloOrdine(ArticoloOrdine articoloOrdine) {
+        this.articoloOrdine = articoloOrdine;
+    }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public void setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public BigDecimal getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(BigDecimal qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public BigDecimal getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(BigDecimal qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+}

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() {
+    public NoResultFromBarcodeException(String barcode) {
-        super(UtilityResources.getString(R.string.no_result_from_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

@@ -1,21 +1,39 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import android.app.Dialog;
+import android.content.Context;
+import android.util.AttributeSet;
 import android.view.KeyEvent;
+import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class BaseActivity extends AppCompatActivity {
 
+    @Inject
+    public DialogProgressView mCurrentProgress;
 
-    protected Dialog mCurrentProgress;
+    private boolean progressOpened;
 
-    public BaseActivity() {
+    @Nullable
-        //Thread.setDefaultUncaughtExceptionHandler(new MyExceptionHandler(this, BaseActivity.class));
+    @Override
+    public View onCreateView(@Nullable View parent, @NonNull String name, @NonNull Context context, @NonNull AttributeSet attrs) {
+        var v = super.onCreateView(parent, name, context, attrs);
+
+        MainApplication.appComponent
+                .baseActivityComponent()
+                .create()
+                .inject(this);
+
+        return v;
     }
 
     @Override
@@ -40,37 +58,38 @@ public class BaseActivity extends AppCompatActivity {
 
 
     protected void openProgress() {
-        runOnUiThread(() -> {
+        BarcodeManager.disable();
-            BarcodeManager.disable();
+        if (!progressOpened && !this.mCurrentProgress.isAdded()) {
-            if (this.mCurrentProgress == null) {
+            this.progressOpened = true;
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(this);
+            runOnUiThread(() -> {
-            }
+                this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
-        });
+            });
+        }
     }
 
     protected void closeProgress() {
-        runOnUiThread(() -> {
+        BarcodeManager.enable();
-            BarcodeManager.enable();
+        if (progressOpened) {
-            if (mCurrentProgress != null) {
+            this.progressOpened = false;
+            runOnUiThread(() -> {
                 mCurrentProgress.dismiss();
-                mCurrentProgress = null;
+            });
-            }
+        }
-        });
     }
 
 
     public void onLoadingStarted() {
-        new Thread(() -> {
+//        new Thread(() -> {
             BarcodeManager.disable();
             this.openProgress();
-        }).start();
+//        }).start();
     }
 
     public void onLoadingEnded() {
-        new Thread(() -> {
+//        new Thread(() -> {
             this.closeProgress();
             BarcodeManager.enable();
-        }).start();
+//        }).start();
     }
 
     public void onError(Exception ex) {

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

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BaseActivityComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BaseActivityComponent create();
+    }
+
+    void inject(BaseActivity baseActivity);
+}

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

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Module;
+
+@Module(subcomponents = BaseActivityComponent.class)
+public class BaseActivityModule {
+}

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import android.app.Dialog;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -15,11 +14,12 @@ import androidx.fragment.app.FragmentTransaction;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class BaseDialogFragment extends DialogFragment {
 
     private boolean mBarcodeListener = false;
-    private Dialog mCurrentProgress;
+    private DialogProgressView mCurrentProgress;
 
     public BaseDialogFragment() {
         super();
@@ -82,7 +82,7 @@ public class BaseDialogFragment extends DialogFragment {
 //        new Thread(() -> {
         requireActivity().runOnUiThread(() -> {
             if (this.mCurrentProgress == null) {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(requireActivity());
             }
         });
 //        }).start();

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

@@ -1,53 +1,70 @@
 package it.integry.integrywmsnative.core.expansion;
 
-import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public abstract class BaseFragment extends Fragment {
 
-    protected Dialog mCurrentProgress;
+    @Inject
+    public DialogProgressView mCurrentProgress;
 
     protected ElevatedToolbar mToolbar;
 
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private boolean progressOpened;
 
 
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;
     }
 
-
     public void addOnPreDestroy(Runnable onPreDestroy) {
         this.mOnPreDestroyList.add(onPreDestroy);
     }
 
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
+
+        MainApplication.appComponent
+                .baseFragmentComponent()
+                .create()
+                .inject(this);
+
+        return view;
+    }
 
     public void onLoadingStarted() {
-        new Thread(() -> {
+        BarcodeManager.disable();
-            BarcodeManager.disable();
+        this.openProgress();
-            this.openProgress();
-        }).start();
     }
 
     public void onLoadingEnded() {
-        new Thread(() -> {
+        this.closeProgress();
-            this.closeProgress();
+        BarcodeManager.enable();
-            BarcodeManager.enable();
-        }).start();
     }
 
     public void onError(Exception ex) {
-        this.getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             this.closeProgress();
             UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
             BarcodeManager.enable();
@@ -65,24 +82,25 @@ public abstract class BaseFragment extends Fragment {
     }
 
     protected void openProgress() {
-        getActivity().runOnUiThread(() -> {
+        if (!progressOpened) {
-            if (this.mCurrentProgress == null) {
+            this.progressOpened = true;
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+            requireActivity().runOnUiThread(() -> {
-            }
+                this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-        });
+            });
+        }
     }
 
     protected void closeProgress() {
-        getActivity().runOnUiThread(() -> {
+        if (progressOpened) {
-            if (mCurrentProgress != null) {
+            this.progressOpened = false;
+            requireActivity().runOnUiThread(() -> {
                 mCurrentProgress.dismiss();
-                mCurrentProgress = null;
+            });
-            }
+        }
-        });
     }
 
     protected void popMe() {
-        getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             ((IPoppableActivity) requireActivity()).pop();
         });
     }

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

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface BaseFragmentComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        BaseFragmentComponent create();
+    }
+
+    void inject(BaseFragment baseFragment);
+}

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

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import dagger.Module;
+
+@Module(subcomponents = BaseFragmentComponent.class)
+public class BaseFragmentModule {
+}

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;
@@ -57,6 +61,7 @@ public class MtbColt extends EntityBase {
     private String codJcom;
 
     private List<MtbCols> mtbCols;
+    private MtbTCol mtbTCol;
 
     private Boolean disablePrint;
     private String ragSocCliente;
@@ -83,7 +88,6 @@ public class MtbColt extends EntityBase {
     }
 
 
-
     private ObservableArrayList<MtbColr> mtbColr = new ObservableArrayList<>();
 
     public ObservableArrayList<MtbColr> getMtbColr() {
@@ -95,21 +99,51 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
-    public MtbColt(){
+    public MtbColt() {
         type = "mtb_colt";
         setDataCollo(UtilityDate.getDateInstance());
         setSerCollo("/");
 
-        if(SettingsManager.i().isUserLoggedIn()) {
+        if (SettingsManager.i().isUserLoggedIn()) {
             setPreparatoDa(SettingsManager.i().getUser().getFullname());
         }
     }
 
-    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:
+            case PRODUZIONE:
+                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;
     }
@@ -137,11 +171,11 @@ public class MtbColt extends EntityBase {
         Date dataColloD = null;
         try {
             dataColloD = getDataColloD();
-        } catch (Exception ex){
+        } catch (Exception ex) {
             UtilityLogger.errorMe(ex);
         }
 
-        if(dataColloD != null){
+        if (dataColloD != null) {
             return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN_LONG);
         } else return null;
     }
@@ -392,7 +426,7 @@ public class MtbColt extends EntityBase {
     public String getTimeVers() {
         Date dataColloD = getDataVersD();
 
-        if(dataColloD != null){
+        if (dataColloD != null) {
             return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.TIME);
         } else return null;
     }
@@ -526,6 +560,15 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public MtbTCol getMtbTCol() {
+        return mtbTCol;
+    }
+
+    public MtbColt setMtbTCol(MtbTCol mtbTCol) {
+        this.mtbTCol = mtbTCol;
+        return this;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";
@@ -533,9 +576,9 @@ public class MtbColt extends EntityBase {
 
         StringBuilder whereCond = new StringBuilder();
 
-        if(filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
+        if (filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
 
-            for(int i = 0; i < filtroOrdineDtos.size(); i++){
+            for (int i = 0; i < filtroOrdineDtos.size(); i++) {
                 FiltroOrdineDTO x = filtroOrdineDtos.get(i);
 
                 try {
@@ -545,13 +588,13 @@ public class MtbColt extends EntityBase {
                             UtilityDB.valueToString(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
                             UtilityDB.valueToString(x.getNumOrd())));
 
-                    if(!UtilityString.isNullOrEmpty(x.getDataConsS())) {
+                    if (!UtilityString.isNullOrEmpty(x.getDataConsS())) {
                         whereCond.append(String.format(" AND dr.dc = %s",
                                 UtilityDB.valueToString(UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
                     }
 
                     whereCond.append(")");
-                    if(i < filtroOrdineDtos.size()-1) {
+                    if (i < filtroOrdineDtos.size() - 1) {
                         whereCond.append(" OR ");
                     }
                 } catch (Exception e) {

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

@@ -83,7 +83,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
                 analyzeAnswer(response, "getByCodMart", (m) -> {
-                    if(response.body().getEntityList() != null && !response.body().getEntityList().isEmpty()) {
+                    if (response.body().getEntityList() != null && !response.body().getEntityList().isEmpty()) {
                         onComplete.run(response.body().getEntityList().get(0));
                     } else onComplete.run(null);
 
@@ -107,9 +107,10 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
                 })
                 .toList();
 
-        var whereCond = " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap);
+        var whereCond = whereCondMap.isEmpty() ? "" : " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap);
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbGrup>>() {}.getType();
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbGrup>>() {
+        }.getType();
         this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed);
 
     }

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)
+                .setSegno(segno);
-                .setGestione(GestioneEnum.LAVORAZIONE);
 
-        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);
+                .initDefaultFields(gestione);
-
-        mtbColtToCreate.initDefaultFields();
 
         Integer customNumCollo = UtilityBarcode.getNumColloFromULAnonima(barcode);
         String customSerCollo = CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE;

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

@@ -125,7 +125,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);
 
         service.getOrdiniInevasi(codMdep, gestione.getText())
-                .enqueue(new Callback<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
@@ -145,7 +145,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
-    public void retrieveListaArticoliFromOrdiniUscita(List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveListaArticoliFromOrdiniUscita(String codMdep, List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
                 .map(x -> new GetPickingListDTO()
                         .setData(x.getDataOrdS())
@@ -157,7 +157,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
 
-        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+        service.getArticoliFromOrdini(codMdep, getPickingListDTOs).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
                 analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", onComplete, onFailed);

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

@@ -16,7 +16,7 @@ import retrofit2.http.Query;
 public interface OrdiniRESTConsumerService {
 
     @POST("wms/getArticoliFromOrdini")
-    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Body List<GetPickingListDTO> pickingListDTO);
+    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Query("codMdep") String codMdep, @Body List<GetPickingListDTO> pickingListDTO);
 
     @POST("wms/getSuggestedPickingList")
     Call<ServiceRESTResponse<List<PickingObjectDTO>>> getSuggestedPickingList(@Query("codMdep") String codMdep, @Body List<SitArtOrdDTO> sitArtOrdDTOList);

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

@@ -6,8 +6,11 @@ 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;
+
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
@@ -27,37 +30,47 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+@Singleton
 public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 
 
-    public static void getArticoliListino(String codAlis, RunnableArgs<GrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
+    public void getArticoliListino(String codAlis, RunnableArgs<GrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
+        getArticoliListinoStatic(codAlis, onSuccess, onFailed);
+    }
+
+    public static void getArticoliListinoStatic(String codAlis, RunnableArgs<GrigliaDTO> onSuccess, RunnableArgs<Exception> onFailed) {
         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)
+                                        .groupBy(ArticoloDTO::getCodMart)
-                                        .distinct()
+                                        .forEach(entry -> {
-                                        .withoutNulls()
+
-                                        .forEach(art -> {
+                                            if(entry.getValue().size() == 1) {
-                                            List<ArticoloDTO> inList = Stream.of(griglia.getGrigliaAcquistiChild()).filter(x -> x.getCodMart().equalsIgnoreCase(art)).toList();
+                                                listaArticoli.add(entry.getValue().get(0));
-                                            if (inList.size() > 1) {
+                                            } else {
-                                                for (ArticoloDTO articolo : inList) {
+                                                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);
@@ -72,7 +85,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
-    public static void saveOrdine(Ordine ordine, List<ArticoloOrdine> articoli, Griglia griglia, RunnableArgs<Ordine> onSuccess, RunnableArgs<Exception> onFailed) {
+    public void saveOrdine(Ordine ordine, List<ArticoloOrdine> articoli, Griglia griglia, RunnableArgs<Ordine> onSuccess, RunnableArgs<Exception> onFailed) {
         SaveDTO saveDTO = new SaveDTO();
         OrdineDTO ordineDTO = new OrdineDTO();
         List<ArtDTO> artRows = new ArrayList<>();
@@ -126,7 +139,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
 
     }
 
-    private static ArtDTO convertArtToDTO(ArticoloOrdine art, int rigaOrd) {
+    private ArtDTO convertArtToDTO(ArticoloOrdine art, int rigaOrd) {
         ArtDTO dto = new ArtDTO();
         dto.setRigaOrd(rigaOrd);
         dto.setCodMart(art.getCodMart());

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

@@ -5,9 +5,7 @@ import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import com.orhanobut.logger.Logger;
@@ -17,8 +15,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -35,6 +31,7 @@ import it.integry.integrywmsnative.core.rest.model.MailRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
@@ -55,18 +52,11 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
             public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                 analyzeAnswer(response, "ProcessSql", o -> {
                     Gson gson = new GsonBuilder()
-                            .registerTypeAdapter(Date.class, new JsonDeserializer() {
+                            .registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> {
-                                @Override
+                                try {
-                                public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+                                    return UtilityDate.recognizeDate(json.getAsString());
-                                    try {
+                                } catch (Exception e) {
-                                        return new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").parse(json.getAsString());
+                                    throw new JsonParseException(e);
-                                    } catch (Exception e) {
-                                        try {
-                                            return new SimpleDateFormat().parse(json.getAsString());
-                                        } catch (ParseException parseException) {
-                                            throw new JsonParseException(parseException);
-                                        }
-                                    }
                                 }
                             })
                             .create();

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/model/SitArtOrdDTO.java

@@ -19,6 +19,7 @@ public class SitArtOrdDTO {
     private String idViaggio;
     private String codMdep;
     private boolean flagEnablePickManuale;
+    private boolean flagEnableScanArt;
     private String codMgrp;
     private String descrizioneMgrp;
     private String codMsgr;
@@ -145,6 +146,14 @@ public class SitArtOrdDTO {
         return this;
     }
 
+    public boolean isFlagEnableScanArt() {
+        return flagEnableScanArt;
+    }
+
+    public SitArtOrdDTO setFlagEnableScanArt(boolean flagEnableScanArt) {
+        this.flagEnableScanArt = flagEnableScanArt;
+        return this;
+    }
 
     public String getCodMgrp() {
         return codMgrp;

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())) {
+            if (shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) {
-                UtilityServer.isEmsApiAvailable(SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), mInternalCallback);
+                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

@@ -3,10 +3,11 @@ package it.integry.integrywmsnative.core.settings;
 import java.util.ArrayList;
 import java.util.List;
 
-import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
-import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 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;
 
 public class DBSettingsModel {
 
@@ -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;
@@ -36,9 +38,14 @@ public class DBSettingsModel {
     private boolean flagSpedizioneCanSelectMultipleOrders;
     private List<String> notePerditaDocInterni = new ArrayList<>();
     private boolean flagSpedizioneUseQtaOrd;
+    private boolean flagOrdinaNuoviArticoliInGriglia;
+    private boolean flagOrdinaArticoliOnScan;
+    private String docInterniCheckFornitore;
     private String produzioneDefaultCodAnag;
     private String reportNameSpedizionChiudiOrdine;
     private int onNumCnfInputChanged = 1;
+    private boolean flagAccettazioneUseQtaOrd = false;
+    private boolean flagPickLiberoAllowEmptyDest = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -72,7 +79,16 @@ public class DBSettingsModel {
     }
 
     public DBSettingsModel setDatiAzienda(Azienda datiAzienda) {
-            this.datiAzienda = datiAzienda;
+        this.datiAzienda = datiAzienda;
+        return this;
+    }
+
+    public List<InternalCodAnagsDTO> getInternalCodAnags() {
+        return internalCodAnags;
+    }
+
+    public DBSettingsModel setInternalCodAnags(List<InternalCodAnagsDTO> internalCodAnags) {
+        this.internalCodAnags = internalCodAnags;
         return this;
     }
 
@@ -102,12 +118,12 @@ public class DBSettingsModel {
         return this;
     }
 
-    public String getDefaultCodAnag() {
+    public boolean isFlagUseCodAnagAziendale() {
-        return defaultCodAnag;
+        return flagUseCodAnagAziendale;
     }
 
-    public DBSettingsModel setDefaultCodAnag(String defaultCodAnag) {
+    public DBSettingsModel setFlagUseCodAnagAziendale(boolean flagUseCodAnagAziendale) {
-        this.defaultCodAnag = defaultCodAnag;
+        this.flagUseCodAnagAziendale = flagUseCodAnagAziendale;
         return this;
     }
 
@@ -138,12 +154,12 @@ public class DBSettingsModel {
         return this;
     }
 
-    public boolean isFlagAllowEmptyClienteInPickingLibero() {
+    public boolean isFlagPickLiberoAllowEmptyCliente() {
-        return flagAllowEmptyClienteInPickingLibero;
+        return flagPickLiberoAllowEmptyCliente;
     }
 
-    public DBSettingsModel setFlagAllowEmptyClienteInPickingLibero(boolean flagAllowEmptyClienteInPickingLibero) {
+    public DBSettingsModel setFlagPickLiberoAllowEmptyCliente(boolean flagPickLiberoAllowEmptyCliente) {
-        this.flagAllowEmptyClienteInPickingLibero = flagAllowEmptyClienteInPickingLibero;
+        this.flagPickLiberoAllowEmptyCliente = flagPickLiberoAllowEmptyCliente;
         return this;
     }
 
@@ -247,6 +263,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public DBSettingsModel setFlagOrdinaNuoviArticoliInGriglia(boolean flagOrdinaNuoviArticoliInGriglia) {
+        this.flagOrdinaNuoviArticoliInGriglia = flagOrdinaNuoviArticoliInGriglia;
+        return this;
+    }
+
+    public boolean getFlagOrdinaNuoviArticoliInGriglia() {
+        return this.flagOrdinaNuoviArticoliInGriglia;
+    }
+
     public String getProduzioneDefaultCodAnag() {
         return produzioneDefaultCodAnag;
     }
@@ -282,4 +307,41 @@ public class DBSettingsModel {
         this.notePerditaDocInterni = notePerditaDocInterni;
         return this;
     }
+
+    public String getDocInterniCheckFornitore() {
+        return docInterniCheckFornitore;
+    }
+
+    public DBSettingsModel setDocInterniCheckFornitore(String docInterniCheckFornitore) {
+        this.docInterniCheckFornitore = docInterniCheckFornitore;
+        return this;
+    }
+
+    public boolean isFlagAccettazioneUseQtaOrd() {
+        return flagAccettazioneUseQtaOrd;
+    }
+
+    public DBSettingsModel setFlagAccettazioneUseQtaOrd(boolean flagAccettazioneUseQtaOrd) {
+        this.flagAccettazioneUseQtaOrd = flagAccettazioneUseQtaOrd;
+        return this;
+    }
+
+    public boolean isFlagPickLiberoAllowEmptyDest() {
+        return flagPickLiberoAllowEmptyDest;
+    }
+
+    public DBSettingsModel setFlagPickLiberoAllowEmptyDest(boolean flagPickLiberoAllowEmptyDest) {
+        this.flagPickLiberoAllowEmptyDest = flagPickLiberoAllowEmptyDest;
+        return this;
+    }
+
+
+    public boolean getFlagOrdinaArticoliOnScan() {
+        return flagOrdinaArticoliOnScan;
+    }
+
+    public DBSettingsModel setFlagOrdinaArticoliOnScan(boolean flagOrdinaArticoliOnScan) {
+        this.flagOrdinaArticoliOnScan = flagOrdinaArticoliOnScan;
+        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,18 @@ public class SettingsManager {
                 onFailed.run(new Exception("Errore durante il caricamento dei dati. Riavviare l'applicazione!"));
         };
 
-        onProgress.run("dati azienda");
-        loadDatiAzienda(() -> {
 
-            onProgress.run("profili");
+        onProgress.run("depositi");
-            loadAvailableProfiles(() -> {
+        loadAvailableCodMdeps(() -> {
 
-                onProgress.run("depositi");
+            onProgress.run("posizioni");
-                loadAvailableCodMdeps(() -> {
+            loadAvailablePosizioni(() -> {
 
-                    onProgress.run("posizioni");
+                onProgress.run("impostazioni");
-                    loadAvailablePosizioni(() -> {
+                loadGestSetupValues(() -> {
 
-                        onProgress.run("impostazioni");
+                    onProgress.run("dati azienda");
-                        loadGestSetupValues(tmpOnComplete, tmpOnFailed);
+                    loadDatiAzienda(tmpOnComplete, tmpOnFailed);
-                    }, tmpOnFailed);
                 }, tmpOnFailed);
             }, tmpOnFailed);
         }, tmpOnFailed);
@@ -113,7 +113,27 @@ 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")
@@ -238,10 +258,6 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("PRODUZIONE")
                 .setKeySection("FLAG_VERSAMENTO_DIRETTO"));
-        stbGestSetupList.add(new StbGestSetup()
-                .setGestName("PICKING")
-                .setSection("PRODUZIONE")
-                .setKeySection("DEFAULT_COD_ANAG"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -270,16 +286,36 @@ public class SettingsManager {
                 .setGestName("PVM")
                 .setSection("DOC_INTERNI")
                 .setKeySection("NOTE_PERDITA"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("ORDINI_A")
+                .setKeySection("ORDINA_NUOVI_ARTICOLI"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("ORDINI_A")
+                .setKeySection("ORDINA_ARTICOLI_ON_SCAN"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("DOC_INTERNI")
+                .setKeySection("CHECK_FORNITORE"));
+        stbGestSetupList.add(new StbGestSetup()
+                .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));
@@ -288,14 +324,19 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "SETUP", "FLAG_ASK_PESO_COLLO", Boolean.class));
             dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_NEW_PICKING_LIST", Boolean.class));
             dbSettingsModelIstance.setFlagVersamentoDirettoProduzione(getValueFromList(list, "PRODUZIONE", "FLAG_VERSAMENTO_DIRETTO", Boolean.class));
-            dbSettingsModelIstance.setProduzioneDefaultCodAnag(getValueFromList(list, "PRODUZIONE", "DEFAULT_COD_ANAG", String.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
             dbSettingsModelIstance.setReportNameSpedizionChiudiOrdine(getValueFromList(list, "SPEDIZIONE", "REPORT_PACKING_LIST", String.class));
             dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
-            String notePerdita = getValueFromList(list,"DOC_INTERNI","NOTE_PERDITA",String.class);
+            dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class));
-            if (notePerdita != null){
+            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));
+            dbSettingsModelIstance.setFlagOrdinaArticoliOnScan(getValueFromList(list, "ORDINI_A", "ORDINA_ARTICOLI_ON_SCAN", Boolean.class));
+
+            String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
+            if (notePerdita != null) {
                 dbSettingsModelIstance.setNotePerditaDocInterni(Arrays.asList(notePerdita.split("\\|")));
             }
 

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

@@ -1,60 +0,0 @@
-package it.integry.integrywmsnative.core.update;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Environment;
-import android.util.Log;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-public class UpdateApp extends AsyncTask<String,Void,Void> {
-    private Context context;
-    public void setContext(Context contextf){
-        context = contextf;
-    }
-
-    @Override
-    protected Void doInBackground(String... arg0) {
-        try {
-            URL url = new URL(arg0[0]);
-            HttpURLConnection c = (HttpURLConnection) url.openConnection();
-            c.setRequestMethod("GET");
-            c.setDoOutput(true);
-            c.connect();
-
-            File file = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-            file.mkdirs();
-            File outputFile = new File(file, "update.apk");
-            if(outputFile.exists()){
-                outputFile.delete();
-            }
-            FileOutputStream fos = new FileOutputStream(outputFile);
-
-            InputStream is = c.getInputStream();
-
-            byte[] buffer = new byte[1024];
-            int len1 = 0;
-            while ((len1 = is.read(buffer)) != -1) {
-                fos.write(buffer, 0, len1);
-            }
-            fos.close();
-            is.close();
-
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.fromFile(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)), "application/vnd.android.package-archive");
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // without this flag android returned a intent error!
-            context.startActivity(intent);
-
-
-        } catch (Exception e) {
-            Log.e("UpdateAPP", "Update error! " + e.getMessage());
-        }
-        return null;
-    }
-}

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

@@ -1,30 +1,35 @@
 package it.integry.integrywmsnative.core.update;
 
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.github.javiersantos.appupdater.AppUpdater;
 import com.github.javiersantos.appupdater.enums.Display;
 import com.github.javiersantos.appupdater.enums.UpdateFrom;
 
 import java.io.File;
 
-import it.integry.integrywmsnative.R;
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
 import it.integry.integrywmsnative.core.class_router.ClassRouter;
 import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.FileDownloader;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
+@Singleton
 public class UpdatesManager {
 
-    public static void init(Activity context) {
+    private AppCompatActivity mContext;
+
+    public void init(AppCompatActivity activityContext) {
+        this.mContext = activityContext;
+
         String suffix;
         ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
         try {
@@ -40,64 +45,67 @@ public class UpdatesManager {
         String currentDownloadUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release" + suffix + ".apk";
 
 
-        AppUpdater appUpdater = new AppUpdater(context)
+        AppUpdater appUpdater = new AppUpdater(mContext)
                 .setDisplay(Display.DIALOG)
                 .setUpdateFrom(UpdateFrom.JSON)
                 .setUpdateJSON(currentVersionUrl)
                 .setButtonDoNotShowAgain(null)
                 .setButtonUpdateClickListener((dialog, which) -> {
-                    installAPK(context, currentDownloadUrl);
+                    installAPK(currentDownloadUrl);
                 });
         appUpdater.start();
     }
 
 
-    private static void installAPK(Activity context, String downloadURL) {
+    private void installAPK(String downloadURL) {
+
         String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
-        String fileName = context.getResources().getString(R.string.app_name) + ".apk";
-        destination += fileName;
-        final Uri uri = Uri.parse("file://" + destination);
 
-        //Delete update file if exists
+        var progressDialog = DialogProgressView.newInstance("Download", null, false);
-        final File file = new File(destination);
+        progressDialog.show(mContext.getSupportFragmentManager(), "tag");
-        if (file.exists())
-            file.delete();
 
-        //set downloadmanager
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(downloadURL));
-        request.setDescription(context.getString(R.string.notification_update_download));
-        request.setTitle(context.getString(R.string.app_name));
 
-        //set destination
+        var fileDownloader = new FileDownloader()
-        request.setDestinationUri(uri);
+                .setDestFolder(destination)
+                .setUrlString(downloadURL)
+                .setOnProgressUpdate(progress -> {
+                    mContext.runOnUiThread(() -> {
+                        progressDialog.setProgress(progress);
+                    });
+                })
+                .setOnDownloadCompleted(destPath -> {
 
-        // get download service and enqueue file
+                    mContext.runOnUiThread(() -> {
-        final DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+                        progressDialog.dismiss();
-        manager.enqueue(request);
 
-        //set BroadcastReceiver to install app when .apk is downloaded
+                        Uri fileLoc;
-        BroadcastReceiver onComplete = new BroadcastReceiver() {
+                        Intent intent;
-            public void onReceive(Context ctxt, Intent i) {
 
-                Uri fileLoc;
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                Intent intent;
+                            intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+                            fileLoc = GenericFileProvider.getUriForFile(mContext,
+                                    mContext.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider",
+                                    new File(destPath));
+                        } else {
+                            intent = new Intent(Intent.ACTION_VIEW);
+                            fileLoc = Uri.fromFile(new File(destPath));
+                        }
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                        intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");
-                    intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+                        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    fileLoc = GenericFileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".core.update.GenericFileProvider", file);
-                } else {
-                    intent = new Intent(Intent.ACTION_VIEW);
-                    fileLoc = Uri.fromFile(file);
-                }
 
-                intent.setDataAndType(fileLoc, "application/vnd.android.package-archive");
+                        mContext.startActivity(intent);
-                intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    });
 
-                context.startActivity(intent);
+                });
+
+
+        new Thread(() -> {
+            try {
+                fileDownloader.download();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        };
+        }).start();
-
-        //register receiver for when .apk download is compete
-        context.registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
     }
 }

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

@@ -0,0 +1,113 @@
+package it.integry.integrywmsnative.core.utility;
+
+import android.webkit.URLUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class FileDownloader {
+
+    private String urlString;
+    private String destFolder;
+
+    private RunnableArgs<Integer> onProgressUpdate;
+    private RunnableArgs<String> onDownloadCompleted;
+
+
+    public void download() throws Exception {
+        InputStream input = null;
+        OutputStream output = null;
+        HttpURLConnection connection = null;
+        String destPathFile;
+
+        try {
+            File direct = new File(destFolder);
+            if (!direct.exists()) {
+                direct.mkdirs();
+            }
+
+            URL url = new URL(urlString);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.connect();
+            connection.setConnectTimeout(120 * 1000);
+
+            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
+                throw new Exception("Server returned HTTP " + connection.getResponseCode() + " " + connection.getResponseMessage());
+
+            input = connection.getInputStream();
+            int totalBytesToDownload = connection.getContentLength();
+            int downloadedBytes = 0;
+
+            String title = URLUtil.guessFileName(String.valueOf(url), null, null);
+
+            destPathFile = destFolder + title;
+
+            if (new File(destPathFile).exists())
+                new File(destPathFile).delete();
+
+            output = new FileOutputStream(destPathFile);
+
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = input.read(buf)) > 0) {
+                output.write(buf, 0, len);
+
+                downloadedBytes += len;
+                if (onProgressUpdate != null)
+                    onProgressUpdate.run((downloadedBytes * 100) / totalBytesToDownload);
+            }
+
+        } catch (Exception e) {
+            throw e;
+
+        } finally {
+            try {
+                if (output != null)
+                    output.close();
+                if (input != null)
+                    input.close();
+            } catch (IOException ignored) {
+            }
+            if (connection != null)
+                connection.disconnect();
+        }
+
+        if (onDownloadCompleted != null) onDownloadCompleted.run(destPathFile);
+    }
+
+
+    public String getUrlString() {
+        return urlString;
+    }
+
+    public FileDownloader setUrlString(String urlString) {
+        this.urlString = urlString;
+        return this;
+    }
+
+    public String getDestFolder() {
+        return destFolder;
+    }
+
+    public FileDownloader setDestFolder(String destFolder) {
+        this.destFolder = destFolder;
+        return this;
+    }
+
+    public FileDownloader setOnProgressUpdate(RunnableArgs<Integer> onProgressUpdate) {
+        this.onProgressUpdate = onProgressUpdate;
+        return this;
+    }
+
+    public FileDownloader setOnDownloadCompleted(RunnableArgs<String> onDownloadCompleted) {
+        this.onDownloadCompleted = onDownloadCompleted;
+        return this;
+    }
+}

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.utility;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.text.Html;
 
@@ -13,6 +12,7 @@ import com.orhanobut.logger.Logger;
 
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class UtilityExceptions {
@@ -21,9 +21,9 @@ public class UtilityExceptions {
 
     };
 
-    public static void defaultException(Context context, Exception ex, Dialog progressDialog) {
+    public static void defaultException(Context context, Exception ex, DialogProgressView progressDialog) {
         defaultException(context, ex);
-        if (progressDialog != null) progressDialog.dismiss();
+        if (progressDialog != null && progressDialog.isVisible()) progressDialog.dismiss();
     }
 
     public static void defaultException(Context context, Exception ex) {

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

@@ -8,7 +8,8 @@ public class UtilityFocus {
 
     public static void focusTextBox(Context context, EditText editTextToFocus) {
         editTextToFocus.requestFocus();
-
+        editTextToFocus.setSelectAllOnFocus(true);
+        editTextToFocus.selectAll();
         InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.showSoftInput(editTextToFocus, InputMethodManager.SHOW_IMPLICIT);
     }

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

@@ -1,7 +1,5 @@
 package it.integry.integrywmsnative.core.utility;
 
-import com.google.android.gms.common.internal.service.Common;
-
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;

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

@@ -31,10 +31,13 @@ public class UtilityPosizione {
     }
 
     public static MtbDepoPosizione getFromCache(String posizione) {
-        List<MtbDepoPosizione> tmpList = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
+        var availablePosizioni = SettingsManager.iDB().getAvailablePosizioni();
+        if(availablePosizioni == null) return null;
+
+        List<MtbDepoPosizione> tmpList = Stream.of(availablePosizioni)
                 .filter(x -> x.getPosizione().equalsIgnoreCase(posizione)).toList();
 
-        if(tmpList != null && tmpList.size() > 0) return tmpList.get(0);
+        if(tmpList.size() > 0) return tmpList.get(0);
         else return null;
     }
 

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

@@ -1,25 +1,21 @@
 package it.integry.integrywmsnative.core.utility;
 
-import android.app.Dialog;
+import androidx.appcompat.app.AppCompatActivity;
-import android.content.Context;
+import androidx.fragment.app.FragmentActivity;
 
-import it.integry.integrywmsnative.view.dialogs.DialogProgress;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class UtilityProgress {
 
-    public static Dialog createDefaultProgressDialog(Context mContext) {
+    public static DialogProgressView createDefaultProgressDialog(FragmentActivity mContext) {
-//        final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting),
+        var progress = DialogProgressView.newInstance();
-//                mContext.getText(R.string.loading) + " ...", true);
+        progress.show(mContext.getSupportFragmentManager(), "tag");
-//
-//        return progress;
-
-        Dialog progress = DialogProgress.make(mContext);
-        progress.show();
         return progress;
     }
-    public static Dialog createDefaultProgressDialog(Context mContext,String subtitle) {
+
-        Dialog progress = DialogProgress.make(mContext,subtitle);
+    public static DialogProgressView createDefaultProgressDialog(AppCompatActivity mContext, String title, String subtitle) {
-        progress.show();
+        DialogProgressView progress = DialogProgressView.newInstance(title, subtitle, true);
+        progress.show(mContext.getSupportFragmentManager(), "tag");
         return progress;
     }
 

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

@@ -41,6 +41,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -72,9 +73,9 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
-import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
 import it.integry.integrywmsnative.view.dialogs.versamento_automatico_ul_done.DialogVersamentoAutomaticoULDoneView;
 
 public class AccettazionePickingActivity extends BaseActivity implements AccettazionePickingViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
@@ -84,6 +85,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     @Inject
     AccettazionePickingViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private final AccettazionePickingFiltroOrdineViewModel mAppliedFilterViewModel = new AccettazionePickingFiltroOrdineViewModel();
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
@@ -140,9 +144,14 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         this.initFilters();
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+        boolean useQtaOrd = SettingsManager.iDB().isFlagAccettazioneUseQtaOrd();
 
         mViewModel.setListeners(this);
-        mViewModel.init(mOrders, mSitArts, codMdep);
+        mViewModel.init(
+                mOrders,
+                mSitArts,
+                codMdep,
+                useQtaOrd);
     }
 
     private void initFilters() {
@@ -346,7 +355,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private void initBarcodeReader() {
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanSuccessful(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
     }
 
@@ -791,9 +800,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
     @Override
-    public void onNoteAggiuntiveRequest(RunnableArgs<String> onComplete) {
+    public void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
         runOnUiThread(() -> {
-            NoteAggiuntiveLUDialog.make(this, onComplete).show();
+            InfoAggiuntiveLUDialog.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
         });
     }
 
@@ -832,8 +841,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .setCanLUBeClosed(true)
                 .setCanOverflowOrderQuantity(canOverflowQuantity);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -841,9 +851,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                             .setPartitaMag(resultDTO.getPartitaMag())
                             .setDataScad(resultDTO.getDataScad());
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
-                    this.mViewModel.resetMatchedRows();
                 })
+                .setOnAbort(() -> this.mViewModel.resetMatchedRows())
                 .show(getSupportFragmentManager(), "tag");
     }
 

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

@@ -34,6 +34,7 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
@@ -72,6 +73,7 @@ public class AccettazionePickingViewModel {
 
     private List<OrdineAccettazioneInevasoDTO> mOrders;
     private List<SitArtOrdDTO> mSitArts;
+    private boolean mUseQtaOrd;
     private final MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
 
     private MtbColt mCurrentMtbColt = null;
@@ -96,9 +98,10 @@ public class AccettazionePickingViewModel {
     }
 
 
-    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep) {
+    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep, boolean useQtaOrd) {
         this.mOrders = orders;
         this.mDefaultCodMdep = codMdep;
+        this.mUseQtaOrd = useQtaOrd;
 
         this.mSitArts = Stream.of(sitArts)
                 .filter(x -> UtilityBigDecimal.greaterThan(x.getNumCnfDaEvadere(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO))
@@ -314,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);
@@ -359,7 +363,7 @@ public class AccettazionePickingViewModel {
     }
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, boolean disablePrint, Runnable onComplete) {
-        this.sendOnNoteAggiuntiveRequest(additionalNotes -> {
+        this.sendOnInfoAggiuntiveRequest((additionalNotes, tCol) -> {
 
             this.mGestSetupRESTConsumer.getValue("PICKING", "SETUP", "DEFAULT_POSIZIONE_COLLI_ACCETTAZIONE", defaultPosAccettazioneDTO -> {
 
@@ -369,12 +373,16 @@ public class AccettazionePickingViewModel {
 
                 MtbColt mtbColt = new MtbColt();
                 mtbColt
-                        .initDefaultFields()
+                        .initDefaultFields(defaultGestioneOfUL)
-                        .setGestione(defaultGestioneOfUL)
                         .setAnnotazioni(additionalNotes)
                         .setPosizione(defaultPosAccettazione)
                         .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
+                if (tCol != null) {
+                    mtbColt.setCodTcol(tCol.getCodTcol());
+                    mtbColt.setMtbTCol(tCol);
+                }
+
                 if (customNumCollo != null) {
                     mtbColt.setNumCollo(customNumCollo);
                 }
@@ -530,7 +538,9 @@ public class AccettazionePickingViewModel {
             initialQtaTot = totalQtaOrd;
         }
 
-        if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
+        if (!this.mUseQtaOrd &&
+                UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) &&
+                UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
             initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
             initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
         }
@@ -896,8 +906,8 @@ public class AccettazionePickingViewModel {
         if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete);
     }
 
-    private void sendOnNoteAggiuntiveRequest(RunnableArgs<String> onComplete) {
+    private void sendOnInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete) {
-        if (this.mListener != null) this.mListener.onNoteAggiuntiveRequest(onComplete);
+        if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete);
     }
 
     private void sendError(Exception ex) {
@@ -990,7 +1000,7 @@ public class AccettazionePickingViewModel {
 
         void onVersamentoAutomaticoULRequest(RunnableArgs<Boolean> onComplete);
 
-        void onNoteAggiuntiveRequest(RunnableArgs<String> onComplete);
+        void onInfoAggiuntiveRequest(RunnableArgss<String, MtbTCol> onComplete);
 
         void onError(Exception ex);
 

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

@@ -0,0 +1,85 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+
+public class DialogChooseRowFromListaDocRowsListModel {
+
+    private String codMart;
+    private String descrizione;
+    private String qtaOrdReadable;
+    private String barcode;
+    private boolean isNew;
+    private SqlMtbColr originalModel;
+    private BindableBoolean checked = new BindableBoolean(false);
+
+    public DialogChooseRowFromListaDocRowsListModel() {
+    }
+
+    public BindableBoolean getChecked() {
+        return checked;
+    }
+
+    public DialogChooseRowFromListaDocRowsListModel setChecked(BindableBoolean checked) {
+        this.checked = checked;
+        return this;
+    }
+
+    public void toggleCheck() {
+        this.checked.set(!this.checked.get());
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public DialogChooseRowFromListaDocRowsListModel setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public DialogChooseRowFromListaDocRowsListModel setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public String getQtaOrdReadable() {
+        return qtaOrdReadable;
+    }
+
+    public DialogChooseRowFromListaDocRowsListModel setQtaOrdReadable(String qtaOrdReadable) {
+        this.qtaOrdReadable = qtaOrdReadable;
+        return this;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public DialogChooseRowFromListaDocRowsListModel setBarcode(String barcode) {
+        this.barcode = barcode;
+        return this;
+    }
+
+    public boolean isNew() {
+        return isNew;
+    }
+
+    public DialogChooseRowFromListaDocRowsListModel setNew(boolean aNew) {
+        isNew = aNew;
+        return this;
+    }
+
+    public SqlMtbColr getOriginalModel() {
+        return originalModel;
+    }
+
+    public DialogChooseRowFromListaDocRowsListModel setOriginalModel(SqlMtbColr originalModel) {
+        this.originalModel = originalModel;
+        return this;
+    }
+}

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

@@ -14,6 +14,7 @@ public class GrigliaAcquistiChildDTO {
     public String flagQtaMultipla;
     public String flagTracciabilita;
     public BigDecimal qtaMinOrdinabile;
+    public boolean newNoPromo;
     private int ggScadenza;
     private float giacenza;
     private float qtaPrevistaVendita;
@@ -144,4 +145,13 @@ public class GrigliaAcquistiChildDTO {
         this.qtaProposta = qtaProposta;
         return this;
     }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public GrigliaAcquistiChildDTO setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+        return this;
+    }
 }

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

@@ -39,6 +39,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.ActivityContabDocInterniEditBinding;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiChildDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui.DocumentRowsListAdapter;
 import it.integry.integrywmsnative.ui.FabMenuCustomAnimations;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView;
@@ -54,9 +55,13 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     @Inject
     MtbColrRepository documentRowsRepository;
+
     @Inject
     DocInterniEditFormViewModel viewModel;
 
+    @Inject
+    DialogInputQuantityV2View dialogInputQuantityV2View;
+
 
     private int mBarcodeScannerIstanceID;
     private ActivityContabDocInterniEditBinding binding;
@@ -133,6 +138,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     }
 
     private void initViewModel(SqlMtbColt document, List<GrigliaAcquistiChildDTO> productList) {
+        this.viewModel.init();
         this.viewModel.setListeners(this);
         this.viewModel.setDocument(document);
         this.viewModel.setProductsList(productList);
@@ -184,7 +190,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         }
 
         mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(this.viewModel::processBarcode)
+                .setOnScanSuccessful(this.viewModel::processBarcode)
                 .setOnScanFailed(this::onError));
         this.viewModel.fetchDocumentRows();
     }
@@ -209,6 +215,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     @Override
     public void onEditRowRequest(SqlMtbColr row, boolean flagTracciabilita) {
+        this.onLoadingStarted();
         MtbAart mtbAart = new MtbAart();
         mtbAart.setBarCode(row.getCodBarre());
         mtbAart.setDiacod(row.getCodBarre());
@@ -242,12 +249,12 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                     }
                     return partitaMag;
                 });
-
+        dialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
-        DialogInputQuantityV2View
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
                     this.onLoadingStarted();
                     this.viewModel.saveRow(row, resultDTO);
-                }, this::onLoadingEnded)
+                })
+                .setOnAbort(this::onLoadingEnded)
                 .show(getSupportFragmentManager(), "tag");
     }
 
@@ -280,6 +287,16 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         this.viewModel.deleteRow(entityToSql(mtbColr));
     }
 
+    @Override
+    public void onMultipleRowsFound(List<SqlMtbColr> rows, GrigliaAcquistiChildDTO articolo) {
+        DialogSelectDocRowsView.newInstance(rows, (row) -> {
+                    this.onLoadingEnded();
+                    if (row != null) {
+                        this.viewModel.editRow(row, (articolo.getFlagTracciabilita().equalsIgnoreCase("S")));
+                    }
+                }
+        ).show(this.getSupportFragmentManager(), "dialogSelectDocRows");
+    }
 
     private MtbColr sqlToEntity(SqlMtbColr sqlMtbColr) {
         MtbColr entity = new MtbColr();

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

@@ -4,6 +4,10 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
 
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,6 +20,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ColloDTO;
@@ -33,7 +38,8 @@ public class DocInterniEditFormViewModel {
     private final DocInterniRESTConsumer docInterniRESTConsumer;
     private DocInterniEditFormViewModel.Listener listener;
     private List<GrigliaAcquistiChildDTO> productsList;
-
+    private boolean isCheckPartitaMag = false;
+    private JSONObject checkFornitoreRules = null;
     public MutableLiveData<SqlMtbColt> document = new MutableLiveData<>();
     public MutableLiveData<List<SqlMtbColr>> docRows = new MutableLiveData<>();
 
@@ -45,6 +51,16 @@ public class DocInterniEditFormViewModel {
         this.docRows.setValue(new ArrayList<>());
     }
 
+    public void init() {
+        try {
+            var docInterniCheckFornitore = SettingsManager.iDB().getDocInterniCheckFornitore();
+            this.checkFornitoreRules = docInterniCheckFornitore != null ? new JSONObject(docInterniCheckFornitore) : null;
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+
     private void sendOnLoadingStarted() {
         if (this.listener != null) listener.onLoadingStarted();
     }
@@ -68,8 +84,8 @@ public class DocInterniEditFormViewModel {
 
     }
 
-    public void editRow(SqlMtbColr row,boolean flagTracciabilita) {
+    public void editRow(SqlMtbColr row, boolean flagTracciabilita) {
-        this.listener.onEditRowRequest(row,flagTracciabilita);
+        this.listener.onEditRowRequest(row, flagTracciabilita && this.isCheckPartitaMag);
     }
 
     private Integer getNextIdRiga() {
@@ -91,7 +107,8 @@ public class DocInterniEditFormViewModel {
             }, this::sendError);
         }, this::sendError);
     }
-public void deleteDocument() {
+
+    public void deleteDocument() {
         this.sendOnLoadingStarted();
         docInterniRESTConsumer.saveDoc(this.getSaveDto(), obj -> {
             SqlMtbColt document = this.getDocument();
@@ -108,47 +125,55 @@ public void deleteDocument() {
     }
 
     public void onSearch(String search) {
-        this.sendOnLoadingStarted();
         GrigliaAcquistiChildDTO articolo = this.searchArticolo(search);
         if (articolo == null) {
             this.sendError(new Exception("Nessun articolo corrispondente al codice fornito!"));
-            this.sendOnLoadingEnded();
             return;
         }
-        SqlMtbColr row = this.getRowForArticolo(articolo);
+        List<SqlMtbColr> rows = this.getRowsForArticolo(articolo);
-        this.sendOnLoadingEnded();
+        if (rows.isEmpty()) {
-        this.editRow(row,articolo.getFlagTracciabilita().equalsIgnoreCase("S"));
+            this.sendError(new Exception("Nessun articolo corrispondente al codice fornito!"));
+        }
+        if (rows.size() > 1) {
+            this.listener.onMultipleRowsFound(rows, articolo);
+        } else {
+            this.editRow(rows.get(0), (articolo.getFlagTracciabilita().equalsIgnoreCase("S")));
+        }
 
     }
 
-    private SqlMtbColr getRowForArticolo(GrigliaAcquistiChildDTO articolo) {
+    private List<SqlMtbColr> getRowsForArticolo(GrigliaAcquistiChildDTO articolo) {
         List<SqlMtbColr> docRows = this.docRows.getValue();
         if (docRows == null) {
             docRows = new ArrayList<>();
         }
         SqlMtbColt document = this.document.getValue();
-        SqlMtbColr row = Stream.of(docRows).filter(docRow -> docRow.getCodMart().equalsIgnoreCase(articolo.getCodMart())).findFirstOrElse(null);
+        SqlMtbColr row = new SqlMtbColr();
-        if (row == null) {
+        row.setIdCollo(document.getId());
-            row = new SqlMtbColr();
+        row.setRiga(getNextIdRiga());
-            row.setIdCollo(document.getId());
+        row.setCodMart(articolo.getCodMart());
-            row.setRiga(getNextIdRiga());
+        row.setSerCollo(document.getSerCollo());
-            row.setCodMart(articolo.getCodMart());
+        row.setGestione(document.getGestione());
-            row.setSerCollo(document.getSerCollo());
+        row.setNumCollo(document.getNumCollo());
-            row.setGestione(document.getGestione());
+        row.setDataCollo(document.getDataCollo());
-            row.setNumCollo(document.getNumCollo());
+        row.setDescrizione(articolo.getDescrizione());
-            row.setDataCollo(document.getDataCollo());
+        row.setUntMis(articolo.getUntMis());
-            row.setDescrizione(articolo.getDescrizione());
+        row.setCodBarre(articolo.getBarcode());
-            row.setUntMis(articolo.getUntMis());
+        row.setQtaCnf(articolo.getQtaCnf().floatValue());
-            row.setCodBarre(articolo.getBarcode());
+        row.setNumCnf(0f);
-            row.setQtaCnf(articolo.getQtaCnf().floatValue());
+        row.setQtaCol(0f);
-            row.setNumCnf(0f);
+        List<SqlMtbColr> rows = Stream.of(docRows).filter(docRow -> docRow.getCodMart().equalsIgnoreCase(articolo.getCodMart())).toList();
-            row.setQtaCol(0f);
+        rows.add(row);
-        }
+        return rows;
-        return row;
     }
 
     private GrigliaAcquistiChildDTO searchArticolo(String filter) {
-        return Stream.of(this.productsList).filter(dto -> filter.equalsIgnoreCase(dto.getCodMart()) || filter.equalsIgnoreCase(dto.getBarcode())).findFirstOrElse(null);
+        return Stream.of(this.productsList).filter(dto ->
+                filter.equalsIgnoreCase(dto.getCodMart())
+                        || filter.equalsIgnoreCase(dto.getBarcode())
+                        || StringUtils.leftPad(filter, 13, '0').equalsIgnoreCase(dto.getCodMart())
+                        || StringUtils.leftPad(filter, 13, '0').equalsIgnoreCase(dto.getBarcode())
+        ).findFirstOrElse(null);
     }
 
     private SaveDTO getSaveDto() {
@@ -200,6 +225,26 @@ public void deleteDocument() {
 
     public void setDocument(SqlMtbColt document) {
         this.document.setValue(document);
+        this.initCheckFornitore();
+    }
+
+    private void initCheckFornitore() {
+        SqlMtbColt doc = this.document.getValue();
+        boolean isCheckPartitaMag = false;
+        if (doc != null && this.checkFornitoreRules != null) {
+            String key = doc.getCodAnag();
+            if (doc.getCodVdes() != null && !doc.getCodVdes().isEmpty()) {
+                key += "-" + doc.getCodVdes();
+            }
+            try {
+                if (this.checkFornitoreRules.has(key) && ((String) ((JSONObject) this.checkFornitoreRules.get(key)).get(doc.getCodDtipProvv())).equalsIgnoreCase("check-partitaMag")) {
+                    isCheckPartitaMag = true;
+                }
+            } catch (Exception ignored) {
+            }
+
+        }
+        this.isCheckPartitaMag = isCheckPartitaMag;
     }
 
     public SqlMtbColt getDocument() {
@@ -251,7 +296,7 @@ public void deleteDocument() {
     }
 
     public GrigliaAcquistiChildDTO getArticoloByCodMart(String codMart) {
-        return Stream.of(productsList).filter(prod->prod.codMart.equalsIgnoreCase(codMart)).findFirstOrElse(null);
+        return Stream.of(productsList).filter(prod -> prod.codMart.equalsIgnoreCase(codMart)).findFirstOrElse(null);
     }
 
     public interface Listener extends ILoadingListener {
@@ -260,7 +305,9 @@ public void deleteDocument() {
 
         void onRowsChanged(List<SqlMtbColr> rows);
 
-        void onEditRowRequest(SqlMtbColr row,boolean flagTracciabilita);
+        void onEditRowRequest(SqlMtbColr row, boolean flagTracciabilita);
+
+        void onMultipleRowsFound(List<SqlMtbColr> rows, GrigliaAcquistiChildDTO articolo);
 
         void onDocumentHoldRequest();
 

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectDocRows/DialogSelectDocRowsComponent.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogSelectDocRowsComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogSelectDocRowsComponent create();
+    }
+
+
+    void inject(DialogSelectDocRowsView dialogSelectDocInfoView);
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectDocRows/DialogSelectDocRowsModule.java

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows;
+
+import dagger.Module;
+
+@Module(subcomponents = DialogSelectDocRowsComponent.class)
+public class DialogSelectDocRowsModule {
+
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/dialog/selectDocRows/DialogSelectDocRowsView.java

@@ -0,0 +1,143 @@
+package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows;
+
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.databinding.DialogChooseRowFromListaDocRowsLayoutBinding;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DialogChooseRowFromListaDocRowsListModel;
+import kotlin.Unit;
+
+public class DialogSelectDocRowsView extends BaseDialogFragment {
+
+    private final RunnableArgs<SqlMtbColr> onRowSelected;
+    private final List<SqlMtbColr> listArts;
+    private final MutableLiveData<List<DialogChooseRowFromListaDocRowsListModel>> listModels = new MutableLiveData<>();
+    private DialogChooseRowFromListaDocRowsLayoutBinding binding;
+    public MutableLiveData<SqlMtbColr> selectedRow = new MutableLiveData<>();
+
+    public static DialogSelectDocRowsView newInstance(
+            List<SqlMtbColr> listArts,
+            RunnableArgs<SqlMtbColr> onDismiss
+    ) {
+        return new DialogSelectDocRowsView(listArts, onDismiss);
+    }
+
+
+    private DialogSelectDocRowsView(List<SqlMtbColr> listArts, RunnableArgs<SqlMtbColr> onDismiss) {
+        super();
+        this.onRowSelected = onDismiss;
+        this.listArts = listArts;
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onRowSelected != null) onRowSelected.run(this.selectedRow.getValue());
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = DataBindingUtil.inflate(inflater, R.layout.dialog_choose_row_from_lista_doc_rows_layout, container, false);
+        binding.setLifecycleOwner(this);
+        MainApplication
+                .appComponent
+                .dialogSelectDocRowsComponent()
+                .create()
+                .inject(this);
+        binding.setView(this);
+
+        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        initView();
+        this.refreshList();
+
+
+        binding.positiveButton.setOnClickListener(view -> {
+            getDialog().dismiss();
+        });
+
+        binding.negativeButton.setOnClickListener(view -> {
+            this.selectedRow.setValue(null);
+            getDialog().dismiss();
+        });
+
+
+        this.onLoadingEnded();
+        return binding.getRoot();
+    }
+
+    private void refreshList() {
+        var list = Stream.of(this.listArts).map(row -> {
+            DialogChooseRowFromListaDocRowsListModel model = new DialogChooseRowFromListaDocRowsListModel();
+            model.setCodMart(row.getCodMart());
+            model.setBarcode(row.getCodMart());
+            model.setOriginalModel(row);
+            model.setNew(row.getId() < 1);
+            model.setDescrizione(row.getDescrizione());
+            model.setQtaOrdReadable(row.getQtaCol() + "\n" + row.getUntMis());
+            model.getChecked().addOnPropertyChangedCallback(() -> {
+                this.checkRow(row, model.getChecked().get());
+            });
+            return model;
+        }).toList();
+        this.listModels.postValue(list);
+
+    }
+
+    private void checkRow(SqlMtbColr row, boolean checked) {
+        if (checked) {
+            this.selectedRow.setValue(row);
+            var models = this.listModels.getValue();
+            if (models != null && !models.isEmpty()) {
+                Stream.of(models).filter(model -> model.getOriginalModel().getId() != row.getId()).forEach(model -> {
+                    model.getChecked().set(false);
+                });
+            }
+        } else {
+            var selectedRow = this.selectedRow.getValue();
+            if (selectedRow != null && selectedRow.getId() == row.getId()) {
+                this.selectedRow.setValue(null);
+            }
+        }
+    }
+
+    private void initView() {
+        initArrayAdapters();
+    }
+
+    private void initArrayAdapters() {
+
+        new LiveAdapter(listModels, getViewLifecycleOwner(), BR.row)
+                .map(DialogChooseRowFromListaDocRowsListModel.class, R.layout.dialog_choose_row_from_lista_doc_rows__item_model)
+                .onNoData(noData -> {
+                            binding.emptyView.setVisibility(noData ? View.VISIBLE : View.GONE);
+                            return Unit.INSTANCE;
+                        }
+                ).into(binding.listaDocRows);
+
+    }
+
+}

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);
-                    this.sendError(new ServerNotReachableException(host, port, null));
-                }
-
-            });
         }, ex -> {
             this.sendError(new InvalidServerCodAziendaException(codAzienda, ex));
         });

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

@@ -67,6 +67,9 @@ public class MainActivity extends BaseActivity
     @Inject
     MainContext mainContext;
 
+    @Inject
+    UpdatesManager updatesManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -79,7 +82,7 @@ public class MainActivity extends BaseActivity
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
-        UpdatesManager.init(this);
+        updatesManager.init(this);
         UtilityContext.initMainActivity(this);
 
         setSupportActionBar(mBinding.appBarMain.toolbar);

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

@@ -138,6 +138,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
 
         mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main_ordini_uscita, container, false);
 
@@ -236,7 +237,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
     private void initBarcodeReader() {
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanSuccessful(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(getActivity(), ex, false)));
 
         BarcodeManager.enable();
@@ -696,34 +697,34 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     };
 
     private void refreshList(List<OrdiniUscitaElencoDTO> filteredList) {
-        this.onLoadingStarted();
 
-        //new Thread(() -> {
+//        new Thread(() -> {
 
-        requireActivity().runOnUiThread(() -> {
+//        requireActivity().runOnUiThread(() -> {
-            List<OrdiniUscitaElencoDTO> tmpList;
+//        this.onLoadingStarted();
+        List<OrdiniUscitaElencoDTO> tmpList;
 
-            if (filteredList != null) {
+        if (filteredList != null) {
-                tmpList = filteredList;
+            tmpList = filteredList;
-            } else if (mAppliedFilterViewModel != null) {
+        } else if (mAppliedFilterViewModel != null) {
-                mAppliedFilterViewModel.applyAllTests();
+            mAppliedFilterViewModel.applyAllTests();
-                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-            } else {
+        } else {
-                tmpList = mViewModel.getOrderList().getValue();
+            tmpList = mViewModel.getOrderList().getValue();
-            }
+        }
 
-            var list = convertDataModelToListModel(tmpList);
+        var list = convertDataModelToListModel(tmpList);
 
-            this.mOrdiniInevasiMutableData.clear();
+        this.mOrdiniInevasiMutableData.clear();
-            this.mOrdiniInevasiMutableData.addAll(list);
+        this.mOrdiniInevasiMutableData.addAll(list);
 
-            fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
+        fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
-                    .anyMatch(y -> y.getSelectedObservable().get()));
+                .anyMatch(y -> y.getSelectedObservable().get()));
 
-            this.onLoadingEnded();
+//        this.onLoadingEnded();
-        });
+//        });
 
-        //}).start();
+//        }).start();
 
     }
 

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

@@ -104,7 +104,7 @@ public class OrdiniUscitaElencoViewModel {
                 .distinct()
                 .toList();
 
-        if (foundGestioni != null && foundGestioni.size() > 1) {
+        if (foundGestioni.size() > 1) {
             this.sendError(new InvalidLUMultiGestioneException());
             return;
         }
@@ -116,7 +116,7 @@ public class OrdiniUscitaElencoViewModel {
                 .distinct()
                 .toList();
 
-        if (foundCodMdep != null && foundCodMdep.size() > 1) {
+        if (foundCodMdep.size() > 1) {
             this.sendError(new InvalidLUMultiCodMdepException());
             return;
         }
@@ -128,9 +128,9 @@ public class OrdiniUscitaElencoViewModel {
                 .map(x -> (OrdineUscitaInevasoDTO) x)
                 .toList();
 
-        this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrdersBase, sitArts -> {
+        this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(mCurrentCodMdep, selectedOrdersBase, sitArts -> {
 
-            if(mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) {
+            if (mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) {
                 sitArts = Stream.of(sitArts)
                         .filter(x -> Stream.of(mtbGrupToFilter).map(MtbGrup::getCodMgrp).anyMatch(y -> y.equalsIgnoreCase(x.getCodMgrp())))
                         .toList();

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

@@ -69,6 +69,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     @Inject
     PickingLiberoViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     public BindableBoolean thereIsAnOpenedUL = new BindableBoolean(false);
     public BindableBoolean thereIsntAnOpenedUL = new BindableBoolean(true);
     public BindableBoolean thereIsAnyRowInUL = new BindableBoolean(false);
@@ -153,8 +156,10 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     private void initBarcodeReader() {
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanSuccessful(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(getActivity(), ex, false)));
+
+        BarcodeManager.enable();
     }
 
     private void initBottomSheet() {
@@ -199,10 +204,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     };
 
     public void createNewLU() {
-        this.onLoadingStarted();
-
         this.mViewModel.createNewLU(null, null, () -> {
-            this.onLoadingEnded();
         });
     }
 
@@ -227,7 +229,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     @Override
     public void onLUOpened(MtbColt mtbColt) {
-        getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             mToolbarTitleText.setText(String.format(getActivity().getText(R.string.lu_number_text).toString(), mtbColt.getNumCollo()));
 
             initAdapter();
@@ -248,7 +250,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     @Override
     public void onLUClosed() {
-        getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             mToolbarTitleText.setText(getActivity().getText(R.string.free_picking_title_fragment).toString());
             destroyAdapter();
 
@@ -289,9 +291,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     }
 
     @Override
-    public void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
+    public void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         DialogChooseArtsFromListaArts
-                .newInstance(mtbColrsToPick, onComplete, () -> {
+                .newInstance(mtbColrsToPick, mtbAart, onComplete, () -> {
                     onAbort.run();
                     BarcodeManager.enable();
                 })
@@ -335,8 +337,8 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(canLUBeClosed);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -346,15 +348,14 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
                     this.openProgress();
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
-                    this.closeProgress();
                 })
-                .show(getActivity().getSupportFragmentManager(), "tag");
+                .setOnAbort(this::closeProgress)
+                .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onRowSaved() {
-        getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
         });
     }

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

@@ -99,6 +99,7 @@ public class PickingLiberoViewModel {
         } else if (UtilityBarcode.isEtichettaPosizione(barcodeScanDTO)) {
             //Cerco tramite etichetta un collo in posizione mono ul
             this.executeEtichettaPosizione(barcodeScanDTO, onComplete);
+
         } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
             //Cerco tramite etichetta ean 128 (che può indicarmi una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
@@ -134,7 +135,7 @@ public class PickingLiberoViewModel {
                 }
             } else if (mtbColtList.size() == 1) {
                 this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
-                    pickMerceULtoUL(mtbColt, onComplete);
+                    pickMerceULtoUL(mtbColt, articolo, onComplete);
                 }, this::sendError);
             } else {
                 this.sendError(new TooManyLUFoundInMonoLUPositionException());
@@ -204,19 +205,23 @@ 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);
                 MtbDepoPosizione posizione = UtilityPosizione.getFromCache(articolo.getPosizione());
+
                 if (posizione != null && posizione.isFlagMonoCollo()) {
                     this.executePosizione(posizione, articolo, onComplete);
-                } else {
+                } else if(mDefaultGestione == GestioneEnum.VENDITA){
                     this.dispatchArt(articolo, ean128Model);
                     onComplete.run();
+                } else {
+                    this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
                 }
 
             } else {
-                this.sendError(new NoResultFromBarcodeException());
+                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
             }
 
         }, this::sendError);
@@ -225,7 +230,6 @@ public class PickingLiberoViewModel {
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
         if (this.mFlagAskCliente) {
-            this.sendOnLoadingEnded();
             this.sendLUClienteRequired((vtbDest, codJcom) -> {
                 createNewLU_PostClienteAsk(customNumCollo, customSerCollo, vtbDest, codJcom, onComplete);
             }, () -> {
@@ -240,10 +244,9 @@ public class PickingLiberoViewModel {
         this.sendOnLoadingStarted();
 
         MtbColt mtbColt = new MtbColt();
-        mtbColt.initDefaultFields();
+        mtbColt.initDefaultFields(mDefaultGestione)
-        mtbColt.setGestione(mDefaultGestione)
                 .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE ? "PICKING LIBERO" : null)
-                .setCodAnag(SettingsManager.iDB().getProduzioneDefaultCodAnag())
+//                .setCodAnag(SettingsManager.iDB().getProduzioneDefaultCodAnag())
                 .setSegno(-1)
                 .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
@@ -272,6 +275,8 @@ public class PickingLiberoViewModel {
 
             this.mCurrentMtbColt = mtbColt;
 
+            this.sendOnLoadingEnded();
+
             if (onComplete != null) onComplete.run();
             this.sendLUOpened(mtbColt);
         }, this::sendError);
@@ -382,13 +387,16 @@ public class PickingLiberoViewModel {
                 });
     }
 
-
     private void pickMerceULtoUL(MtbColt sourceMtbColt, Runnable onComplete) {
+        pickMerceULtoUL(sourceMtbColt, null, onComplete);
+    }
+
+    private void pickMerceULtoUL(MtbColt sourceMtbColt, MtbAart mtbAart, Runnable onComplete) {
         List<MtbColr> mtbColrsToPick = Stream.of(sourceMtbColt.getMtbColr())
                 .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaCol(), BigDecimal.ZERO))
                 .toList();
 
-        this.sendArtSelectionRequest(mtbColrsToPick, pickedAarts -> {
+        this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> {
             List<MtbColr> destNewMtbColr = new ArrayList<>();
 
             if (pickedAarts.size() > 0) {
@@ -809,9 +817,9 @@ public class PickingLiberoViewModel {
         if (this.mListener != null) mListener.onLUClienteRequired(onComplete, onAbort);
     }
 
-    private void sendArtSelectionRequest(List<MtbColr> mtbColrsToPick, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
+    private void sendArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         if (this.mListener != null)
-            mListener.onArtSelectionRequest(mtbColrsToPick, onComplete, onAbort);
+            mListener.onArtSelectionRequest(mtbColrsToPick, mtbAart, onComplete, onAbort);
     }
 
     private void sendOnItemDispatched(PickingObjectDTO pickingObjectDTO,
@@ -865,7 +873,7 @@ public class PickingLiberoViewModel {
 
         void onLUClienteRequired(RunnableArgss<VtbDest, String> onComplete, Runnable onAbort);
 
-        void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort);
+        void onArtSelectionRequest(List<MtbColr> mtbColrsToPick, MtbAart mtbAart, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort);
 
         void onItemDispatched(PickingObjectDTO pickingObjectDTO,
                               MtbAart mtbAart,

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

@@ -33,6 +33,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
@@ -42,18 +43,18 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.core.utility.UtilityToast;
 import it.integry.integrywmsnative.databinding.ActivityPickingResiBinding;
+import it.integry.integrywmsnative.gest.picking_resi.rest.WithdrawableDtbDocr;
 import it.integry.integrywmsnative.gest.picking_resi.ui.PickingResiListAdapter;
 import it.integry.integrywmsnative.gest.picking_resi.ui.PickingResiListModel;
-import it.integry.integrywmsnative.gest.picking_resi.rest.WithdrawableDtbDocr;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
-import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
 
 public class PickingResiActivity extends BaseActivity implements BottomSheetFragmentLUContentView.Listener, BottomSheetFragmentLUContentViewModel.Listener, PickingResiViewModel.Listener {
 
@@ -63,6 +64,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     @Inject
     PickingResiViewModel mViewmodel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
     private ObservableArrayList<PickingResiListModel> mPickingResiMutableData = new ObservableArrayList<>();
@@ -163,7 +167,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
     private void initBarcodeReader() {
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanSuccessful(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
     }
 
@@ -276,15 +280,15 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     }
 
     @Override
-    public void onNoteAggiuntiveRequired(RunnableArgs<String> onComplete) {
+    public void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
-        NoteAggiuntiveLUDialog.make(this, onComplete).show();
+        InfoAggiuntiveLUDialog.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
     }
 
     @Override
     public void onError(Exception ex) {
         this.closeProgress();
 
-        if(ex instanceof InvalidPesoKGException) {
+        if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
             UtilityExceptions.defaultException(this, ex, mCurrentProgress);
@@ -318,8 +322,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
                 .setCanLUBeClosed(false)
                 .setCanPartitaMagBeChanged(false);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -329,7 +334,8 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
                     this.openProgress();
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
+                })
+                .setOnAbort(() -> {
                     this.mViewmodel.resetMatchedRows();
                 })
                 .show(getSupportFragmentManager(), "tag");
@@ -401,7 +407,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
                 null,
                 R.string.button_ignore_print,
                 onComplete)
-            .show(getSupportFragmentManager(), "tag");
+                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override

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

@@ -28,7 +28,9 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.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;
@@ -124,8 +126,7 @@ public class PickingResiViewModel {
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
         MtbColt mtbColt = new MtbColt();
-        mtbColt.initDefaultFields();
+        mtbColt.initDefaultFields(GestioneEnum.fromString(mDefaultGestioneOfLU))
-        mtbColt.setGestione(mDefaultGestioneOfLU)
                 .setSegno(mDefaultSegnoOfLU)
                 .setCodAnag(mDefaultCodAnagOfLU)
                 .setCodMdep(mDefaultCodMdepOfLU)
@@ -161,11 +162,16 @@ public class PickingResiViewModel {
                     this.sendOnLoadingEnded();
                 });
             } else {
-                this.sendOnNoteAggiuntiveRequired(noteAggiuntive -> {
+                this.sendOnInfoAggiuntiveRequired((noteAggiuntive, tCol) -> {
 
                     if (!UtilityString.isNullOrEmpty(noteAggiuntive)) {
                         this.mCurrentMtbColt.setAnnotazioni(noteAggiuntive);
                     }
+                    if (tCol != null) {
+                        this.mCurrentMtbColt.setCodTcol(tCol.getCodTcol());
+                        this.mCurrentMtbColt.setMtbTCol(tCol);
+
+                    }
 
                     this.mColliMagazzinoRESTConsumer.updateDataFine(mCurrentMtbColt, () -> {
 
@@ -717,8 +723,8 @@ public class PickingResiViewModel {
         return mPickingList;
     }
 
-    private void sendOnNoteAggiuntiveRequired(RunnableArgs<String> onComplete) {
+    private void sendOnInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete) {
-        if (this.mListener != null) this.mListener.onNoteAggiuntiveRequired(onComplete);
+        if (this.mListener != null) this.mListener.onInfoAggiuntiveRequired(onComplete);
     }
 
     private void sendOnLoadingStarted() {
@@ -795,7 +801,7 @@ public class PickingResiViewModel {
 
     public interface Listener extends ILUPrintListener, ILoadingListener, ILUBaseOperationsListener {
 
-        void onNoteAggiuntiveRequired(RunnableArgs<String> onComplete);
+        void onInfoAggiuntiveRequired(RunnableArgss<String, MtbTCol> onComplete);
 
         void onError(Exception ex);
 

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

@@ -53,6 +53,9 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     @Inject
     ProdRecuperoMaterialeViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private FragmentProdRecuperoMaterialeBinding mBinding;
 
     private int barcodeScannerIstanceID = -1;
@@ -106,7 +109,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
 
     private void initBarcodeReader() {
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanSuccessful(onScanSuccessful)
                 .setOnScanFailed(this::onError));
 
         BarcodeManager.enable();
@@ -200,8 +203,9 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                 .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
                 .setCanLUBeClosed(canLUBeClosed);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -210,7 +214,8 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                             .setDataScad(resultDTO.getDataScad());
 
                     this.mViewModel.onItemDispatched(item, pickedQuantityDTO, sourceMtbColt);
-                }, this::onLoadingEnded)
+                })
+                .setOnAbort(this::onLoadingEnded)
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java

@@ -80,7 +80,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                 }.getType();
                 systemRESTConsumer.<List<MtbColt>>processSql(mtbColtSql, mtbColtTypeOfObjectsList, mtbColtList -> {
 
-                    if(mtbColtList == null) mtbColtList = new ArrayList<>();
+                    if (mtbColtList == null) mtbColtList = new ArrayList<>();
 
                     for (MtbColt mtbColt : mtbColtList) {
 
@@ -108,23 +108,21 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-
-
     public void importColloDaProduzione(ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         ProdRientroMerceOrderDetailRESTConsumerService service = RESTBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
-        service.importColloDaProduzione(importColliDaProduzioneRequestDTO).enqueue(new Callback<ServiceRESTResponse<MtbColt>>() {
+        service.importColloDaProduzione(importColliDaProduzioneRequestDTO).enqueue(new Callback<ServiceRESTResponse<List<MtbColt>>>() {
             @Override
-            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
+            public void onResponse(Call<ServiceRESTResponse<List<MtbColt>>> call, Response<ServiceRESTResponse<List<MtbColt>>> response) {
                 analyzeAnswer(response, "importColliDaProduzione", mtbColt -> {
-                    onComplete.run(mtbColt);
+                    onComplete.run(mtbColt.get(0));
                 }, ex -> {
-                    if(onFailed != null) onFailed.run(ex);
+                    if (onFailed != null) onFailed.run(ex);
                 });
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
+            public void onFailure(Call<ServiceRESTResponse<List<MtbColt>>> call, Throwable t) {
                 Logger.e(t, "importColliDaProduzione");
                 onFailed.run(new Exception(t));
             }
@@ -140,7 +138,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
                 analyzeAnswer(response, "deleteColloDaProduzione", mtbColt -> {
                     onComplete.run();
                 }, ex -> {
-                    if(onFailed != null) onFailed.run(ex);
+                    if (onFailed != null) onFailed.run(ex);
                 });
             }
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumerService.java

@@ -13,10 +13,10 @@ public interface ProdRientroMerceOrderDetailRESTConsumerService {
 
 
     @POST("importColliDaProduzioneJson")
-    Call<ServiceRESTResponse<MtbColt>> importColliDaProduzione(@Body List<ImportColliDaProduzioneRequestDTO> importColliDaProduzioneRequestDTO);
+    Call<ServiceRESTResponse<List<MtbColt>>> importColliDaProduzione(@Body List<ImportColliDaProduzioneRequestDTO> importColliDaProduzioneRequestDTO);
 
     @POST("importColloDaProduzioneJson")
-    Call<ServiceRESTResponse<MtbColt>> importColloDaProduzione(@Body ImportColliDaProduzioneRequestDTO importColloDaProduzioneRequestDTO);
+    Call<ServiceRESTResponse<List<MtbColt>>> importColloDaProduzione(@Body ImportColliDaProduzioneRequestDTO importColloDaProduzioneRequestDTO);
 
     @POST("cancellaColloDaProduzione")
     Call<ServiceRESTResponse<Object>> deleteColloDaProduzione(@Body MtbColt mtbColtToDelete);

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

@@ -10,62 +10,53 @@ import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import java.util.ArrayList;
+import com.ravikoradiya.liveadapter.LiveAdapter;
-import java.util.List;
+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;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
-import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
-import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
-import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
-import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
-import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
-import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
+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.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.ActivityPvOrdineAcquistoEditBinding;
-import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.EditArticoloDialog;
+import it.integry.integrywmsnative.databinding.FragmentPvArticoliOrdineAcquistoListSingleItemBinding;
-import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.helper.PVEditOrderHelper;
+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;
 import it.integry.integrywmsnative.view.dialogs.DialogAskAction;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
-public class PVOrdineAcquistoEditActivity extends BaseActivity {
+public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdineAcquistoEditViewModel.Listener {
 
     private static String DATA_KEY_ORDER = "keyOrdine";
+
     private Ordine mOrdine;
-    private Griglia mGriglia;
-    private List<ArticoloOrdine> mArticoli = new ArrayList<>();
-    private PVEditOrderHelper mhelper;
     private ActivityPvOrdineAcquistoEditBinding mBinding;
-    private int mBarcodeScannerIstanceID;
+
-    private OrdineAcquistoArtListAdapter mAdapter;
+    private int barcodeScannerIstanceID;
 
     @Inject
-    OrdineRepository mOrdineRepository;
+    PVOrdineAcquistoEditViewModel mViewModel;
-    @Inject
+
-    GrigliaRepository mGrigliaRepository;
+    private final ObservableArrayList<OrdineAcquistoArtListModel> mArticoliMutableData = new ObservableArrayList<>();
-    @Inject
-    ArticoliOrdineRepository mArticoliOrdineRepository;
-    @Inject
-    ArticoloGrigliaRepository mArticoloGrigliaRepository;
 
 
-    public static Intent newInstance(Context context, Ordine ordine){
+    public static Intent newInstance(Context context, Ordine ordine) {
         Intent myIntent = new Intent(context, PVOrdineAcquistoEditActivity.class);
         String keyOrdine = DataCache.addItem(ordine);
         myIntent.putExtra(DATA_KEY_ORDER, keyOrdine);
@@ -81,7 +72,6 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity {
                 .create()
                 .inject(this);
 
-        mhelper = new PVEditOrderHelper(mGrigliaRepository, mArticoliOrdineRepository, mArticoloGrigliaRepository);
 
         mBinding = DataBindingUtil.setContentView(this, R.layout.activity_pv_ordine_acquisto_edit);
         mBinding.setViewModel(this);
@@ -92,184 +82,178 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity {
 
         if (mOrdine == null) {
             Toast.makeText(this, "Impossibile modificare ordine esportato", Toast.LENGTH_SHORT).show();
-            closeEdit();
+            close();
         }
         if (mOrdine.isTransmitted()) {
             Toast.makeText(this, "Impossibile modificare ordine esportato", Toast.LENGTH_SHORT).show();
-            closeEdit();
+            close();
         }
         String testataOrdString = String.format(this.getString(R.string.ord_acq_testata), String.valueOf(mOrdine.getOrdineId()), UtilityDate.formatDate(mOrdine.getDataIns(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
         mBinding.orderIdentifier.setText(Html.fromHtml(testataOrdString));
         FabMenuCustomAnimations.changeIconOnFocus(mBinding.closeActivityFab, R.drawable.ic_check_white_24dp, R.drawable.ic_close_24dp);
 
 
+        initBarcodeReader();
         initRecyclerView();
-        fetchDetails();
-        mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(this::onScanSuccessful)
-                .setOnScanFailed(this::handleException));
 
+        this.mViewModel.setListener(this);
+
+        this.mViewModel.getCurrentGriglia().observe(this, griglia -> {
+            mBinding.codAlis.setText(griglia.getCodAlis());
+        });
+
+        this.mViewModel.getArticoli().observe(this, articoli -> {
+            mBinding.countArtOrd.setText(String.valueOf(articoli.size()));
+            mBinding.pvOrdineExport.setVisibility(articoli.size() > 0 ? View.INVISIBLE : View.GONE);
+            mBinding.closeActivityFab.close(false);
+            mBinding.scanArtSpinner.setVisibility(articoli.size() > 0 ? View.GONE : View.VISIBLE);
+
+            if (articoli.isEmpty() && isOrderNewProdsForced()) {
+                this.mViewModel.orderNewProducts();
+            }
+        });
+
+        this.mViewModel.init(mOrdine);
     }
 
+
     @Override
     public boolean onSupportNavigateUp() {
         onBackPressed();
         return true;
     }
 
-    private void initRecyclerView() {
+    private void initBarcodeReader() {
-        mBinding.articoliOrdineList.setHasFixedSize(true);
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessful)
+                .setOnScanFailed(this::onError));
 
+        BarcodeManager.enable();
+    }
+
+    private void initRecyclerView() {
+
+        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;
+        });
+
+        new LiveAdapter(this.mViewModel.getArticoli(), this)
+                .map(ArticoloOrdine.class, itemType)
+                .into(mBinding.articoliOrdineList);
+
+        mBinding.articoliOrdineList.setHasFixedSize(true);
         mBinding.articoliOrdineList.setLayoutManager(new LinearLayoutManager(this));
 
         SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(this, SimpleDividerItemDecoration.VERTICAL);
         itemDecorator.setDrawable(ContextCompat.getDrawable(this, R.drawable.divider));
         mBinding.articoliOrdineList.addItemDecoration(itemDecorator);
-        mAdapter = new OrdineAcquistoArtListAdapter(this, mArticoli, this::selectAction);
-        mBinding.articoliOrdineList.setAdapter(mAdapter);
     }
 
+
     private void selectAction(ArticoloOrdine articoloOrdine) {
         mBinding.closeActivityFab.close(false);
         BarcodeManager.disable();
-        runOnUiThread(() -> DialogAskAction.make(this,
+        runOnUiThread(() -> {
-                articoloOrdine.getDescrizione(),
+            DialogAskAction.make(this,
-                articoloOrdine.getQtaOrd() + " " + articoloOrdine.getUntMis(),
+                    articoloOrdine.getDescrizione(),
-                () -> this.addArticolo(articoloOrdine),
+                    articoloOrdine.getQtaOrd() + " " + articoloOrdine.getUntMis(),
-                () -> this.deleteArticolo(articoloOrdine)).show());
+                    () -> {
+                        this.mViewModel.checkArticolo(mOrdine, articoloOrdine.getCodMart(),
+                                artOrd -> {
+                                    this.onItemDispatched(artOrd);
+                                    BarcodeManager.enable();
+                                },
+                                this::onError);
+                        BarcodeManager.enable();
+                    },
+                    () -> {
+                        this.deleteArticolo(articoloOrdine);
+                        BarcodeManager.enable();
+                    }).show();
+        });
 
     }
 
     private void deleteArticolo(ArticoloOrdine articoloOrdine) {
         String text = "Stai per eliminare l'articolo <b> " + articoloOrdine.getDescrizione() + "</b>  dall'ordine, <br> sei sicuro?";
 
-        DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> this.runOnUiThread(() -> {
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> {
-            this.openProgress();
+            this.mViewModel.deleteArticolo(articoloOrdine);
-            mhelper.removeArticoloFromOrdine(articoloOrdine, () -> {
+        }, () -> {
-                this.closeProgress();
+
-                BarcodeManager.enable();
-                runOnUiThread(this::fetchArticoli);
-            }, e -> {
-                this.closeProgress();
-                runOnUiThread(() -> UtilityExceptions.defaultException(this, e));
-            });
-        }), () -> {
         }).show(getSupportFragmentManager(), "tag");
     }
 
-    private void handleException(Exception ex) {
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
-        runOnUiThread(() -> {
+        mBinding.closeActivityFab.close(false);
-            BarcodeManager.enable();
+        this.onLoadingStarted();
-            UtilityExceptions.defaultException(this, ex, false);
+
+        this.mViewModel.processBarcodeDTO(data, this::onLoadingEnded);
+
+    };
+
+    @Override
+    public void onItemDispatched(ArticoloOrdine articoloOrdine) {
+
+        DialogEditArticoloView
+                .newInstance(articoloOrdine, articolo -> {
+                    runOnUiThread(() -> {
+                        if (articolo != null) {
+                            Toast.makeText(this, "Articolo aggiunto all'ordine!", Toast.LENGTH_SHORT).show();
+                        }
+
+                        this.mViewModel.saveArticolo(articolo);
+                    });
+                }, () -> {
+
+                }).show(this.getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public int getColorFromResource(int resId) {
+        return getResources().getColor(resId);
+    }
+
+
+    public void exportOrdine() {
+        this.mViewModel.exportOrdine(() -> {
+            runOnUiThread(() -> {
+                Toast.makeText(this, "Ordine salvato con successo", Toast.LENGTH_SHORT).show();
+                close();
+            });
         });
     }
 
-    private void onScanSuccessful(BarcodeScanDTO dto) {
-        mBinding.closeActivityFab.close(false);
-        BarcodeManager.disable();
-        this.openProgress();
-        mhelper.checkArticolo(
-                mOrdine,
-                dto.getStringValue(),
-                articoloOrdine -> {
-                    this.closeProgress();
-                    addArticolo(articoloOrdine);
-                },
-                e -> {
-                    this.closeProgress();
-                    handleException(e);
-                }
-        );
-    }
 
-    private void addArticolo(ArticoloOrdine articoloOrdine) {
+    public void close() {
-
-        runOnUiThread(() -> EditArticoloDialog.newInstance(this, mhelper, articoloOrdine, articolo -> {
-            BarcodeManager.enable();
-            if (articolo != null) {
-                Toast.makeText(this, "Articolo aggiunto all'ordine!", Toast.LENGTH_SHORT).show();
-            }
-            fetchArticoli();
-        }).show(this.getSupportFragmentManager(), "tag"));
-    }
-
-    private void fetchDetails() {
-        fetchGriglia();
-        fetchArticoli();
-    }
-
-    private void fetchGriglia() {
-        mhelper.loadGriglia(mOrdine.getIdGriglia(), griglia -> {
-            runOnUiThread(() -> {
-                mGriglia = griglia;
-                mBinding.codAlis.setText(mGriglia.getCodAlis());
-            });
-        }, this::handleException);
-    }
-
-    private void fetchArticoli() {
-        this.openProgress();
-        mhelper.loadArticoli(mOrdine, articoli -> {
-            this.closeProgress();
-            mArticoli = articoli;
-            runOnUiThread(() -> {
-                mAdapter.updateItems(mArticoli);
-                mBinding.countArtOrd.setText(String.valueOf(mArticoli.size()));
-                mBinding.pvOrdineExport.setVisibility(mArticoli.size() > 0 ? View.INVISIBLE : View.GONE);
-                mBinding.closeActivityFab.close(false);
-                mBinding.scanArtSpinner.setVisibility(mArticoli.size() > 0 ? View.GONE : View.VISIBLE);
-            });
-        }, this::handleException);
-    }
-
-    public void closeEdit() {
         onBackPressed();
     }
 
-    public void exportOrdine() {
-        this.openProgress();
-        PVOrdiniAcquistoRESTConsumer.saveOrdine(mOrdine, mArticoli, mGriglia, (ordine) -> {
-
-            mOrdineRepository.updateOrder(ordine, ord -> {
-                this.closeProgress();
-                runOnUiThread(() -> {
-                    Toast.makeText(this, "Ordine salvato con successo", Toast.LENGTH_SHORT).show();
-                    onBackPressed();
-                });
-            }, e -> runOnUiThread(() -> {
-                this.closeProgress();
-                UtilityExceptions.defaultException(this, e);
-            }));
-
-        }, e -> runOnUiThread(() -> {
-            this.closeProgress();
-            UtilityExceptions.defaultException(this, e);
-        }));
-    }
-
     @Override
     public void onBackPressed() {
-        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+        BarcodeManager.removeCallback(barcodeScannerIstanceID);
         super.onBackPressed();
     }
 
-    public void manualSearch(){
+    public void manualSearch() {
         BarcodeManager.disable();
-        DialogSimpleInputHelper.makeInputDialog(this,"Inserisci il codice a barre/codice articolo da cercare",codice->{
+        DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il codice a barre/codice articolo da cercare", codice -> {
-            this.openProgress();
+            this.onLoadingStarted();
-            mhelper.checkArticolo(
+            this.mViewModel.checkArticolo(mOrdine, codice,
-                    mOrdine,
-                    codice,
                     articoloOrdine -> {
-                        this.closeProgress();
+                        this.onItemDispatched(articoloOrdine);
-                        addArticolo(articoloOrdine);
+                        this.onLoadingEnded();
+                        BarcodeManager.enable();
                     },
-                    e -> {
+                    this::onError
-                        this.closeProgress();
-                        handleException(e);
-                    }
             );
         }, BarcodeManager::enable).show();
     }
 
+    private boolean isOrderNewProdsForced() {
+        return SettingsManager.iDB().getFlagOrdinaNuoviArticoliInGriglia();
+    }
+
 }

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

@@ -1,7 +1,33 @@
 package it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit;
 
+import javax.inject.Singleton;
+
 import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
+import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
 
 @Module(subcomponents = PVOrdineAcquistoEditComponent.class)
 public class PVOrdineAcquistoEditModule {
+
+
+
+    @Provides
+    @Singleton
+    PVOrdiniAcquistoRESTConsumer providesPVOrdiniAcquistoRESTConsumer() {
+        return new PVOrdiniAcquistoRESTConsumer();
+    }
+
+    @Provides
+    PVOrdineAcquistoEditViewModel providesPvOrdineAcquistoEditViewModel(OrdineRepository ordineRepository,
+                                                                        GrigliaRepository grigliaRepository,
+                                                                        ArticoliOrdineRepository articoliOrdineRepository,
+                                                                        ArticoloGrigliaRepository articoloGrigliaRepository,
+                                                                        PVOrdiniAcquistoRESTConsumer pvOrdiniAcquistoRESTConsumer) {
+        return new PVOrdineAcquistoEditViewModel(ordineRepository, grigliaRepository, articoliOrdineRepository, articoloGrigliaRepository, pvOrdiniAcquistoRESTConsumer);
+    }
+
 }

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

@@ -0,0 +1,286 @@
+package it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit;
+
+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;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+
+public class PVOrdineAcquistoEditViewModel {
+
+    @Inject
+    OrdineRepository mOrdineRepository;
+
+    @Inject
+    GrigliaRepository mGrigliaRepository;
+
+    @Inject
+    ArticoliOrdineRepository mArticoliOrdineRepository;
+
+    @Inject
+    ArticoloGrigliaRepository mArticoloGrigliaRepository;
+
+    @Inject
+    PVOrdiniAcquistoRESTConsumer pvOrdiniAcquistoRESTConsumer;
+
+    private Ordine mCurrentOrdine;
+
+
+    private Listener mListener;
+
+
+    private final MutableLiveData<Griglia> mCurrentGriglia = new MutableLiveData<>();
+    private final MutableLiveData<List<ArticoloOrdine>> mArticoli = new MutableLiveData<>();
+
+
+    public PVOrdineAcquistoEditViewModel(OrdineRepository ordineRepository,
+                                         GrigliaRepository grigliaRepository,
+                                         ArticoliOrdineRepository articoliOrdineRepository,
+                                         ArticoloGrigliaRepository articoloGrigliaRepository,
+                                         PVOrdiniAcquistoRESTConsumer pvOrdiniAcquistoRESTConsumer) {
+        this.mOrdineRepository = ordineRepository;
+        this.mGrigliaRepository = grigliaRepository;
+        this.mArticoliOrdineRepository = articoliOrdineRepository;
+        this.mArticoloGrigliaRepository = articoloGrigliaRepository;
+        this.pvOrdiniAcquistoRESTConsumer = pvOrdiniAcquistoRESTConsumer;
+    }
+
+    public void init(Ordine ordine) {
+        this.mCurrentOrdine = ordine;
+
+        this.sendOnLoadingStarted();
+
+        this.loadGriglia(ordine.getIdGriglia(), griglia -> {
+            mCurrentGriglia.postValue(griglia);
+            this.loadArticoli(mCurrentOrdine, articoli -> {
+                articoli = Stream.of(articoli).map(this::setBgTint).toList();
+                this.mArticoli.postValue(articoli);
+                this.sendOnLoadingEnded();
+            });
+        });
+    }
+
+    private ArticoloOrdine setBgTint(ArticoloOrdine art) {
+        int chk = art.checkQtaProposta();
+        switch (chk) {
+            case -1:
+                art.setBgTint(this.mListener.getColorFromResource(R.color.red_600));
+                break;
+            case 1:
+                art.setBgTint(this.mListener.getColorFromResource(R.color.orange_600));
+                break;
+            default:
+                art.setBgTint(this.mListener.getColorFromResource(R.color.colorPrimary));
+        }
+        return art;
+    }
+
+    public MutableLiveData<Griglia> getCurrentGriglia() {
+        return mCurrentGriglia;
+    }
+
+    public MutableLiveData<List<ArticoloOrdine>> getArticoli() {
+        return mArticoli;
+    }
+
+    public void saveArticolo(ArticoloOrdine articolo) {
+        setBgTint(articolo);
+        var newList = this.mArticoli.getValue();
+
+        var alreadySavedItem = Stream.of(newList)
+                .filter(x -> Objects.equals(x.getCodMart(), articolo.getCodMart()))
+                .findFirst();
+
+        if (alreadySavedItem.isPresent()) newList.remove(alreadySavedItem.get());
+
+        newList.add(articolo);
+        this.mArticoli.postValue(newList);
+    }
+
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        this.checkArticolo(
+                mCurrentOrdine,
+                barcodeScanDTO.getStringValue(),
+                articoloOrdine -> {
+                    this.sendOnItemDispatched(articoloOrdine);
+                    onComplete.run();
+                },
+                this::sendError
+        );
+    }
+
+
+    private void loadGriglia(int idGriglia, RunnableArgs<Griglia> onLoad) {
+        try {
+            mGrigliaRepository.findGrigliaById(idGriglia, onLoad, this::sendError);
+        } catch (Exception e) {
+            this.sendError(e);
+        }
+    }
+
+    private void loadArticoli(Ordine ordine, RunnableArgs<List<ArticoloOrdine>> onLoad) {
+        try {
+            mArticoliOrdineRepository.findArticoliByOrdine(ordine, onLoad, this::sendError);
+        } catch (Exception e) {
+            this.sendError(e);
+        }
+    }
+
+    public void checkArticolo(Ordine ordine, String barcode, RunnableArgs<ArticoloOrdine> onSuccess, RunnableArgs<Exception> onFail) {
+        try {
+            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 {
+                            ArticoloOrdine art = artGrid.convertToArticoloOrdine(ordine);
+                            if (isAutoOrderOnScan()) {
+                                art.setQtaOrd(art.getQtaCnf());
+                                mArticoliOrdineRepository.saveArticoloToOrdine(art, () -> {
+                                    saveArticolo(art);
+                                    this.sendOnLoadingEnded();
+
+                                }, this::sendError);
+                            } else {
+                                onSuccess.run(art);
+                            }
+                        }
+                    }, onFail);
+
+                } else {
+                    onFail.run(new Exception("L' articolo ( " + barcode + " ) non  è presente nella griglia"));
+                }
+            }, onFail);
+
+
+        } catch (Exception e) {
+            onFail.run(e);
+        }
+    }
+
+    private boolean isAutoOrderOnScan() {
+        return SettingsManager.iDB().getFlagOrdinaNuoviArticoliInGriglia();
+    }
+
+    private void getNewArticoli(int idGrigla, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onError) {
+        mArticoloGrigliaRepository.findNewArticoliInGrigla(idGrigla, onSuccess, onError);
+    }
+
+    public void orderNewProducts() {
+        this.sendOnLoadingStarted();
+
+        this.getNewArticoli(mCurrentOrdine.getIdGriglia(), articoli -> {
+            if (articoli != null && !articoli.isEmpty()) {
+                List<ArticoloOrdine> articoliToSave = new ArrayList<>();
+
+                Stream.of(articoli).forEach(articolo -> {
+                    if (
+                            Stream.of(mArticoli.getValue())
+                                    .filter(x -> x.getCodMart().equalsIgnoreCase(articolo.getCodMart()))
+                                    .findFirst()
+                                    .isEmpty()
+
+                                    && Stream.of(articoliToSave)
+                                    .filter(x -> x.getCodMart().equalsIgnoreCase(articolo.getCodMart()))
+                                    .findFirst()
+                                    .isEmpty()
+                    ) {
+                        ArticoloOrdine dto = articolo.convertToArticoloOrdine(mCurrentOrdine);
+                        dto.setQtaOrd(dto.getQtaCnf());
+                        articoliToSave.add(dto);
+                    }
+                });
+                if (!articoliToSave.isEmpty()) {
+                    mArticoliOrdineRepository.saveArticoliToOrdine(articoliToSave, () -> {
+                        Stream.of(articoliToSave).forEach(this::saveArticolo);
+
+                        this.sendOnLoadingEnded();
+
+                    }, this::sendError);
+
+                } else this.sendOnLoadingEnded();
+            } else this.sendOnLoadingEnded();
+        }, this::sendError);
+    }
+
+    public void deleteArticolo(ArticoloOrdine articoloOrdine) {
+        mArticoliOrdineRepository.deleteArticolo(articoloOrdine, () -> {
+            this.mArticoli.getValue().remove(articoloOrdine);
+            this.mArticoli.postValue(this.mArticoli.getValue());
+        }, this::sendError);
+    }
+
+    public void exportOrdine(Runnable onComplete) {
+        this.sendOnLoadingStarted();
+        pvOrdiniAcquistoRESTConsumer.saveOrdine(mCurrentOrdine, mArticoli.getValue(), mCurrentGriglia.getValue(), (ordine) -> {
+
+            mOrdineRepository.updateOrder(ordine, ord -> {
+                this.sendOnLoadingEnded();
+                onComplete.run();
+            }, this::sendError);
+
+        }, this::sendError);
+    }
+
+    private void sendOnItemDispatched(ArticoloOrdine articoloOrdine) {
+        if (this.mListener != null) mListener.onItemDispatched(articoloOrdine);
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    public interface Listener extends ILoadingListener {
+        void onItemDispatched(ArticoloOrdine articoloOrdine);
+
+        int getColorFromResource(int resId);
+
+        void onError(Exception ex);
+    }
+
+    public PVOrdineAcquistoEditViewModel setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/DialogEditArticoloComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogEditArticoloComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogEditArticoloComponent create();
+    }
+
+    void inject(DialogEditArticoloView dialogEditArticoloView);
+}

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/DialogEditArticoloModule.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
+
+@Module(subcomponents = DialogEditArticoloComponent.class)
+public class DialogEditArticoloModule {
+
+
+    @Provides
+    DialogEditArticoloViewModel providesDialogEditArticoloViewModel(ArticoliOrdineRepository articoliOrdineRepository) {
+        return new DialogEditArticoloViewModel(articoliOrdineRepository);
+    }
+
+}