Finish v1.17.6(226)

Finish v.1.17.5(225)

.idea/codeStyles/Project.xml

@@ -1,24 +1,12 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
       <arrangement>
         <rules>
           <section>
@@ -127,5 +115,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/runConfigurations.xml

@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

.idea/runConfigurations/app_agricoper.xml

@@ -0,0 +1,60 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="app_agricoper" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+    <module name="WMS_Native.app" />
+    <option name="DEPLOY" value="true" />
+    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ALL_USERS" value="false" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="default_activity" />
+    <option name="CLEAR_LOGCAT" value="true" />
+    <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="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+    <option name="DEBUGGER_TYPE" value="Auto" />
+    <Auto>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Auto>
+    <Hybrid>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Hybrid>
+    <Java />
+    <Native>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Native>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="true" />
+      <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_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY_CLASS" value="" />
+    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/app_base.xml

@@ -7,7 +7,8 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic_agricoper,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

.idea/runConfigurations/app_frudis.xml

@@ -7,7 +7,8 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_agricoper,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

.idea/runConfigurations/app_gramm.xml

@@ -7,7 +7,8 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_agricoper,WMS_Native.dynamic_frudis,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

.idea/runConfigurations/app_ime.xml

@@ -7,7 +7,8 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_agricoper,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

.idea/runConfigurations/app_saporiveri.xml

@@ -7,7 +7,8 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_agricoper,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri_pv,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

.idea/runConfigurations/app_saporiveri_pv.xml

@@ -7,7 +7,8 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_vgalimenti" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_agricoper,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

.idea/runConfigurations/app_vglimenti.xml

@@ -7,7 +7,8 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_agricoper,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

app/build.gradle

@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 197
-    def appVersionName = '1.16.15'
+    def appVersionCode = 226
+    def appVersionName = '1.17.6'
 
     signingConfigs {
         release {
@@ -15,6 +15,9 @@ android {
             keyPassword 'inpmiy'
             storeFile file('Integry.jks')
             storePassword 'inpmiy'
+
+            enableV3Signing true
+            enableV4Signing true
         }
     }
 
@@ -24,12 +27,12 @@ android {
         }
     }
 
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -50,8 +53,8 @@ android {
     android.buildFeatures.dataBinding true
 
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     productFlavors {
     }
@@ -74,7 +77,7 @@ android {
         abortOnError false
     }
 
-    dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv", ":dynamic_saporiveri", ':dynamic_gramm']
+    dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv", ":dynamic_saporiveri", ':dynamic_gramm', ':dynamic_agricoper']
 
 
 }
@@ -101,18 +104,18 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.3.0-rc01'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.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.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
+    implementation 'com.annimon:stream:1.2.2'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
@@ -127,16 +130,16 @@ dependencies {
     implementation 'com.github.clans:fab:1.6.4'
     //CUSTOM VIEWS
     implementation 'com.github.NaimishTrivedi:FBToast:1.0'
-    implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
+    implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
     implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
-    implementation 'com.fede987:status-bar-alert:1.0.1'
-    implementation 'com.fxn769:stash:1.2'
-    testImplementation 'junit:junit:4.13.1'
+    implementation 'com.github.fede87:StatusBarAlert:1.0.1'
+    implementation 'com.github.akshay2211:Stash:master'
+    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.2.6"
+    def room_version = "2.3.0"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
@@ -150,11 +153,12 @@ dependencies {
     implementation project(':barcode_base_android_library')
     implementation project(':honeywellscannerlibrary')
     implementation project(':keyobardemulatorscannerlibrary')
-    implementation project(':barcode_kaiteki')
-    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    androidTestImplementation 'org.testng:testng:7.3.0'
+    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+    androidTestImplementation 'org.testng:testng:7.4.0'
 }
+
 repositories {
     mavenCentral()
     google()
+    maven { url 'https://jitpack.io' }
 }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application
         android:name=".MainApplication"
@@ -24,16 +25,18 @@
             android:screenOrientation="portrait"
             android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />
-        <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
+        <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".gest.picking_resi.PickingResiActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Light" />
         <activity
             android:name=".MainActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.CLIENTBARCODEACTIVITY" />
 
@@ -47,7 +50,6 @@
             android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".gest.login.LoginActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Light" />
         <activity
             android:name=".gest.lista_bancali.ListaBancaliActivity"

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

@@ -30,6 +30,7 @@ import it.integry.integrywmsnative.core.class_router.ClassRouter;
 import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
 import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
 import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
+import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
@@ -42,6 +43,7 @@ import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
+import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.core.utility.UtilitySettings;
 import it.integry.integrywmsnative.databinding.ActivityMainBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
@@ -59,6 +61,9 @@ public class MainActivity extends BaseActivity
     @Inject
     AppDatabase mAppDatabase;
 
+    @Inject
+    ColliDataRecoverService mColliDataRecoverService;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,10 +73,13 @@ public class MainActivity extends BaseActivity
                 .create()
                 .inject(this);
 
+        mColliDataRecoverService.init(this);
+
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
         UpdatesManager.init(this);
+        UtilityContext.initMainActivity(this);
 
         setSupportActionBar(mBinding.appBarMain.toolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
@@ -87,7 +95,7 @@ public class MainActivity extends BaseActivity
         mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
 
         initGestMenu();
-        openMain();
+        if(savedInstanceState == null) openMain();
 
         init();
 

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

@@ -17,6 +17,8 @@ import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisogn
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaComponent;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaModule;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailComponent;
 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_ordini_acquisto.PVOrdineAcquistoGrigliaComponent;
@@ -27,10 +29,22 @@ import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdComponent;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdModule;
+import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteComponent;
+import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteModule;
+import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreComponent;
+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.choose_batch_lot.DialogChooseBatchLotComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
+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;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
+import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUComponent;
+import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUModule;
 
 // Definition of the Application graph
 @Singleton
@@ -44,12 +58,18 @@ import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
         RettificaGiacenzeModule.class,
         SpedizioneModule.class,
         AccettazionePickingModule.class,
+        UltimeConsegneClienteModule.class,
+        UltimiArriviFornitoreModule.class,
         PickingResiModule.class,
         OrdiniUscitaElencoModule.class,
         DialogInputQuantityV2Module.class,
+        DialogInputLUProdModule.class,
         DialogScanArtModule.class,
+        DialogScanOrCreateLUModule.class,
         ProdFabbisognoLineeProdModule.class,
+        VersamentoMerceModule.class,
         DialogAskMagazzinoProssimitaModule.class,
+        DialogChooseBatchLotModule.class,
         DialogRowInfoProdFabbisognoLineeProdModule.class})
 public interface MainApplicationComponent {
 
@@ -60,13 +80,21 @@ public interface MainApplicationComponent {
     RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
     SpedizioneComponent.Factory spedizioneComponent();
     AccettazionePickingComponent.Factory accettazionePickingComponent();
+    UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
+    UltimiArriviFornitoreComponent.Factory ultimiArriviFornitoreComponent();
     PickingResiComponent.Factory pickingResiComponent();
     OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
     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();
 
 
     void inject(AppContext appContext);

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

@@ -12,6 +12,8 @@ import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -38,7 +40,7 @@ public class MainApplicationModule {
     @Provides
     @Singleton
     ColliDataRecoverService provideColliDataRecoverService() {
-        return new ColliDataRecoverService(mContext);
+        return new ColliDataRecoverService();
     }
 
     @Provides
@@ -59,6 +61,18 @@ public class MainApplicationModule {
         return new ArticoloRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer() {
+        return new MagazzinoRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    MesRESTConsumer provideMesRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new MesRESTConsumer(systemRESTConsumer);
+    }
+
     @Provides
     @Singleton
     ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {

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

@@ -6,22 +6,21 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
-import android.widget.TextView;
+
+import androidx.databinding.DataBindingUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.databinding.DataBindingUtil;
-
 import it.integry.integrywmsnative.core.context.MainContext;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.PermissionsHelper;
+import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.databinding.ActivitySplashBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class SplashActivity extends BaseActivity {
 
@@ -39,6 +38,8 @@ public class SplashActivity extends BaseActivity {
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_splash, null, false);
         setContentView(mBinding.getRoot());
 
+        UtilityContext.initMainActivity(this);
+
         initAppVersion();
 
         initPermissions(this::init);
@@ -49,10 +50,10 @@ public class SplashActivity extends BaseActivity {
             onComplete.run();
         }, permanentlyDenied -> {
             if(permanentlyDenied) {
-                DialogSimpleMessageHelper.makeErrorDialog(this,
-                        new SpannableString(getText(R.string.permissions_permanently_denied)), null, () -> {
+                DialogSimpleMessageView.makeErrorDialog(new SpannableString(getText(R.string.permissions_permanently_denied)), null, () -> {
                             this.finish();
-                        }).show();
+                        })
+                        .show(getSupportFragmentManager(), "tag");
             } else {
                 initPermissions(onComplete);
             }
@@ -93,6 +94,7 @@ public class SplashActivity extends BaseActivity {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if(this.onRequestPermissionResult != null) {
             List<Integer> grantResultsList = new ArrayList<>();
             for(int i = 0; i < grantResults.length; i++) {

app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java

@@ -9,7 +9,6 @@ import com.orhanobut.logger.Logger;
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.BuildConfig;
-import it.integry.integrywmsnative.core.data_recover.ColliDataRecover;
 import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.settings.Stash;
@@ -41,8 +40,6 @@ public class AppContext {
         this.initCrashlytics();
 
         this.initLogger();
-
-        this.initRecoverColli();
     }
 
 
@@ -77,9 +74,5 @@ public class AppContext {
         Logger.addLogAdapter(new AndroidLogAdapter());
     }
 
-    private void initRecoverColli() {
-        ColliDataRecover.init(mContext);
-    }
-
 
 }

app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java

@@ -1,21 +1,25 @@
 package it.integry.integrywmsnative.core.context;
 
 import android.content.Context;
+import android.text.Html;
 import android.text.SpannableString;
+import android.text.Spanned;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import java.lang.reflect.Method;
+import java.net.ConnectException;
 
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.class_router.ClassRouter;
+import it.integry.integrywmsnative.core.data_recover.ColliDataRecover;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilitySettings;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class MainContext {
 
@@ -37,6 +41,8 @@ public class MainContext {
         this.initReflections();
 
         this.initServerStatusChecker();
+
+        ColliDataRecover.init(mContext);
     }
 
 
@@ -46,11 +52,23 @@ public class MainContext {
 
     private void initDBData(Runnable onComplete) {
         SettingsManager.loadDBVariables(onComplete, ex -> {
-                    DialogSimpleMessageHelper.makeErrorDialog(mContext,
-                            new SpannableString(ex.getMessage()), null, mContext::finish, R.string.logout, () -> {
+
+                    Spanned message = null;
+
+                    if (ex.getCause() != null && ex.getCause() instanceof ConnectException) {
+                        message = Html.fromHtml("Impossibile collegarsi all'host <b>" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "</b>. Riprovare più tardi.");
+                    } else if (ex.getMessage().startsWith("Status 404:")) {
+                        message = Html.fromHtml("Errore 404. Non è stato possibile soddisfare la richiesta sull'host <b>" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "</b>. Riprovare più tardi.");
+                    } else {
+                        message = new SpannableString(ex.getMessage());
+                    }
+
+                    DialogSimpleMessageView.makeErrorDialog(
+                            message, null, mContext::finish, R.string.logout, () -> {
                                 UtilitySettings.logout();
                                 MainApplication.exit();
-                            }).show();
+                            })
+                            .show(mContext.getSupportFragmentManager(), "tag");
                 }
         );
     }

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

@@ -2,9 +2,10 @@ package it.integry.integrywmsnative.core.data_recover;
 
 import android.content.Context;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
-import com.google.android.gms.common.util.IOUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -107,11 +108,11 @@ public class ColliDataRecover {
         }
     }
 
-    private static Context mContext;
+    private static AppCompatActivity mContext;
 
     private static List<RecoverDTO> mtbColtsSessions = new ArrayList<>();
 
-    public static void init(Context context) {
+    public static void init(AppCompatActivity context) {
         mContext = context;
 
         if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) {
@@ -120,7 +121,7 @@ public class ColliDataRecover {
     }
 
     public static boolean thereIsAnExistantSession() {
-        return mtbColtsSessions.size() > 0;
+        return mtbColtsSessions != null && mtbColtsSessions.size() > 0;
     }
 
     public static List<Integer> getAllSessionIDs() {
@@ -191,13 +192,16 @@ public class ColliDataRecover {
         try {
             inputStream = mContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
 
-            byte[] bytes = IOUtils.readInputStreamFully(inputStream);
+            byte[] bytes = new byte[inputStream.available()];
+            inputStream.read(bytes);
+            inputStream.close();
+
             String jsonString = new String(bytes);
 
             Type listType = new TypeToken<ArrayList<RecoverDTO>>(){}.getType();
             mtbColtsSessions = gson.fromJson(jsonString, listType);
 
-            inputStream.close();
+            if(mtbColtsSessions == null) mtbColtsSessions = new ArrayList<>();
         } catch (Exception e) {
             e.printStackTrace();
             UtilityExceptions.defaultException(mContext, e);

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

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.data_recover;
 
 import android.content.Context;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.android.gms.common.util.IOUtils;
@@ -28,20 +30,21 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 public class ColliDataRecoverService {
 
 
-    private final Context mContext;
+    private AppCompatActivity mContext;
     private List<ColliDataRecoverDTO> mtbColtsSessions = new ArrayList<>();
 
     @Inject
-    public ColliDataRecoverService(Context context) {
-        this.mContext = context;
+    public ColliDataRecoverService() {
+    }
+
+    public void init(AppCompatActivity appCompatActivity) {
+        this.mContext = appCompatActivity;
 
         if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) {
             loadLocalFile();
         }
     }
 
-
-
     public boolean thereIsAnExistantSession() {
         return mtbColtsSessions.size() > 0;
     }

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

@@ -8,7 +8,6 @@ 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.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.GrigliaWrapper;
 
@@ -17,7 +16,7 @@ public interface GrigliaDao {
     @Query("SELECT * from griglie")
     List<Griglia> getAll();
 
-    @Query("SELECT *, COUNT(articoli_griglia.articolo_griglia_id) as countArticoli from griglie LEFT JOIN articoli_griglia ON (griglie.griglia_id = articoli_griglia.id_griglia) where cod_alis = :codAlis GROUP BY griglie.griglia_id")
+    @Query("SELECT griglie.*, COUNT(articoli_griglia.articolo_griglia_id) as countArticoli from griglie LEFT JOIN articoli_griglia ON (griglie.griglia_id = articoli_griglia.id_griglia) where cod_alis = :codAlis GROUP BY griglie.griglia_id")
     GrigliaWrapper findByCodAlis(String codAlis);
 
     @Insert

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

@@ -11,6 +11,7 @@ import androidx.room.PrimaryKey;
                 @Index(value = "cod_alis", unique = true)
         }
 )
+
 public class Griglia {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "griglia_id")

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

@@ -84,6 +84,28 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindEditText(AppCompatTextView view, final ObservableField<String> observableField) {
+        Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableField) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    if(observableField != null) observableField.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableField.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindEditText(EditText view, final BindableString bindableString) {
         Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
@@ -106,6 +128,28 @@ public class Converters {
         }
     }
 
+    @BindingAdapter("binding")
+    public static void bindEditText(EditText view, final ObservableField<String> observableString) {
+        Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+        if (pair == null || pair.first != observableString) {
+            if (pair != null) {
+                view.removeTextChangedListener(pair.second);
+            }
+            TextWatcherAdapter watcher = new TextWatcherAdapter() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    observableString.set(s.toString());
+                }
+            };
+            view.setTag(R.id.bound_observable, new Pair<>(observableString, watcher));
+            view.addTextChangedListener(watcher);
+        }
+        String newValue = observableString.get();
+        if (!view.getText().toString().equals(newValue)) {
+            view.setText(newValue);
+        }
+    }
+
     @BindingAdapter("binding")
     public static void bindTextInputEditText(TextInputEditText view, final BindableString bindableString) {
         Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);

app/src/main/java/it/integry/integrywmsnative/core/di/binders/AutoCompleteTextViewBinders.java

@@ -0,0 +1,6 @@
+package it.integry.integrywmsnative.core.di.binders;
+
+public class AutoCompleteTextViewBinders {
+
+
+}

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

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

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

@@ -1,36 +0,0 @@
-package it.integry.integrywmsnative.core.exception;
-
-import android.content.Context;
-import android.content.Intent;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class MyExceptionHandler implements
-        java.lang.Thread.UncaughtExceptionHandler {
-    private final Context myContext;
-    private final Class<?> myActivityClass;
-
-    public MyExceptionHandler(Context context, Class<?> c) {
-
-        myContext = context;
-        myActivityClass = c;
-    }
-
-    public void uncaughtException(Thread thread, Throwable exception) {
-
-        StringWriter stackTrace = new StringWriter();
-        exception.printStackTrace(new PrintWriter(stackTrace));
-        System.err.println(stackTrace);// You can use LogCat too
-//        Intent intent = new Intent(myContext, myActivityClass);
-//        String s = stackTrace.toString();
-//        //you can use this String to know what caused the exception and in which Activity
-//        intent.putExtra("uncaughtException",
-//                "Exception is: " + stackTrace.toString());
-//        intent.putExtra("stacktrace", s);
-//        myContext.startActivity(intent);
-        //for restarting the Activity
-//        Process.killProcess(Process.myPid());
-//        System.exit(0);
-    }
-}

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

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

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

@@ -0,0 +1,11 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class TooManyLUFoundInMonoLUPositionException extends Exception {
+
+    public TooManyLUFoundInMonoLUPositionException() {
+        super(UtilityResources.getString(R.string.too_much_lu_found_message_in_mono_lu));
+    }
+}

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

@@ -40,12 +40,14 @@ public class BaseActivity extends AppCompatActivity {
 
 
     protected void openProgress() {
+        BarcodeManager.disable();
         if (this.mCurrentProgress == null) {
             this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(this);
         }
     }
 
     protected void closeProgress() {
+        BarcodeManager.enable();
         if (mCurrentProgress != null) {
             mCurrentProgress.dismiss();
             mCurrentProgress = null;

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

@@ -49,16 +49,38 @@ public class BaseDialogFragment extends DialogFragment {
         this.mBarcodeListener = listen;
     }
 
+
+
+
+    public void onLoadingStarted() {
+        BarcodeManager.disable();
+        this.openProgress();
+    }
+
+    public void onLoadingEnded() {
+        this.closeProgress();
+        BarcodeManager.enable();
+    }
+
     protected void openProgress() {
-        if (this.mCurrentProgress == null) {
-            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
-        }
+
+//        new Thread(() -> {
+        getActivity().runOnUiThread(() -> {
+            if (this.mCurrentProgress == null) {
+                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+            }
+        });
+//        }).start();
     }
 
     protected void closeProgress() {
-        if (mCurrentProgress != null) {
-            mCurrentProgress.dismiss();
-            mCurrentProgress = null;
-        }
+//        new Thread(() -> {
+        getActivity().runOnUiThread(() -> {
+            if (mCurrentProgress != null) {
+                mCurrentProgress.dismiss();
+                mCurrentProgress = null;
+            }
+        });
+//        }).start();
     }
 }

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

@@ -4,6 +4,8 @@ import android.app.Dialog;
 
 import androidx.fragment.app.Fragment;
 
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 
 public class BaseFragment extends Fragment {
@@ -12,19 +14,43 @@ public class BaseFragment extends Fragment {
 
 
     protected void openProgress() {
-        if (this.mCurrentProgress == null) {
+
+//        new Thread(() -> {
             getActivity().runOnUiThread(() -> {
-                this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+                if (this.mCurrentProgress == null) {
+                    this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(getActivity());
+                }
             });
-        }
+//        }).start();
     }
 
     protected void closeProgress() {
-        if (mCurrentProgress != null) {
+//        new Thread(() -> {
             getActivity().runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
-                mCurrentProgress = null;
+                if (mCurrentProgress != null) {
+                    mCurrentProgress.dismiss();
+                    mCurrentProgress = null;
+                }
             });
-        }
+//        }).start();
+    }
+
+
+    public void onLoadingStarted() {
+        BarcodeManager.disable();
+        this.openProgress();
+    }
+
+    public void onLoadingEnded() {
+        this.closeProgress();
+        BarcodeManager.enable();
+    }
+
+    public void onError(Exception ex) {
+        this.getActivity().runOnUiThread(() -> {
+            this.closeProgress();
+            UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
+            BarcodeManager.enable();
+        });
     }
 }

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

@@ -7,6 +7,7 @@ import androidx.databinding.ObservableList;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 
@@ -38,6 +39,28 @@ public abstract class ExtendedRecyclerView<T, VH extends RecyclerView.ViewHolder
         return mDataset.size();
     }
 
+    public void clearDataset() {
+        mDataset.clear();
+        notifyDataSetChanged();
+    }
+
+    public void updateDataset(List<T> updatedDataset) {
+        mDataset.clear();
+
+        if(updatedDataset != null && !updatedDataset.isEmpty()) {
+            mDataset.addAll(updatedDataset);
+        }
+
+        notifyDataSetChanged();
+    }
+
+    public void addDataset(List<T> insertDataset) {
+        if(insertDataset != null && !insertDataset.isEmpty()) {
+            mDataset.addAll(insertDataset);
+            notifyDataSetChanged();
+        }
+    }
+
     public ExtendedRecyclerView<T, VH> setEmptyView(View emptyView) {
         this.mEmptyView = emptyView;
         this.checkIfEmpty();

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

@@ -0,0 +1,56 @@
+package it.integry.integrywmsnative.core.expansion.view;
+
+import android.view.View;
+
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
+
+import java.util.ArrayList;
+
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+
+public abstract class ExtendedSectionedRecyclerView<T, SH extends RecyclerView.ViewHolder, VH extends RecyclerView.ViewHolder>
+        extends SectionedRecyclerViewAdapter<SH, VH> {
+
+    protected ArrayList<T> mDataset = new ArrayList<>();
+    private View mEmptyView;
+
+    public ExtendedSectionedRecyclerView(ObservableArrayList<T> myDataset) {
+        mDataset.addAll(myDataset);
+
+        myDataset.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+            @Override
+            public void onChanged(ObservableList sender) {
+                mDataset.clear();
+                mDataset.addAll(sender);
+                notifyDataSetChanged();
+                notifyDataChanged();
+                checkIfEmpty();
+            }
+        });
+
+        checkIfEmpty();
+    }
+
+    public ExtendedSectionedRecyclerView<T, SH, VH> setEmptyView(View emptyView) {
+        this.mEmptyView = emptyView;
+        this.checkIfEmpty();
+        return this;
+    }
+
+    @Override
+    public int getItemSize() {
+        return this.mDataset.size();
+    }
+
+    private void checkIfEmpty() {
+        if (mEmptyView != null) {
+            final boolean emptyViewVisible = getItemSize() == 0;
+            mEmptyView.setVisibility(emptyViewVisible ? View.VISIBLE : View.GONE);
+        }
+    }
+
+}

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

@@ -0,0 +1,348 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+
+public class DtbOrdSteps extends EntityBase {
+
+    private String dataOrd;
+    private String gestione;
+    private Integer idRiga;
+    private Integer idStep;
+    private Integer numOrd;
+    private String activityId;
+    private String codAnag;
+    private String codDtip;
+    private String codJfas;
+    private String codMdep;
+    private String codProdPri;
+    private String dataDoc;
+    private String dataFine;
+    private String dataIniz;
+    private String descrizioneAttivita;
+    private String flagTipoTempo;
+    private Integer hrNum;
+    private BigDecimal hrTime;
+    private String idRigaDoc;
+    private String note;
+    private String numDoc;
+    private Integer numFase;
+    private BigDecimal qtaAllocata;
+    private BigDecimal qtaDisp;
+    private BigDecimal qtaDispImmessa;
+    private BigDecimal qtaImmesse;
+    private BigDecimal qtaInProd;
+    private BigDecimal qtaLav;
+    private BigDecimal qtaProd;
+    private BigDecimal qtaScartate;
+    private BigDecimal qtaTrasferite;
+    private BigDecimal rapConvLav;
+    private String serDoc;
+    private String untMisLav;
+
+
+    public String getDataOrd() {
+        return dataOrd;
+    }
+
+    public DtbOrdSteps setDataOrd(String dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public DtbOrdSteps setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public Integer getIdRiga() {
+        return idRiga;
+    }
+
+    public DtbOrdSteps setIdRiga(Integer idRiga) {
+        this.idRiga = idRiga;
+        return this;
+    }
+
+    public Integer getIdStep() {
+        return idStep;
+    }
+
+    public DtbOrdSteps setIdStep(Integer idStep) {
+        this.idStep = idStep;
+        return this;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public DtbOrdSteps setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+        return this;
+    }
+
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public DtbOrdSteps setActivityId(String activityId) {
+        this.activityId = activityId;
+        return this;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public DtbOrdSteps setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public String getCodDtip() {
+        return codDtip;
+    }
+
+    public DtbOrdSteps setCodDtip(String codDtip) {
+        this.codDtip = codDtip;
+        return this;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public DtbOrdSteps setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public DtbOrdSteps setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getCodProdPri() {
+        return codProdPri;
+    }
+
+    public DtbOrdSteps setCodProdPri(String codProdPri) {
+        this.codProdPri = codProdPri;
+        return this;
+    }
+
+    public String getDataDoc() {
+        return dataDoc;
+    }
+
+    public DtbOrdSteps setDataDoc(String dataDoc) {
+        this.dataDoc = dataDoc;
+        return this;
+    }
+
+    public String getDataFine() {
+        return dataFine;
+    }
+
+    public DtbOrdSteps setDataFine(String dataFine) {
+        this.dataFine = dataFine;
+        return this;
+    }
+
+    public String getDataIniz() {
+        return dataIniz;
+    }
+
+    public DtbOrdSteps setDataIniz(String dataIniz) {
+        this.dataIniz = dataIniz;
+        return this;
+    }
+
+    public String getDescrizioneAttivita() {
+        return descrizioneAttivita;
+    }
+
+    public DtbOrdSteps setDescrizioneAttivita(String descrizioneAttivita) {
+        this.descrizioneAttivita = descrizioneAttivita;
+        return this;
+    }
+
+    public String getFlagTipoTempo() {
+        return flagTipoTempo;
+    }
+
+    public DtbOrdSteps setFlagTipoTempo(String flagTipoTempo) {
+        this.flagTipoTempo = flagTipoTempo;
+        return this;
+    }
+
+    public Integer getHrNum() {
+        return hrNum;
+    }
+
+    public DtbOrdSteps setHrNum(Integer hrNum) {
+        this.hrNum = hrNum;
+        return this;
+    }
+
+    public BigDecimal getHrTime() {
+        return hrTime;
+    }
+
+    public DtbOrdSteps setHrTime(BigDecimal hrTime) {
+        this.hrTime = hrTime;
+        return this;
+    }
+
+    public String getIdRigaDoc() {
+        return idRigaDoc;
+    }
+
+    public DtbOrdSteps setIdRigaDoc(String idRigaDoc) {
+        this.idRigaDoc = idRigaDoc;
+        return this;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public DtbOrdSteps setNote(String note) {
+        this.note = note;
+        return this;
+    }
+
+    public String getNumDoc() {
+        return numDoc;
+    }
+
+    public DtbOrdSteps setNumDoc(String numDoc) {
+        this.numDoc = numDoc;
+        return this;
+    }
+
+    public Integer getNumFase() {
+        return numFase;
+    }
+
+    public DtbOrdSteps setNumFase(Integer numFase) {
+        this.numFase = numFase;
+        return this;
+    }
+
+    public BigDecimal getQtaAllocata() {
+        return qtaAllocata;
+    }
+
+    public DtbOrdSteps setQtaAllocata(BigDecimal qtaAllocata) {
+        this.qtaAllocata = qtaAllocata;
+        return this;
+    }
+
+    public BigDecimal getQtaDisp() {
+        return qtaDisp;
+    }
+
+    public DtbOrdSteps setQtaDisp(BigDecimal qtaDisp) {
+        this.qtaDisp = qtaDisp;
+        return this;
+    }
+
+    public BigDecimal getQtaDispImmessa() {
+        return qtaDispImmessa;
+    }
+
+    public DtbOrdSteps setQtaDispImmessa(BigDecimal qtaDispImmessa) {
+        this.qtaDispImmessa = qtaDispImmessa;
+        return this;
+    }
+
+    public BigDecimal getQtaImmesse() {
+        return qtaImmesse;
+    }
+
+    public DtbOrdSteps setQtaImmesse(BigDecimal qtaImmesse) {
+        this.qtaImmesse = qtaImmesse;
+        return this;
+    }
+
+    public BigDecimal getQtaInProd() {
+        return qtaInProd;
+    }
+
+    public DtbOrdSteps setQtaInProd(BigDecimal qtaInProd) {
+        this.qtaInProd = qtaInProd;
+        return this;
+    }
+
+    public BigDecimal getQtaLav() {
+        return qtaLav;
+    }
+
+    public DtbOrdSteps setQtaLav(BigDecimal qtaLav) {
+        this.qtaLav = qtaLav;
+        return this;
+    }
+
+    public BigDecimal getQtaProd() {
+        return qtaProd;
+    }
+
+    public DtbOrdSteps setQtaProd(BigDecimal qtaProd) {
+        this.qtaProd = qtaProd;
+        return this;
+    }
+
+    public BigDecimal getQtaScartate() {
+        return qtaScartate;
+    }
+
+    public DtbOrdSteps setQtaScartate(BigDecimal qtaScartate) {
+        this.qtaScartate = qtaScartate;
+        return this;
+    }
+
+    public BigDecimal getQtaTrasferite() {
+        return qtaTrasferite;
+    }
+
+    public DtbOrdSteps setQtaTrasferite(BigDecimal qtaTrasferite) {
+        this.qtaTrasferite = qtaTrasferite;
+        return this;
+    }
+
+    public BigDecimal getRapConvLav() {
+        return rapConvLav;
+    }
+
+    public DtbOrdSteps setRapConvLav(BigDecimal rapConvLav) {
+        this.rapConvLav = rapConvLav;
+        return this;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public DtbOrdSteps setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+        return this;
+    }
+
+    public String getUntMisLav() {
+        return untMisLav;
+    }
+
+    public DtbOrdSteps setUntMisLav(String untMisLav) {
+        this.untMisLav = untMisLav;
+        return this;
+    }
+}

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class MtbColr extends EntityBase {
@@ -56,6 +57,10 @@ public class MtbColr extends EntityBase {
 
     public MtbColr() {
         type = "mtb_colr";
+
+        if(SettingsManager.i().isUserLoggedIn()) {
+            setUtente(SettingsManager.i().getUser().getFullname());
+        }
     }
 
 

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

@@ -99,6 +99,10 @@ public class MtbColt extends EntityBase {
         type = "mtb_colt";
         setDataCollo(UtilityDate.getDateInstance());
         setSerCollo("/");
+
+        if(SettingsManager.i().isUserLoggedIn()) {
+            setPreparatoDa(SettingsManager.i().getUser().getFullname());
+        }
     }
 
     public MtbColt initDefaultFields() {

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

@@ -105,4 +105,6 @@ public class MtbTCol {
         this.circuito = circuito;
         return this;
     }
+
+
 }

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

@@ -3,10 +3,8 @@ package it.integry.integrywmsnative.core.rest;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.sql.Date;
 import java.util.concurrent.TimeUnit;
 
-import it.integry.integrywmsnative.core.rest.deserializer.DateDeserializer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
@@ -53,11 +51,12 @@ public class RESTBuilder {
         String endpoint = "http://" + host + ":" + port + "/" + (addEmsApi ? "ems-api/" : "");
 
         Gson gson = new GsonBuilder()
-                .registerTypeAdapter(Date.class, new DateDeserializer())
+                .setDateFormat("dd/MM/yyyy HH:mm:ss")
                 .create();
 
 
 
+
         Retrofit retrofit = new Retrofit.Builder()
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .baseUrl(endpoint)

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

@@ -40,11 +40,11 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void getByCodMart(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
-        getByCodMartStatic(codMartToFind, onComplete, onFailed);
+    public void getByCodMarts(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+        getByCodMartsStatic(codMartToFind, onComplete, onFailed);
     }
 
-    public static void getByCodMartStatic(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+    public static void getByCodMartsStatic(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
 
         String joinedCods = Stream.of(codMartToFind)
                 .collect(Collectors.joining(","));
@@ -67,4 +67,26 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
     }
 
+
+    public void getByCodMart(String codMartToFind, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed) {
+
+        ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        articoloRESTConsumer.getByCodMart(codMartToFind).enqueue(new Callback<ServiceRESTResponse<MtbAart>>() {
+            @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()) {
+                        onComplete.run(response.body().getEntityList().get(0));
+                    } else onComplete.run(null);
+
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<MtbAart>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
 }

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

@@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -32,6 +31,7 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -125,7 +125,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     }
 
-    public static void createColloLavorazione(int segno, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public void createColloLavorazione(int segno, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         MtbColt mtbColtToCreate = new MtbColt()
                 .setSegno(segno)
                 .setGestione(GestioneEnum.LAVORAZIONE);
@@ -136,16 +136,10 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .setOperation(CommonModelConsts.OPERATION.INSERT);
 
 
-        saveColloStatic(mtbColtToCreate, new ISimpleOperationCallback<MtbColt>() {
-            @Override
-            public void onSuccess(MtbColt value) {
-                if (onComplete != null) onComplete.run(value);
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if (onFailed != null) onFailed.run(ex);
-            }
+        saveCollo(mtbColtToCreate, value -> {
+            if (onComplete != null) onComplete.run(value);
+        }, ex -> {
+            if (onFailed != null) onFailed.run(ex);
         });
     }
 
@@ -212,7 +206,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt,MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
                 .initDefaultFields()
@@ -262,7 +256,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .setPartitaMag(original.getPartitaMag())
                 .setOperation(CommonModelConsts.OPERATION.INSERT);
         for (OrdineLavorazioneDTO ordLav : ordini) {
-            if (ordLav.getQtaColVersamento().getBigDecimal().compareTo(BigDecimal.ZERO) > 0){
+            if (ordLav.getQtaColVersamento().getBigDecimal().compareTo(BigDecimal.ZERO) > 0) {
                 MtbColr ordColr = (MtbColr) mtbColrClone.clone();
                 ordColr.setQtaCol(ordLav.getQtaColVersamento().getBigDecimal());
                 ordColr.setNumCnf(ordLav.getNumCnfVersamento().getBigDecimal());
@@ -290,12 +284,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public static void createColloFromEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public void createColloFromEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         createColloFromEtichettaAnonima(barcodeScanDTO.getStringValue(), gestione, onComplete, onFailed);
     }
 
-
-    public static void createColloFromEtichettaAnonima(String barcode, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public void createColloFromEtichettaAnonima(String barcode, GestioneEnum gestione, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt mtbColtToCreate = new MtbColt()
                 .setGestione(gestione);
@@ -321,39 +314,22 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         mtbColtToCreate
                 .setOperation(CommonModelConsts.OPERATION.INSERT);
 
-        saveColloStatic(mtbColtToCreate, new ISimpleOperationCallback<MtbColt>() {
-            @Override
-            public void onSuccess(MtbColt value) {
-                if (onComplete != null) onComplete.run(value);
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if (onFailed != null) onFailed.run(ex);
-            }
+        saveCollo(mtbColtToCreate, value -> {
+            if (onComplete != null) onComplete.run(value);
+        }, ex -> {
+            if (onFailed != null) onFailed.run(ex);
         });
     }
 
     public void deleteCollo(MtbColt mtbColtToDelete, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        ColliMagazzinoRESTConsumer.deleteColloStatic(mtbColtToDelete, onComplete, onFailed);
-    }
-
-    public static void deleteColloStatic(MtbColt mtbColtToDelete, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
         mtbColtToDelete.setOperation(CommonModelConsts.OPERATION.DELETE);
 
-        saveColloStatic(mtbColtToDelete, new ISimpleOperationCallback<MtbColt>() {
-            @Override
-            public void onSuccess(MtbColt value) {
-                if (onComplete != null) onComplete.run();
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if (onFailed != null) onFailed.run(ex);
-            }
+        saveCollo(mtbColtToDelete, value -> {
+            if (onComplete != null) onComplete.run();
+        }, ex -> {
+            if (onFailed != null) onFailed.run(ex);
         });
-
     }
 
     public static void distribuisciCollo(MtbColt mtbColtToDistribute, DistribuzioneColloDTO.CriterioDistribuzione criterioDistribuzione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -411,7 +387,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                     if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
                         List<MtbColt> mtbColtList = new ArrayList<>();
                         mtbColtList.add(mtbColt);
-                        fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
+                        fillMtbAartsOfMtbColtsStatic(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
                     } else {
                         onComplete.run(mtbColt);
                     }
@@ -426,8 +402,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed);
+    }
 
-    public static void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public static void fillMtbAartsOfMtbColtsStatic(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         List<String> codMarts = new ArrayList<>();
 
         for (MtbColt mtbColt : mtbColts) {
@@ -439,7 +418,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
 
-        ArticoloRESTConsumer.getByCodMartStatic(codMarts, arts -> {
+        ArticoloRESTConsumer.getByCodMartsStatic(codMarts, arts -> {
 
             if (arts != null && arts.size() > 0) {
                 for (MtbColt mtbColt : mtbColts) {
@@ -505,81 +484,65 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     }
 
     public static void getByTestataStatic(MtbColt testata, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        String ssccString = null;
+        testata.setMtbColr(new ObservableArrayList<>());
 
-        if (testata.getSerCollo().equalsIgnoreCase(CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE)) {
-            ssccString = "U";
 
-            SimpleDateFormat sdf = new SimpleDateFormat("yy");
-            ssccString += sdf.format(testata.getDataColloD());
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.getColloInGiac(onlyResiduo, throwExcIfNull, testata).enqueue(new Callback<ServiceRESTResponse<MtbColt>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
+                analyzeAnswer(response, "getColloInGiac", mtbColt -> {
 
-            ssccString += String.format("%07d", testata.getNumCollo());
-        } else {
-            ssccString = "";
+                    if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                        List<MtbColt> mtbColtList = new ArrayList<>();
+                        mtbColtList.add(mtbColt);
+                        fillMtbAartsOfMtbColtsStatic(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
+                    } else {
+                        onComplete.run(mtbColt);
+                    }
 
-            switch (testata.getGestioneEnum()) {
-                case ACQUISTO:
-                    ssccString += "1";
-                    break;
-
-                case LAVORAZIONE:
-                    ssccString += "2";
-                    break;
-
-                case VENDITA:
-                    ssccString += "3";
-                    break;
+                }, onFailed);
             }
 
-            SimpleDateFormat sdf = new SimpleDateFormat("yy");
-            ssccString += sdf.format(testata.getDataColloD());
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
 
-            ssccString += String.format("%05d", testata.getNumCollo());
-            ssccString += "0";
+
+    public void changePosizione(MtbColt mtbColtToMove, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        String codMdep = posizione.getCodMdep();
+        String posizioneString = posizione.getPosizione();
+
+        MtbColt mtbColtToMoveClone = (MtbColt) mtbColtToMove.clone();
+
+        for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
+            mtbColtToMoveClone.getMtbColr().get(i)
+                    .setMtbAart(null)
+                    .setMtbPartitaMag(null);
         }
 
-        getBySSCCStatic(ssccString, onlyResiduo, throwExcIfNull, onComplete, onFailed);
-    }
-
-
-    public static void changePosizione(MtbColt mtbColtToSave, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        MtbColt mtbColtToSaveClone = (MtbColt) mtbColtToSave.clone();
-
-        mtbColtToSaveClone.setOperation(CommonModelConsts.OPERATION.UPDATE);
-        mtbColtToSaveClone.setMtbColr(new ObservableArrayList<>());
-
-        if (posizione == null) mtbColtToSaveClone.setPosizione(null);
-        else mtbColtToSaveClone.setPosizione(posizione.getPosizione());
-
-        ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtToSaveClone, mtbColt -> {
-            if (onComplete != null) onComplete.run();
-        }, ex -> {
-            if (onFailed != null) onFailed.run(ex);
-        });
-
-    }
-
-
-    public void updateRiga(MtbColr mtbColrToUpdate, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        updateRigaStatic(mtbColrToUpdate, onComplete, onFailed);
-    }
-
-    public static void updateRigaStatic(MtbColr mtbColrToUpdate, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        MtbColt mtbColt = new MtbColt()
-                .setGestione(mtbColrToUpdate.getGestioneEnum())
-                .setNumCollo(mtbColrToUpdate.getNumCollo())
-                .setSerCollo(mtbColrToUpdate.getSerCollo())
-                .setDataCollo(mtbColrToUpdate.getDataColloS());
-
-        mtbColt.getMtbColr().add(mtbColrToUpdate);
-
-        mtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
-        mtbColrToUpdate.setOperation(CommonModelConsts.OPERATION.UPDATE);
-
-        EntityRESTConsumer.processEntity(mtbColt, value -> {
-            if(onComplete != null) onComplete.run();
-        }, onFailed, MtbColt.class);
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService
+                .spostaULInPosizione(codMdep,
+                        posizioneString,
+                        mtbColtToMoveClone)
+                .enqueue(new Callback<ServiceRESTResponse<Object>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                        analyzeAnswer(response, "changePosizione", mtbColts -> {
+                            onComplete.run();
+                        }, onFailed);
+                    }
 
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                        if (onFailed != null) onFailed.run(new Exception(t));
+                    }
+                });
     }
 
     public void updateDataFine(MtbColt mtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
@@ -659,7 +622,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<MtbColt>>> call, Response<ServiceRESTResponse<List<MtbColt>>> response) {
                 analyzeAnswer(response, "getColliInBasket", mtbColts -> {
-                    fillMtbAartsOfMtbColts(mtbColts, onComplete, onFailed);
+                    fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed);
                 }, onFailed);
             }
 
@@ -670,12 +633,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-
-
-
-
-
-    public static void creaRettificaColloStatic(MtbColr sourceMtbColrOriginal, BigDecimal newNumCnf, BigDecimal newQtaTot, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
+    public void creaRettificaCollo(MtbColr sourceMtbColrOriginal, BigDecimal newNumCnf, BigDecimal newQtaTot, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
         MtbColr sourceMtbColr = (MtbColr) sourceMtbColrOriginal.clone();
         sourceMtbColr.setMtbPartitaMag(null);
         sourceMtbColr.setMtbAart(null);
@@ -692,22 +650,48 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         ).enqueue(new Callback<ServiceRESTResponse<MtbColr>>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbColr>> call, Response<ServiceRESTResponse<MtbColr>> response) {
-                analyzeAnswer(response, "creaRettificaCollo", data -> {
-                    onComplete.run(data);
-                }, onFailed);
+                analyzeAnswer(response, "creaRettificaCollo", onComplete, onFailed);
             }
 
             @Override
             public void onFailure(Call<ServiceRESTResponse<MtbColr>> call, Throwable t) {
-                if(onFailed != null) onFailed.run(new Exception(t));
+                if (onFailed != null) onFailed.run(new Exception(t));
             }
         });
     }
 
+    public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone();
+        MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone();
 
+        for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) {
+            mtbColtToMoveClone.getMtbColr().get(i)
+                    .setMtbAart(null)
+                    .setMtbPartitaMag(null);
+        }
 
-    public void creaRettificaCollo(MtbColr sourceMtbColrOriginal, BigDecimal newNumCnf, BigDecimal newQtaTot, RunnableArgs<MtbColr> onComplete, RunnableArgs<Exception> onFailed) {
-        creaRettificaColloStatic(sourceMtbColrOriginal, newNumCnf, newQtaTot, onComplete, onFailed);
+        mtbColtDestClone.setMtbColr(null);
+
+        SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO()
+                .setSourceMtbColt(mtbColtToMoveClone)
+                .setDestinationMtbColt(mtbColtDestClone);
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.spostaArtsTraUL(
+                spostaArtsTraULRequestDTO
+        ).enqueue(new Callback<ServiceRESTResponse<Object>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                analyzeAnswer(response, "spostaArtsTraUL", data -> {
+                    onComplete.run();
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                if (onFailed != null) onFailed.run(new Exception(t));
+            }
+        });
     }
 
 }

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

@@ -9,6 +9,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO;
 import it.integry.integrywmsnative.core.rest.model.RettificaULDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -23,10 +24,19 @@ public interface ColliMagazzinoRESTConsumerService {
     @POST("getColloByBarcode")
     Call<ServiceRESTResponse<MtbColt>> getColloByBarcode(@Query("codBarreCollo") String sscc, @Query("onlyResiduo") boolean onlyResiduo, @Query("throwExcIfNull") boolean throwExcIfNull);
 
+    @POST("getColloInGiac")
+    Call<ServiceRESTResponse<MtbColt>> getColloInGiac(@Query("onlyResiduo") boolean onlyResiduo, @Query("throwExcIfNull") boolean throwExcIfNull, @Body MtbColt mtbColt);
+
     @GET("getColliInBasket")
     Call<ServiceRESTResponse<List<MtbColt>>> getColliInBasket(@Query("codMdep") String codMdep);
 
     @POST("creaRettificaCollo")
     Call<ServiceRESTResponse<MtbColr>> creaRettificaCollo(@Query("codMdep") String codMdep, @Body RettificaULDTO rettificaULDTO);
 
+    @POST("wms/spostaULInPosizione")
+    Call<ServiceRESTResponse<Object>> spostaULInPosizione(@Query("codMdep") String codMdep, @Query("posizione") String posizione, @Body MtbColt mtbColtToMove);
+
+    @POST("wms/spostaArtsTraUL")
+    Call<ServiceRESTResponse<Object>> spostaArtsTraUL(@Body SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO);
+
 }

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

@@ -6,15 +6,18 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbTCol;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 
+@Singleton
 public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
 
 
 
-    public static void getTipoCollo(String codTcol, RunnableArgs<MtbTCol> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getTipoCollo(String codTcol, RunnableArgs<MtbTCol> onComplete, RunnableArgs<Exception> onFailed) {
         String baseSql = "SELECT * " +
                 "FROM mtb_tcol " +
                 "WHERE cod_tcol = " + UtilityDB.valueToString(codTcol);
@@ -36,7 +39,11 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public static void getTipiCollo(RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getTipiCollo(RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
+        getTipiColloStatic(onComplete, onFailed);
+    }
+
+    public static void getTipiColloStatic(RunnableArgs<List<MtbTCol>> onComplete, RunnableArgs<Exception> onFailed) {
         String baseSql = "SELECT * " +
                 "FROM mtb_tcol ";
 

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

@@ -1,31 +1,93 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.JtbFasi;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+@Singleton
 public class MesRESTConsumer extends _BaseRESTConsumer {
 
-    public static void getOrdiniLavorazioneMateriale(String codJfas, String idMateriale, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed){
+    private final SystemRESTConsumer mSystemRESTConsumer;
+
+    public MesRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+    }
+
+    public static void getOrdiniLavorazioneMateriale(String codJfas, String idMateriale, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
-        mesRESTConsumerService.getOrdiniLavorazioneMateriale(codJfas,idMateriale).enqueue(new Callback<ServiceRESTResponse<List<OrdineLavorazioneDTO>>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
-                analyzeAnswer(response, "getAvailablePosizioni", (m) -> onComplete.run(response.body().getDto()), onFailed);
-            }
 
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
-            }
-        });
+        mesRESTConsumerService.getOrdiniLavorazioneMateriale(codJfas, idMateriale)
+                .enqueue(new Callback<ServiceRESTResponse<List<OrdineLavorazioneDTO>>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
+                        analyzeAnswer(response, "getOrdiniLavorazioneMateriale", (m) -> onComplete.run(response.body().getDto()), onFailed);
+                    }
 
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void getOrdiniLavorazione(String flagEvaso, String codJfas, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
+
+        mesRESTConsumerService.getOrdiniLavorazione(flagEvaso, codJfas)
+                .enqueue(new Callback<ServiceRESTResponse<List<OrdineLavorazioneDTO>>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
+                        analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void getOrdiniLavorazione(Date dateStart, String flagEvaso, String codJfas, RunnableArgs<List<OrdineLavorazioneDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class);
+
+        mesRESTConsumerService.getOrdiniLavorazione(UtilityDate.formatDate(dateStart, UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH), flagEvaso, codJfas)
+                .enqueue(new Callback<ServiceRESTResponse<List<OrdineLavorazioneDTO>>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> response) {
+                        analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void getLineeProduzione(String codJfasParent, RunnableArgs<List<JtbFasi>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<JtbFasi>>() {}.getType();
+        this.mSystemRESTConsumer.processSql(
+                "SELECT * FROM jtb_fasi WHERE cod_jfas_parent = " + UtilityDB.valueToString(codJfasParent),
+                typeOfObjectsList,
+                onComplete,
+                onFailed);
     }
 
 }

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

@@ -14,4 +14,12 @@ public interface MesRESTConsumerService {
     @GET("mes_v2/getOrdiniLavorazioneMateriale")
     Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> getOrdiniLavorazioneMateriale(@Query("codJfas") String codJfas, @Query("idMateriale") String idMateriale);
 
+
+    @GET("mes_v2/getOrdiniLavorazione")
+    Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> getOrdiniLavorazione(@Query("flagEvaso") String flagEvaso, @Query("codJfas") String codJfas);
+
+
+    @GET("mes_v2/getOrdiniLavorazione")
+    Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> getOrdiniLavorazione(@Query("startDate") String startDate, @Query("flagEvaso") String flagEvaso, @Query("codJfas") String codJfas);
+
 }

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

@@ -8,12 +8,11 @@ import java.util.List;
 
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.rest.RESTBuilder;
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -28,8 +27,30 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
         this.mSystemRESTConsumer = systemRESTConsumer;
     }
 
+    public void getPosizioneFromString(String posizione, RunnableArgs<MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
+        String sql = "SELECT TOP 1 mtb_depo_posizioni.*," +
+                " CASE WHEN jtb_fasi.cod_jfas IS NULL THEN 'N' ELSE 'S' END AS flag_linea_produzione " +
+                " FROM mtb_depo_posizioni " +
+                " LEFT OUTER JOIN jtb_fasi " +
+                " ON mtb_depo_posizioni.posizione = jtb_fasi.cod_jfas " +
+                " WHERE posizione = " + UtilityDB.valueToString(posizione);
+
+        SystemRESTConsumer.processSqlStatic(sql, MtbDepoPosizione.class, new ISimpleOperationCallback<MtbDepoPosizione>() {
+            @Override
+            public void onSuccess(MtbDepoPosizione value) {
+                if(onComplete != null) onComplete.run(value);
+            }
+
+            @Override
+            public void onFailed(Exception ex) {
+                if(onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
     public static void getAvailablePosizioni(RunnableArgs<List<MtbDepoPosizione>> onComplete, RunnableArgs<Exception> onFailed) {
-        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+//        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+        String codMdep = null;
 
         PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class);
         posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<ServiceRESTResponse<List<MtbDepoPosizione>>>() {
@@ -47,11 +68,8 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
         });
     }
 
-    public void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-        getBancaliInPosizioneStatic(mtbDepoPosizione, onComplete, onFailed);
-    }
 
-    public static void getBancaliInPosizioneStatic(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         String sql = "SELECT * FROM mtb_colt WHERE segno > 0 AND cod_mdep = " + UtilityDB.valueToString(mtbDepoPosizione.getCodMdep()) + " AND posizione = " + UtilityDB.valueToString(mtbDepoPosizione.getPosizione());
 
 

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

@@ -9,6 +9,7 @@ import java.lang.reflect.Type;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class DateDeserializer implements JsonDeserializer<Date> {
 
@@ -16,6 +17,8 @@ public class DateDeserializer implements JsonDeserializer<Date> {
     public Date deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException {
         String date = element.getAsString();
 
+        if (UtilityString.isNullOrEmpty(date)) return null;
+
         return UtilityDate.recognizeDateWithExceptionHandler(date);
     }
 }

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

@@ -0,0 +1,30 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class SpostaArtsTraULRequestDTO {
+
+
+    private MtbColt sourceMtbColt;
+
+    private MtbColt destinationMtbColt;
+
+    public MtbColt getSourceMtbColt() {
+        return sourceMtbColt;
+    }
+
+    public SpostaArtsTraULRequestDTO setSourceMtbColt(MtbColt sourceMtbColt) {
+        this.sourceMtbColt = sourceMtbColt;
+        return this;
+    }
+
+    public MtbColt getDestinationMtbColt() {
+        return destinationMtbColt;
+    }
+
+    public SpostaArtsTraULRequestDTO setDestinationMtbColt(MtbColt destinationMtbColt) {
+        this.destinationMtbColt = destinationMtbColt;
+        return this;
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/DateSerializer.java

@@ -0,0 +1,21 @@
+package it.integry.integrywmsnative.core.rest.serializer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+import java.util.Date;
+
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class DateSerializer implements JsonSerializer<Date> {
+
+    @Override
+    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
+        String dateString = UtilityDate.formatDate(src, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
+
+        return src == null ? null : new JsonPrimitive(dateString);
+    }
+}

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

@@ -33,8 +33,10 @@ public class DBSettingsModel {
     private boolean flagForceAllToColli;
     private boolean flagSpedizioneEnableManualPick;
     private boolean flagSpedizioneCanSelectMultipleOrders;
+    private boolean flagSpedizioneUseQtaOrd;
     private String produzioneDefaultCodAnag;
     private String reportNameSpedizionChiudiOrdine;
+    private int onNumCnfInputChanged = 1;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -234,6 +236,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagSpedizioneUseQtaOrd() {
+        return flagSpedizioneUseQtaOrd;
+    }
+
+    public DBSettingsModel setFlagSpedizioneUseQtaOrd(boolean flagSpedizioneUseQtaOrd) {
+        this.flagSpedizioneUseQtaOrd = flagSpedizioneUseQtaOrd;
+        return this;
+    }
+
     public String getProduzioneDefaultCodAnag() {
         return produzioneDefaultCodAnag;
     }
@@ -251,4 +262,13 @@ public class DBSettingsModel {
         this.reportNameSpedizionChiudiOrdine = reportNameSpedizionChiudiOrdine;
         return this;
     }
+
+    public int getOnNumCnfInputChanged() {
+        return onNumCnfInputChanged;
+    }
+
+    public DBSettingsModel setOnNumCnfInputChanged(int onNumCnfInputChanged) {
+        this.onNumCnfInputChanged = onNumCnfInputChanged;
+        return this;
+    }
 }

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

@@ -258,6 +258,14 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
                 .setKeySection("REPORT_PACKING_LIST"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_USE_QTA_ORD"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("ON_NUM_CNF_INPUT_CHANGED"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@@ -281,6 +289,12 @@ public class SettingsManager {
             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));
+
+            Integer onNumCnfInputChanged = getValueFromList(list, "SETUP", "ON_NUM_CNF_INPUT_CHANGED", Integer.class);
+            if(onNumCnfInputChanged != null) {
+                dbSettingsModelIstance.setOnNumCnfInputChanged(onNumCnfInputChanged);
+            }
 
             if(onComplete != null) onComplete.run();
         }, onFailed);
@@ -298,6 +312,8 @@ public class SettingsManager {
             return clazz.cast(value.getValue());
         } else if(clazz == Boolean.class) {
             return clazz.cast("S".equalsIgnoreCase(value.getValue()));
+        } else if(clazz == Integer.class && value.getValue() != null) {
+            return clazz.cast(Integer.parseInt(value.getValue()));
         } else return null;
 
     }

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

@@ -33,19 +33,24 @@ public class UtilityBarcode {
     }
 
     public static boolean isEtichettaPosizione(BarcodeScanDTO barcodeScanDTO) {
+        return isEtichettaPosizione(barcodeScanDTO, true);
+    }
+
+    public static boolean isEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, boolean enableCheckCodMdep) {
+        String currentCodMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+
         String barcode = barcodeScanDTO.getStringValue();
         boolean isPosizione = false;
 
         if(SettingsManager.iDB().getAvailablePosizioni() != null) {
             Stream<MtbDepoPosizione> tmpStream = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
-                    .filter(x -> x.getPosizione().equalsIgnoreCase(barcode));
+                    .filter(x -> x.getPosizione().equalsIgnoreCase(barcode) && (!enableCheckCodMdep || currentCodMdep.equalsIgnoreCase(x.getCodMdep())));
 
             if(tmpStream.count() > 0){
                isPosizione = true;
             }
         }
 
-
         return isPosizione;
     }
 

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

@@ -2,17 +2,28 @@ package it.integry.integrywmsnative.core.utility;
 
 import android.content.Context;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class UtilityContext {
 
     private static Context mApplicationContext;
+    private static AppCompatActivity mMainActivity;
 
     public static void initApplicationContext(Context context) {
         mApplicationContext = context;
     }
 
+    public static void initMainActivity(AppCompatActivity mainActivity) {
+        mMainActivity = mainActivity;
+    }
+
 
     public static Context getApplicationContext() {
         return mApplicationContext;
     }
 
+    public static AppCompatActivity getMainActivity() {
+        return mMainActivity;
+    }
+
 }

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

@@ -2,10 +2,8 @@ package it.integry.integrywmsnative.core.utility;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.TimeZone;
 
 import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
 import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
@@ -19,9 +17,15 @@ public class UtilityDate {
     public static class COMMONS_DATE_FORMATS {
         public static final String DMY_SLASH = "dd/MM/yyyy";
         public static final String YMD_SLASH = "yyyy/MM/dd";
+        public static final String DM_SLASH = "dd/MM";
+        public static final String MD_SLASH = "MM/dd";
         public static final String YMD_DASH = "yyyy-MM-dd";
         public static final String DMY_TIME_SLASH = DMY_SLASH + " HH:mm:ss";
         public static final String YMD_TIME_SLASH = YMD_SLASH + " HH:mm:ss";
+        public static final String DM_TIME_SLASH = DM_SLASH + " HH:mm";
+        public static final String MD_TIME_SLASH = MD_SLASH + " HH:mm";
+        public static final String TIME = "HH:mm";
+        public static final String TIME_W_SECS = "HH:mm:ss";
 
 
         public static final String DM_HUMAN = "dd MMM";

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

@@ -8,6 +8,14 @@ import androidx.fragment.app.DialogFragment;
 
 public class UtilityDialog {
 
+
+
+    public static void setTo60PercentWidth(Context context, DialogFragment dialog) {
+        int width = (int)(context.getResources().getDisplayMetrics().widthPixels*0.60);
+
+        dialog.getDialog().getWindow().setLayout(width, LinearLayout.LayoutParams.MATCH_PARENT);
+    }
+
     public static void setTo90PercentWidth(Context context, Dialog dialog) {
         int width = (int)(context.getResources().getDisplayMetrics().widthPixels*0.90);
 

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.utility;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.DisplayMetrics;
@@ -22,4 +23,14 @@ public class UtilityDimension {
         return Math.round(px);
     }
 
+
+    public static double getDisplayInchs(Activity activity) {
+        DisplayMetrics metrics = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        float yInches= metrics.heightPixels/metrics.ydpi;
+        float xInches= metrics.widthPixels/metrics.xdpi;
+        return Math.sqrt(xInches*xInches + yInches*yInches);
+    }
+
 }

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

@@ -4,12 +4,15 @@ import android.app.Dialog;
 import android.content.Context;
 import android.text.SpannableString;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.Logger;
 
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class UtilityExceptions {
 
@@ -43,8 +46,17 @@ public class UtilityExceptions {
             if(ex.getCause() != null) errorMessage += "<br />" + ex.getCause().getMessage();
         }
 
-        if(context != null) {
-            DialogSimpleMessageHelper.makeErrorDialog(context, new SpannableString(errorMessage), null, null).show();
+        FragmentManager fm = null;
+
+        if(context != null && context instanceof FragmentActivity) {
+            fm = ((FragmentActivity) context).getSupportFragmentManager();
+        } else if(UtilityContext.getMainActivity() != null) {
+            fm = UtilityContext.getMainActivity().getSupportFragmentManager();
+        }
+
+        if(fm != null) {
+            DialogSimpleMessageView.makeErrorDialog(new SpannableString(errorMessage), null, null)
+                    .show(fm, "tag");
         }
 
         if(!BuildConfig.DEBUG) {

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

@@ -1,11 +1,8 @@
 package it.integry.integrywmsnative.core.utility;
 
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.Context;
-import android.widget.ProgressBar;
 
-import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.view.dialogs.DialogProgress;
 
 public class UtilityProgress {
@@ -26,27 +23,4 @@ public class UtilityProgress {
         return progress;
     }
 
-
-    public static Thread makeProgressBarIndeterminate(ProgressBar progressBar) {
-        progressBar.setMax(100);
-
-        Thread updateProgressThread = new Thread(() -> {
-
-            try {
-                while (true) {
-                    for (int i = 0; i < 100; i++) {
-                        progressBar.setProgress(i);
-                        Thread.sleep(10);
-                    }
-                }
-            } catch (Exception ex) {
-//                String message = ex.toString();
-            }
-        });
-
-        updateProgressThread.start();
-
-        return updateProgressThread;
-    }
-
 }

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

@@ -23,7 +23,7 @@ public class UtilityString {
     }
 
     public static String empty2null(String stringToCheck) {
-        return (stringToCheck != null && stringToCheck.trim().length() == 0 || stringToCheck == null) ? null : stringToCheck.trim();
+        return (stringToCheck == null || stringToCheck.trim().length() == 0) ? null : stringToCheck.trim();
     }
 
     public static String capitalizeWords(String capString){
@@ -68,11 +68,11 @@ public class UtilityString {
     }
 
     public static Spanned formatHtmlString(String format, String... params){
-        return Html.fromHtml(String.format(format,params));
+        return Html.fromHtml(String.format(format, (Object[]) params));
     }
 
     public static Spanned formatHtmlStringFromResId(@StringRes int stringId, String... params){
-        return Html.fromHtml(String.format(UtilityResources.getString(stringId),params));
+        return Html.fromHtml(String.format(UtilityResources.getString(stringId), (Object[]) params));
     }
 
 

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

@@ -41,7 +41,7 @@ import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
 import it.integry.integrywmsnative.gest.accettazione.rest.OrdiniAccettazioneRESTConsumer;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingActivity;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment {
 
@@ -187,8 +187,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
                         .count();
 
 
-                DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
-                getText(R.string.orders).toString(),
+                DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(),
                                 Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter)
                                 + "<br /><br />" +
                                 "<b>" + artsCounter + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, (int) artsCounter)),
@@ -203,14 +202,17 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
                     myIntent.putExtra("keySitArts", cacheSitArtItemID);
                     getActivity().startActivity(myIntent);
 
-                }).show();
+                }).show(getActivity().getSupportFragmentManager(), "tag");
 
             }, ex -> {
                 progress.dismiss();
 
                 String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
                 if(errorMessage == null) errorMessage = ex.getMessage() + "\n" + ex.getCause().getCause().getMessage();
-                DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show();
+
+                DialogSimpleMessageView
+                        .makeErrorDialog(new SpannableString(errorMessage), null, null)
+                        .show(getActivity().getSupportFragmentManager(), "tag");
             });
 
 

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

@@ -60,7 +60,7 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGExcep
 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.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
@@ -245,7 +245,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getNumCnf)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -254,14 +254,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getQtaCol)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
 
-
                     if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
                         accettazioneListModel.setQtaEvasa(numCnfEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
@@ -308,7 +307,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getNumCnf)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -317,14 +316,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getQtaCol)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                     }
 
 
-
                     if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
                         accettazioneListModel.setQtaEvasa(numCnfEvasa);
                         accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
@@ -371,7 +369,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getNumCnf)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -380,7 +378,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getQtaCol)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -431,7 +429,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getNumCnf)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -440,7 +438,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     //Calc qta col
                     BigDecimal qtaEvasa = BigDecimal.ZERO;
 
-                    if(x.getWithdrawMtbColrs().size() > 0) {
+                    if (x.getWithdrawMtbColrs().size() > 0) {
                         qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
                                 .map(MtbColr::getQtaCol)
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -535,7 +533,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     public void startListaBancaliRegistratiActivity(ArrayList<RecoverMtbColt> mtbColts) {
 
         Intent myIntent = ListaBancaliActivity.createIntent(this,
-                Stream.of(mtbColts).map(x -> (MtbColt)x).toList(),
+                Stream.of(mtbColts).map(x -> (MtbColt) x).toList(),
                 input -> ((RecoverMtbColt) input).isFlagCanBeRecovered(),
                 PrinterRESTConsumer.Type.SECONDARIA,
                 ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
@@ -546,7 +544,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     public void onLUSuccessullyPrinted() {
         Resources res = getResources();
         String errorMessage = res.getText(R.string.alert_print_completed_message).toString();
-        DialogSimpleMessageHelper.makeSuccessDialog(this, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show();
+        DialogSimpleMessageView
+                .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null)
+                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -556,13 +556,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     @Override
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.closeProgress();
-        DialogSimpleMessageHelper.makeErrorDialog(
-                this,
+        DialogSimpleMessageView.makeErrorDialog(
                 new SpannableString(ex.getMessage()),
                 null,
                 null,
                 R.string.button_ignore_print,
-                onComplete).show();
+                onComplete)
+            .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -599,7 +599,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     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);
@@ -664,12 +664,11 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     @Override
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
         String text = getResources().getString(R.string.alert_delete_mtb_colr);
-        DialogSimpleMessageHelper.makeWarningDialog(this,
-                new SpannableString(text),
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
                 null,
                 () -> onComplete.run(true),
                 () -> onComplete.run(false)
-        ).show();
+        ).show(getSupportFragmentManager(), "tag");
     }
 
     @Override

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

@@ -98,10 +98,13 @@ public class AccettazionePickingViewModel {
 
     public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep) {
         this.mOrders = orders;
-        this.mSitArts = sitArts;
         this.mDefaultCodMdep = codMdep;
 
-        getEmptyPickingList(sitArts, pickingObjectList -> {
+        this.mSitArts = Stream.of(sitArts)
+                .filter(x -> UtilityBigDecimal.greaterThan(x.getNumCnfDaEvadere(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO))
+                .toList();
+
+        getEmptyPickingList(this.mSitArts, pickingObjectList -> {
             this.mPickingList.postValue(pickingObjectList);
         });
 
@@ -136,11 +139,12 @@ public class AccettazionePickingViewModel {
     }
 
     private void getEmptyPickingList(List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<PickingObjectDTO>> onComplete) {
+
         List<String> codMarts = Stream.of(sitArtOrdList)
                 .map(SitArtOrdDTO::getCodMart)
                 .toList();
 
-        this.mArticoloRESTConsumer.getByCodMart(codMarts, listMtbAarts -> {
+        this.mArticoloRESTConsumer.getByCodMarts(codMarts, listMtbAarts -> {
             List<PickingObjectDTO> pickingList = Stream.of(sitArtOrdList)
                     .map(sitArtOrdDTO -> {
                         MtbAart mtbAart = null;
@@ -169,7 +173,7 @@ public class AccettazionePickingViewModel {
     public void retrieveExistentLU(RunnableArgs<ArrayList<RecoverMtbColt>> onComplete) {
         this.sendOnLoadingStarted();
 
-        this.mAccettazionePickingRESTConsumer.getBancaliGiaRegistrati(this.mSitArts, mtbColtList -> {
+        this.mAccettazionePickingRESTConsumer.getBancaliGiaRegistrati(this.mOrders, mtbColtList -> {
             this.sendOnLoadingEnded();
             onComplete.run(mtbColtList);
         }, this::sendError);

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java

@@ -16,7 +16,7 @@ import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
-import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
+import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
 
 @Singleton
 public class AccettazionePickingRESTConsumer {
@@ -28,18 +28,18 @@ public class AccettazionePickingRESTConsumer {
         this.mSystemRestConsumer = systemRESTConsumer;
     }
 
-    public void getBancaliGiaRegistrati(List<SitArtOrdDTO> ordiniToShow, RunnableArgs<ArrayList<RecoverMtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getBancaliGiaRegistrati(List<OrdineAccettazioneInevasoDTO> ordiniToShow, RunnableArgs<ArrayList<RecoverMtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         List<HashMap<String, Object>> whereCondListMap = new ArrayList<>();
 
         Stream
                 .of(ordiniToShow)
-                .distinctBy(x -> x.getDataOrd() + " " + x.getGestione() + " " + x.getNumOrd())
+                .distinctBy(x -> x.getData() + " " + x.getGestione() + " " + x.getNumero())
                 .forEach(x -> {
                     try {
                         HashMap<String, Object> whereCondMap = new HashMap<>();
-                        whereCondMap.put("mtb_colr.data_ord", UtilityDate.recognizeDate(x.getDataOrd()));
+                        whereCondMap.put("mtb_colr.data_ord", UtilityDate.recognizeDate(x.getData()));
                         whereCondMap.put("mtb_colr.gestione", x.getGestione().equalsIgnoreCase("P") ? "L" : x.getGestione());
-                        whereCondMap.put("mtb_colr.num_ord", x.getNumOrd());
+                        whereCondMap.put("mtb_colr.num_ord", x.getNumero());
 
                         whereCondListMap.add(whereCondMap);
                     } catch (Exception ex) {

app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java

@@ -7,7 +7,6 @@ import android.text.SpannableString;
 
 import androidx.core.content.ContextCompat;
 import androidx.databinding.ObservableField;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import it.integry.integrywmsnative.R;
@@ -24,7 +23,8 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity;
 import it.integry.integrywmsnative.gest.contenuto_bancale.core.ContenutoBancaleListAdapter;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -66,7 +66,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
 
         mContext.bindings.contenutoBancaleMainList.setLayoutManager(new LinearLayoutManager(mContext));
 
-        DividerItemDecoration itemDecorator = new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL);
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(mContext, SimpleDividerItemDecoration.VERTICAL);
         itemDecorator.setDrawable(ContextCompat.getDrawable(mContext, R.drawable.divider));
         mContext.bindings.contenutoBancaleMainList.addItemDecoration(itemDecorator);
 
@@ -118,7 +118,9 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
 
                                 Resources res = mContext.getResources();
                                 String errorMessage = res.getText(R.string.alert_print_completed_message).toString();
-                                DialogSimpleMessageHelper.makeSuccessDialog(mContext, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show();
+                                DialogSimpleMessageView
+                                        .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null)
+                                        .show(mContext.getSupportFragmentManager(), "tag");
                             }, ex -> UtilityExceptions.defaultException(mContext, ex, progress));
 
                 } catch (Exception ex) {
@@ -128,7 +130,9 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
             } else {
                 progress.dismiss();
                 String errorMessage = "Nessuna stampante configurata";
-                DialogSimpleMessageHelper.makeWarningDialog(mContext, new SpannableString(errorMessage), null, null).show();
+                DialogSimpleMessageView
+                        .makeWarningDialog(new SpannableString(errorMessage), null, null)
+                        .show(mContext.getSupportFragmentManager(), "tag");;
             }
         }, ex -> {
             UtilityExceptions.defaultException(mContext, ex, progress);

app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java

@@ -2,22 +2,22 @@ package it.integry.integrywmsnative.gest.lista_bancali.viewmodel;
 
 import android.app.Dialog;
 
-import androidx.databinding.ObservableArrayList;
 import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
 import it.integry.integrywmsnative.gest.lista_bancali.core.MainListListaColliAdapter;
+import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 
 public class ListaBancaliViewModel implements IRecyclerItemClicked<MtbColt> {
 
@@ -42,7 +42,7 @@ public class ListaBancaliViewModel implements IRecyclerItemClicked<MtbColt> {
         mContext.bindings.listaColliMainList.setHasFixedSize(true);
         mContext.bindings.listaColliMainList.setLayoutManager(new LinearLayoutManager(mContext));
 
-        DividerItemDecoration itemDecorator = new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL);
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(mContext, SimpleDividerItemDecoration.VERTICAL);
         itemDecorator.setDrawable(ContextCompat.getDrawable(mContext, R.drawable.divider));
         mContext.bindings.listaColliMainList.addItemDecoration(itemDecorator);
 
@@ -63,7 +63,7 @@ public class ListaBancaliViewModel implements IRecyclerItemClicked<MtbColt> {
             ColliMagazzinoRESTConsumer.getByTestataStatic(item, mLoadOnlyResiduo, false, mtbColt -> {
 
                 ObservableArrayList<MtbColr> mtbColrObservableArrayList = new ObservableArrayList<>();
-                mtbColrObservableArrayList.addAll(mtbColt.getMtbColr());
+                if(mtbColt != null && mtbColt.getMtbColr() != null) mtbColrObservableArrayList.addAll(mtbColt.getMtbColr());
                 item.setMtbColr(mtbColrObservableArrayList);
 
                 progress.dismiss();

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

@@ -28,7 +28,7 @@ import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.login.core.LoginHelper;
 import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO;
 import it.integry.integrywmsnative.gest.login.dto.LoginDTO;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class LoginViewModel {
 
@@ -192,22 +192,22 @@ public class LoginViewModel {
     private void onLoginFailed(final Spanned message){
         mProgress.dismiss();
         loginButtonEnabled.set(true);
-        mActivity.runOnUiThread(() -> DialogSimpleMessageHelper.makeErrorDialog(
-                mActivity,
+        mActivity.runOnUiThread(() -> DialogSimpleMessageView.makeErrorDialog(
                 message,
                 null,
-                null).show());
+                null)
+                .show(mActivity.getSupportFragmentManager(), "tag"));
     }
 
 
     private void onLoginSuccess(final String title, final Spanned message, final String host, final int port, final List<String> availableProfiles){
         mProgress.dismiss();
-        mActivity.runOnUiThread(() -> DialogSimpleMessageHelper.makeSuccessDialog(
-                mActivity,
+        mActivity.runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(
                 title,
                 message,
                 null,
-                () -> showProfileDBSelectionDialog(host, port, availableProfiles)).show());
+                () -> showProfileDBSelectionDialog(host, port, availableProfiles))
+                .show(mActivity.getSupportFragmentManager(), "tag"));
     }
 
     private void showProfileDBSelectionDialog(final String host, final int port, final List<String> availableProfiles){

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

@@ -7,11 +7,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -34,6 +38,7 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDimension;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -68,7 +73,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        setRetainInstance(true);
     }
 
     @Override
@@ -78,13 +83,19 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
         mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main, container, false);
 
+
+        return mBindings.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull @NotNull View view, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
         mToolbar.setNestedScrollView(mBindings.fragmentMainScrollview);
 
         init();
         initGestMenu();
         initVersion();
-
-        return mBindings.getRoot();
     }
 
     @Override
@@ -128,7 +139,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
             List<Exception> generatedErrors = new ArrayList<>();
 
-            Iterator sessionsIterator = ColliDataRecover.getAllSessionIDs().iterator();
+            Iterator<Integer> sessionsIterator = ColliDataRecover.getAllSessionIDs().iterator();
 
             cyclicRecover(sessionsIterator, () -> {
 
@@ -225,6 +236,10 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION);
         List<MenuConfiguration.MenuGroup> menuGroups = menuConfiguration.getGroups();
 
+        int menuSpanCount = 2;
+        if(UtilityDimension.getDisplayInchs(this.getActivity()) > 8) menuSpanCount = 4;
+        else if(UtilityDimension.getDisplayInchs(this.getActivity()) > 6.5) menuSpanCount = 3;
+
         for (MenuConfiguration.MenuGroup menuGroup : menuGroups) {
             FragmentMainMenuGroupLayoutBinding groupBinding = DataBindingUtil.inflate(mLayoutInflater, R.layout.fragment_main_menu_group_layout, null, false);
 
@@ -233,7 +248,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
             MenuListAdapter menuListAdapter = new MenuListAdapter(getContext(), menuGroup.getItems());
 
-            groupBinding.mainList.setLayoutManager(new GridLayoutManager(getContext(), 2));
+            groupBinding.mainList.setLayoutManager(new GridLayoutManager(getContext(), menuSpanCount));
             groupBinding.mainList.setAdapter(menuListAdapter);
             groupBinding.mainList.setNestedScrollingEnabled(false);
 

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

@@ -7,8 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
@@ -33,7 +31,6 @@ import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
-import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment;
 import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
@@ -46,16 +43,16 @@ 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.FragmentMainOrdiniUscitaBinding;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs.DialogVenditaFiltroAvanzato;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs.DialogVenditaFiltroAvanzatoView;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs.DialogVenditaFiltroAvanzatoViewModel;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.list.OrdiniUscitaElencoAdapter;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.list.OrdiniUscitaElencoListModel;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
-public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment, OrdiniUscitaElencoViewModel.Listener {
+public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment, OrdiniUscitaElencoViewModel.Listener {
 
     public BindableBoolean fabVisible = new BindableBoolean(false);
 
@@ -132,8 +129,8 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     }
 
     @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
+    public void onStart() {
+        super.onStart();
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
         mViewModel.init(codMdep, mCurrentGestioneOrd, mCurrentGestioneCol, mCurrentSegnoCol);
@@ -141,6 +138,8 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
     @Override
     public void onDestroy() {
+        BarcodeManager.removeCallback(barcodeScannerIstanceID);
+
         for (Runnable onPreDestroy : mOnPreDestroyList) {
             onPreDestroy.run();
         }
@@ -152,13 +151,13 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
         boolean canSelectMultipleOrdini = SettingsManager.iDB().isFlagSpedizioneCanSelectMultipleOrders();
         boolean canSelectMultipleClienti = SettingsManager.iDB().isFlagMultiClienteOrdV();
 
-        this.mViewModel.getOrderList().observe(getViewLifecycleOwner(), this::refreshList);
+        this.mViewModel.getOrderList().observe(getViewLifecycleOwner(), v -> this.refreshList(null));
 
         OrdiniUscitaElencoAdapter ordiniUscitaElencoAdapter =
                 new OrdiniUscitaElencoAdapter(getActivity(), mOrdiniInevasiMutableData)
                         .setEmptyView(this.mBindings.ordiniVenditaEmptyView)
                         .setOnGroupItemClicked(x -> {
-                            if(!canSelectMultipleClienti) {
+                            if (!canSelectMultipleClienti) {
                                 Stream.of(mOrdiniInevasiMutableData)
                                         .filter(y -> !y.getGroupTitle().equalsIgnoreCase(x) && y.getSelectedObservable().get())
                                         .forEach(y -> y.getSelectedObservable().set(false));
@@ -173,7 +172,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                                     .forEach(y -> y.getSelectedObservable().set(!allSelected));
                         })
                         .setOnItemChecked(x -> {
-                            if(!canSelectMultipleClienti && x.getSelectedObservable().get()) {
+                            if (!canSelectMultipleClienti && x.getSelectedObservable().get()) {
                                 Stream.of(mOrdiniInevasiMutableData)
                                         .filter(y -> !y.getGroupTitle().equalsIgnoreCase(x.getGroupTitle()) && y.getSelectedObservable().get())
                                         .forEach(y -> y.getSelectedObservable().set(false));
@@ -186,7 +185,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
         this.mBindings.venditaMainList.setAdapter(ordiniUscitaElencoAdapter);
         this.mBindings.venditaMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
 
-        if(mToolbar != null)
+        if (mToolbar != null)
             mToolbar.setRecyclerView(this.mBindings.venditaMainList);
     }
 
@@ -208,15 +207,28 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
         });
     };
 
-    private void refreshList(List<OrdiniUscitaElencoDTO> orderList) {
+    private void refreshList(List<OrdiniUscitaElencoDTO> filteredList) {
+        List<OrdiniUscitaElencoDTO> tmpList = null;
+
+        if(filteredList != null) {
+            tmpList = filteredList;
+        } else if (mAppliedFilterViewModel != null) {
+            mAppliedFilterViewModel.init(mViewModel.getOrderList().getValue());
+            mAppliedFilterViewModel.applyAllTests();
+            tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+        } else {
+            tmpList = mViewModel.getOrderList().getValue();
+        }
+
         this.mOrdiniInevasiMutableData.clear();
-        this.mOrdiniInevasiMutableData.addAll(convertDataModelToListModel(orderList));
+        this.mOrdiniInevasiMutableData.addAll(convertDataModelToListModel(tmpList));
     }
 
     private List<OrdiniUscitaElencoListModel> convertDataModelToListModel(List<OrdiniUscitaElencoDTO> dataList) {
 
         ComparatorCompat<OrdiniUscitaElencoDTO> comparator = ComparatorCompat
                 .comparing(OrdiniUscitaElencoDTO::getRagSocOrd)
+                .thenComparing(ComparatorCompat.comparing(x -> x.getDestinatario() != null ? x.getDestinatario() : "zzzzzzzzz"))
                 .thenComparing(ComparatorCompat.comparing(OrdiniUscitaElencoDTO::getNumOrd));
 
         List<OrdiniUscitaElencoListModel> notHiddenElements = Stream.of(dataList)
@@ -259,12 +271,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                 .forEach(x -> x.getSelectedObservable().set(false));
     }
 
-    @Override
-    public void onPreDestroy(Runnable onComplete) {
-        BarcodeManager.removeCallback(barcodeScannerIstanceID);
-        onComplete.run();
-    }
-
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         titleText.setText(context.getText(R.string.prod_ordine_lavorazione_title_fragment).toString());
@@ -278,7 +284,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                 .toList();
 
         this.mViewModel.loadPicking(selectedOrders);
-
     }
 
 
@@ -315,8 +320,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
         int alreadyRegisteredUL = alreadyRegisteredMtbColts.size();
 
-        DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
-                getText(R.string.orders).toString(),
+        DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(),
                 Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, orders.size()), orders.size())
                         + "<br />" +
                         "<b>" + codMarts.size() + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, codMarts.size())
@@ -324,7 +328,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                         "<b>" + alreadyRegisteredUL + "</b> " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)),
                 null,
                 () -> SpedizioneActivity.startActivity(getActivity(), sitArts, orders, alreadyRegisteredMtbColts, mCurrentGestioneCol, mCurrentSegnoCol, MtbColr.Causale.DEFAULT, mDialogRowInfo)
-        ).show();
+        ).show(getActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -352,19 +356,17 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
     @Override
     public void onFilterClick() {
-        DialogVenditaFiltroAvanzato.make(
+        DialogVenditaFiltroAvanzatoView.make(
                 getActivity(),
                 this.mViewModel.getOrderList().getValue(),
                 mAppliedFilterViewModel,
 
-                (filteredOrderList, filter) -> {
-            mAppliedFilterViewModel = filter;
+                filter -> {
 
-            if(filteredOrderList != null){
-                refreshList(filteredOrderList);
-            }
+                    mAppliedFilterViewModel = filter;
+                    refreshList(null);
 
-        }).show();
+                }).show();
     }
 
     @Override

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

@@ -18,6 +18,7 @@ import it.integry.integrywmsnative.core.exception.InvalidLUMultiGestioneExceptio
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoOrderFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.DtbOrdt;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
@@ -282,10 +283,7 @@ public class OrdiniUscitaElencoViewModel {
         if (this.mListener != null) mListener.onOrdersDispatched(orders, sitArts, alreadyRegisteredMtbColts);
     }
 
-    public interface Listener {
-        void onLoadingStarted();
-
-        void onLoadingEnded();
+    public interface Listener extends ILoadingListener {
 
         void onError(Exception ex);
 

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzato.java

@@ -1,662 +0,0 @@
-package it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs;
-
-import android.app.DatePickerDialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ArrayAdapter;
-import android.widget.MultiAutoCompleteTextView;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.databinding.DataBindingUtil;
-
-import com.annimon.stream.Stream;
-import com.annimon.stream.function.Predicate;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.class_router.ClassRouter;
-import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita;
-import it.integry.integrywmsnative.core.di.BindableString;
-import it.integry.integrywmsnative.core.expansion.RunnableArgss;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.databinding.DialogVenditaFiltroAvanzatoBinding;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
-
-
-public class DialogVenditaFiltroAvanzato {
-
-
-    private final AlertDialog currentAlert;
-    private final Context currentContext;
-
-    private final RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> currentOnFilterDone;
-
-    private final List<OrdiniUscitaElencoDTO> currentOrderList;
-    private List<OrdiniUscitaElencoDTO> currentFilteredOrderList;
-
-    private ArrayAdapter<String> arrayAdapterCodMdep;
-    private ArrayAdapter<String> arrayAdapterIdViaggio;
-    private ArrayAdapter<String> arrayAdapterNumOrds;
-    private ArrayAdapter<String> arrayAdapterCliente;
-    private ArrayAdapter<String> arrayAdapterTermCons;
-    private ArrayAdapter<String> arrayAdapterVettore;
-    private ArrayAdapter<String> arrayAdapterAgente;
-    private ArrayAdapter<String> arrayAdapterAutomezzo;
-
-    private Predicate<OrdiniUscitaElencoDTO> currentDepositoPredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentIdViaggioPredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentNumOrdsPredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentClientePredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentDataConsPredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentTermConsPredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentVettorePredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentAgentePredicate = null;
-    private Predicate<OrdiniUscitaElencoDTO> currentAutomezzoPredicate = null;
-
-    private boolean firstInit = true;
-
-    public static AlertDialog make(final Context context, final List<OrdiniUscitaElencoDTO> ordersList, RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
-        return new DialogVenditaFiltroAvanzato(context, ordersList, null, onDismiss).currentAlert;
-    }
-
-    public static AlertDialog make(final Context context,
-                                   final List<OrdiniUscitaElencoDTO> ordersList,
-                                   DialogVenditaFiltroAvanzatoViewModel baseViewModel,
-                                   RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
-        return new DialogVenditaFiltroAvanzato(context, ordersList, baseViewModel, onDismiss).currentAlert;
-    }
-
-    private DialogVenditaFiltroAvanzato(final Context context, final List<OrdiniUscitaElencoDTO> ordersList, DialogVenditaFiltroAvanzatoViewModel baseViewModel, RunnableArgss<List<OrdiniUscitaElencoDTO>, DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
-        currentContext = context;
-        currentOrderList = ordersList;
-        currentOnFilterDone = onDismiss;
-
-        DialogVenditaFiltroAvanzatoViewModel viewModel = baseViewModel != null ? baseViewModel : new DialogVenditaFiltroAvanzatoViewModel();
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-
-        DialogVenditaFiltroAvanzatoBinding binding = DataBindingUtil.inflate(inflater, R.layout.dialog_vendita_filtro_avanzato, null, false);
-
-        final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
-                .setView(binding.getRoot());
-
-        binding.setViewmodel(viewModel);
-        initViewModelNew(viewModel);
-        initView(binding, viewModel);
-
-        currentAlert = alertDialog.create();
-        currentAlert.setCanceledOnTouchOutside(false);
-
-        currentAlert.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        currentAlert.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-
-
-        binding.positiveBtn.setOnClickListener(view -> {
-            currentAlert.dismiss();
-        });
-
-        binding.neutralBtn.setOnClickListener(view -> {
-            resetAll(viewModel);
-        });
-
-
-        currentAlert.setOnDismissListener(dialogInterface -> {
-            if(currentOnFilterDone != null) currentOnFilterDone.run(currentFilteredOrderList, viewModel);
-        });
-
-        refreshList();
-    }
-
-    private void resetAll(DialogVenditaFiltroAvanzatoViewModel viewModel) {
-        viewModel.deposito.set(null);
-        viewModel.idViaggio.set(null);
-        viewModel.numOrds.set(null);
-        viewModel.cliente.set(null);
-        viewModel.dataConsegna.set(null);
-        viewModel.terminiConsegna.set(null);
-        viewModel.vettore.set(null);
-        viewModel.automezzo.set(null);
-        viewModel.agente.set(null);
-    }
-
-    private void initView(DialogVenditaFiltroAvanzatoBinding bindings, DialogVenditaFiltroAvanzatoViewModel viewModel) {
-        IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getInstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA);
-
-//        bindings.filledExposedDropdownDataCons.setOnFocusChangeListener((v, hasFocus) -> {
-//            bindings.filledExposedDropdownDataCons.callOnClick();
-//        });
-
-        bindings.filledExposedDropdownDataCons.setOnClickListener(view -> {
-            Calendar c = UtilityDate.getCalendarInstance();
-
-            if(viewModel.dataConsegnaDate != null) {
-                c.setTime(viewModel.dataConsegnaDate);
-            }
-
-            int mYear = c.get(Calendar.YEAR);
-            int mMonth = c.get(Calendar.MONTH);
-            int mDay = c.get(Calendar.DAY_OF_MONTH);
-
-            DatePickerDialog datePickerDialog = new DatePickerDialog(currentContext,
-                    (view2, year, month, day) -> {
-
-                        viewModel.dataConsegnaDate = new GregorianCalendar(year, month, day).getTime();
-                        viewModel.dataConsegna.set(UtilityDate.formatDate(viewModel.dataConsegnaDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
-
-                    }, mYear, mMonth, mDay);
-            datePickerDialog.show();
-        });
-
-
-        arrayAdapterCodMdep = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterCodMdep.addAll(getAvailableCodMdeps(false));
-        bindings.inputCodMdepNew.setVisibility(filtroOrdiniVendita.shoudShowCodMdepFilter() ? View.VISIBLE : View.GONE);
-        bindings.filledExposedDropdownCodMdep.setAdapter(arrayAdapterCodMdep);
-
-        arrayAdapterIdViaggio = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(false));
-        bindings.inputIdViaggio.setVisibility(filtroOrdiniVendita.shoudShowIdViaggioFilter() ? View.VISIBLE : View.GONE);
-        bindings.filledExposedDropdownIdViaggio.setAdapter(arrayAdapterIdViaggio);
-
-        arrayAdapterAgente = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterAgente.addAll(getAvailableAgente(false));
-        bindings.inputAgente.setVisibility(filtroOrdiniVendita.shoudShowAgenteFilter() ? View.VISIBLE : View.GONE);
-        bindings.filledExposedDropdownAgente.setAdapter(arrayAdapterAgente);
-
-        arrayAdapterNumOrds = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterNumOrds.addAll(getAvailableNumOrds(false));
-        bindings.filledExposedDropdownNumOrds.setAdapter(arrayAdapterNumOrds);
-        bindings.filledExposedDropdownNumOrds.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer());
-
-        arrayAdapterCliente = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterCliente.addAll(getAvailableCliente(false));
-        bindings.filledExposedDropdownCliente.setAdapter(arrayAdapterCliente);
-
-        arrayAdapterTermCons = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterTermCons.addAll(getAvailableTermCons(false));
-        bindings.filledExposedDropdownTermCons.setAdapter(arrayAdapterTermCons);
-
-        arrayAdapterVettore = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterVettore.addAll(getAvailableVettori(false));
-        bindings.filledExposedDropdownVettore.setAdapter(arrayAdapterVettore);
-
-        arrayAdapterAutomezzo = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
-        arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(false));
-        bindings.filledExposedDropdownAutomezzo.setAdapter(arrayAdapterAutomezzo);
-
-
-        viewModel.deposito.refresh();
-        viewModel.idViaggio.refresh();
-        viewModel.numOrds.refresh();
-        viewModel.cliente.refresh();
-        viewModel.terminiConsegna.refresh();
-        viewModel.vettore.refresh();
-        viewModel.automezzo.refresh();
-        viewModel.dataConsegna.refresh();
-        viewModel.agente.refresh();
-
-
-    }
-
-    private void initViewModelNew(DialogVenditaFiltroAvanzatoViewModel viewModel) {
-        BindableString.registerListener(viewModel.idViaggio, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentIdViaggioPredicate = null;
-            else {
-                String[] idViaggiSplitted = value.split("[,\\ ]");
-
-                try{
-                    List<Integer> idViaggiInteger = Stream.of(idViaggiSplitted)
-                            .filter(x -> !UtilityString.isNullOrEmpty(x))
-                            .map(Integer::parseInt).toList();
-
-                    currentIdViaggioPredicate = o -> idViaggiInteger.contains(o.getIdViaggio());
-                } catch (NumberFormatException ex) {
-                    currentNumOrdsPredicate = null;
-                }
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.registerListener(viewModel.deposito, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentDepositoPredicate = null;
-            else {
-                currentDepositoPredicate = o -> o.getCodMdep().toLowerCase().equalsIgnoreCase(value);
-            }
-
-            refreshList();
-
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.registerListener(viewModel.numOrds, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentNumOrdsPredicate = null;
-            else {
-                String[] numOrdsSplitted = value.split("[,\\ ]");
-
-                try{
-                    List<Integer> numOrdsInteger = Stream.of(numOrdsSplitted)
-                            .filter(x -> !UtilityString.isNullOrEmpty(x))
-                            .map(Integer::parseInt).toList();
-
-                    currentNumOrdsPredicate = o -> numOrdsInteger.contains(o.getNumOrd());
-                } catch (NumberFormatException ex) {
-                    currentNumOrdsPredicate = null;
-                }
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.registerListener(viewModel.cliente, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentClientePredicate = null;
-            else {
-                currentClientePredicate = o -> o.getRagSocOrd().toLowerCase().contains(value.toLowerCase());
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.registerListener(viewModel.terminiConsegna, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentTermConsPredicate = null;
-            else {
-                currentTermConsPredicate = o -> !UtilityString.isNullOrEmpty(o.getTermCons()) && o.getTermCons().equalsIgnoreCase(value);
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.registerListener(viewModel.vettore, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentVettorePredicate = null;
-            else {
-                currentVettorePredicate = o -> (o.getCodVvet() + " - " + o.getDescrizioneVettore()).equalsIgnoreCase(value);
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.registerListener(viewModel.automezzo, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentAutomezzoPredicate = null;
-            else {
-                currentAutomezzoPredicate = o -> !UtilityString.isNullOrEmpty(o.getDescrizioneAuto()) && (o.getDescrizioneAuto().toLowerCase().contains(value) || o.getDescrizioneAuto().equalsIgnoreCase(value));
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.resetListeners(viewModel.dataConsegna);
-        BindableString.registerListener(viewModel.dataConsegna, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentDataConsPredicate = null;
-            else {
-                currentDataConsPredicate = o -> o.getDataConsD().equals(viewModel.dataConsegnaDate);
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-            arrayAdapterAgente.clear();
-            arrayAdapterAgente.addAll(getAvailableAgente(true));
-        });
-
-        BindableString.resetListeners(viewModel.agente);
-        BindableString.registerListener(viewModel.agente, value -> {
-            if(UtilityString.isNullOrEmpty(value)) currentAgentePredicate = null;
-            else {
-                currentAgentePredicate = o -> !UtilityString.isNullOrEmpty(o.getNomeAgente()) && (o.getNomeAgente().toLowerCase().contains(value) || o.getNomeAgente().equalsIgnoreCase(value));
-            }
-
-            refreshList();
-
-            arrayAdapterCodMdep.clear();
-            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
-            arrayAdapterIdViaggio.clear();
-            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
-            arrayAdapterNumOrds.clear();
-            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
-            arrayAdapterCliente.clear();
-            arrayAdapterCliente.addAll(getAvailableCliente(true));
-            arrayAdapterTermCons.clear();
-            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
-            arrayAdapterVettore.clear();
-            arrayAdapterVettore.addAll(getAvailableVettori(true));
-            arrayAdapterAutomezzo.clear();
-            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
-        });
-
-    }
-
-
-
-    private List<String> getAvailableIdViaggio(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null && currentDepositoPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream
-                .of(currentFilteredOrderList)
-                .filter(x -> x.getIdViaggio() != null)
-                .sortBy(x -> -x.getIdViaggio())
-                .map(x -> x.getIdViaggio() != null ? x.getIdViaggio().toString() : null)
-                .distinct()
-                .toList();
-    }
-
-    private List<String> getAvailableAgente(boolean skipRecalc) {
-        if(currentDepositoPredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getNomeAgente).distinct().withoutNulls().sorted().toList();
-    }
-
-    private List<String> getAvailableCodMdeps(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getCodMdep).distinct().withoutNulls().sorted().toList();
-    }
-
-    private List<String> getAvailableCliente(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentDepositoPredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getRagSocOrd).distinct().withoutNulls().sorted().toList();
-    }
-
-    private List<String> getAvailableNumOrds(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentDepositoPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream.of(currentFilteredOrderList).map(x -> x.getNumOrd().toString()).distinct().withoutNulls().sorted().toList();
-    }
-
-    private List<String> getAvailableTermCons(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentDepositoPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x)))  &&
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getTermCons).distinct().withoutNulls().sorted().toList();
-    }
-
-    private List<String> getAvailableVettori(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentAutomezzoPredicate == null && currentDepositoPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate .test(x)))  &&
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream.of(currentFilteredOrderList).filter(x -> x.getCodVvet() != null).map(x -> x.getCodVvet() + " - " + x.getDescrizioneVettore()).distinct().withoutNulls().sorted().toList();
-    }
-
-    private List<String> getAvailableAutomezzi(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentVettorePredicate == null && currentDepositoPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else if(!skipRecalc){
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                    .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                    );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getDescrizioneAuto).distinct().withoutNulls().sorted().toList();
-    }
-
-    private void refreshList() {
-
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentVettorePredicate == null && currentAutomezzoPredicate == null && currentDepositoPredicate == null){
-            currentFilteredOrderList = currentOrderList;
-        } else {
-            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
-                .filter(x ->
-                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
-                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
-                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
-                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
-                            (currentVettorePredicate == null || (currentVettorePredicate.test(x))) &&
-                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x)))  &&
-                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
-                );
-
-            currentFilteredOrderList = tmpStream.toList();
-        }
-
-
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoView.java

@@ -0,0 +1,465 @@
+package it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs;
+
+import android.app.DatePickerDialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ArrayAdapter;
+import android.widget.MultiAutoCompleteTextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.databinding.DataBindingUtil;
+
+import com.annimon.stream.Stream;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.class_router.ClassRouter;
+import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita;
+import it.integry.integrywmsnative.core.di.BindableString;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.databinding.DialogVenditaFiltroAvanzatoBinding;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
+
+
+public class DialogVenditaFiltroAvanzatoView {
+
+
+    private final AlertDialog currentAlert;
+    private final Context currentContext;
+
+    private final RunnableArgs<DialogVenditaFiltroAvanzatoViewModel> currentOnFilterDone;
+
+
+
+    public BindableString deposito = new BindableString();
+    public BindableString idViaggio = new BindableString();
+    public BindableString numOrds = new BindableString();
+    public BindableString cliente = new BindableString();
+    public BindableString dataConsegna = new BindableString();
+    public BindableString terminiConsegna = new BindableString();
+    public BindableString agente = new BindableString();
+    public BindableString vettore = new BindableString();
+    public BindableString automezzo = new BindableString();
+    public BindableString paese = new BindableString();
+
+    public Date dataConsegnaDate;
+
+    private ArrayAdapter<String> arrayAdapterCodMdep;
+    private ArrayAdapter<String> arrayAdapterIdViaggio;
+    private ArrayAdapter<String> arrayAdapterNumOrds;
+    private ArrayAdapter<String> arrayAdapterCliente;
+    private ArrayAdapter<String> arrayAdapterTermCons;
+    private ArrayAdapter<String> arrayAdapterVettore;
+    private ArrayAdapter<String> arrayAdapterAgente;
+    private ArrayAdapter<String> arrayAdapterAutomezzo;
+    private ArrayAdapter<String> arrayAdapterPaese;
+
+    private DialogVenditaFiltroAvanzatoViewModel viewModel;
+
+    public static AlertDialog make(final Context context, final List<OrdiniUscitaElencoDTO> ordersList, RunnableArgs<DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
+        return new DialogVenditaFiltroAvanzatoView(context, ordersList, null, onDismiss).currentAlert;
+    }
+
+    public static AlertDialog make(final Context context,
+                                   final List<OrdiniUscitaElencoDTO> ordersList,
+                                   DialogVenditaFiltroAvanzatoViewModel baseViewModel,
+                                   RunnableArgs<DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
+        return new DialogVenditaFiltroAvanzatoView(context, ordersList, baseViewModel, onDismiss).currentAlert;
+    }
+
+    private DialogVenditaFiltroAvanzatoView(final Context context, final List<OrdiniUscitaElencoDTO> ordersList, DialogVenditaFiltroAvanzatoViewModel baseViewModel, RunnableArgs<DialogVenditaFiltroAvanzatoViewModel> onDismiss) {
+        currentContext = context;
+        currentOnFilterDone = onDismiss;
+
+        viewModel = baseViewModel != null ? baseViewModel : new DialogVenditaFiltroAvanzatoViewModel();
+        viewModel.init(ordersList);
+
+        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+
+        DialogVenditaFiltroAvanzatoBinding binding = DataBindingUtil.inflate(inflater, R.layout.dialog_vendita_filtro_avanzato, null, false);
+
+        final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
+                .setView(binding.getRoot());
+
+        binding.setView(this);
+        binding.setViewmodel(viewModel);
+        initViewModelNew(viewModel);
+        initView(binding, viewModel);
+
+        currentAlert = alertDialog.create();
+        currentAlert.setCanceledOnTouchOutside(false);
+
+        currentAlert.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        currentAlert.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+
+
+        binding.positiveBtn.setOnClickListener(view -> {
+            currentAlert.dismiss();
+        });
+
+        binding.neutralBtn.setOnClickListener(view -> {
+            resetAll();
+        });
+
+
+        currentAlert.setOnDismissListener(dialogInterface -> {
+            if(currentOnFilterDone != null) currentOnFilterDone.run(viewModel);
+        });
+
+    }
+
+    private void initView(DialogVenditaFiltroAvanzatoBinding bindings, DialogVenditaFiltroAvanzatoViewModel viewModel) {
+        IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getInstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA);
+
+//        bindings.filledExposedDropdownDataCons.setOnFocusChangeListener((v, hasFocus) -> {
+//            bindings.filledExposedDropdownDataCons.callOnClick();
+//        });
+
+        bindings.filledExposedDropdownDataCons.setOnClickListener(view -> {
+            Calendar c = UtilityDate.getCalendarInstance();
+
+            if(dataConsegnaDate != null) {
+                c.setTime(dataConsegnaDate);
+            }
+
+            int mYear = c.get(Calendar.YEAR);
+            int mMonth = c.get(Calendar.MONTH);
+            int mDay = c.get(Calendar.DAY_OF_MONTH);
+
+            DatePickerDialog datePickerDialog = new DatePickerDialog(currentContext,
+                    (view2, year, month, day) -> {
+
+                        dataConsegnaDate = new GregorianCalendar(year, month, day).getTime();
+                        dataConsegna.set(UtilityDate.formatDate(dataConsegnaDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+
+                    }, mYear, mMonth, mDay);
+            datePickerDialog.show();
+        });
+
+
+        arrayAdapterCodMdep = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterCodMdep.addAll(getAvailableCodMdeps(false));
+        bindings.inputCodMdepNew.setVisibility(filtroOrdiniVendita.shoudShowCodMdepFilter() ? View.VISIBLE : View.GONE);
+        bindings.filledExposedDropdownCodMdep.setAdapter(arrayAdapterCodMdep);
+
+        arrayAdapterIdViaggio = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(false));
+        bindings.inputIdViaggio.setVisibility(filtroOrdiniVendita.shoudShowIdViaggioFilter() ? View.VISIBLE : View.GONE);
+        bindings.filledExposedDropdownIdViaggio.setAdapter(arrayAdapterIdViaggio);
+
+        arrayAdapterAgente = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterAgente.addAll(getAvailableAgente(false));
+        bindings.inputAgente.setVisibility(filtroOrdiniVendita.shoudShowAgenteFilter() ? View.VISIBLE : View.GONE);
+        bindings.filledExposedDropdownAgente.setAdapter(arrayAdapterAgente);
+
+        arrayAdapterNumOrds = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterNumOrds.addAll(getAvailableNumOrds(false));
+        bindings.filledExposedDropdownNumOrds.setAdapter(arrayAdapterNumOrds);
+        bindings.filledExposedDropdownNumOrds.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer());
+
+        arrayAdapterCliente = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterCliente.addAll(getAvailableCliente(false));
+        bindings.filledExposedDropdownCliente.setAdapter(arrayAdapterCliente);
+
+        arrayAdapterTermCons = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterTermCons.addAll(getAvailableTermCons(false));
+        bindings.filledExposedDropdownTermCons.setAdapter(arrayAdapterTermCons);
+
+        arrayAdapterVettore = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterVettore.addAll(getAvailableVettori(false));
+        bindings.filledExposedDropdownVettore.setAdapter(arrayAdapterVettore);
+
+        arrayAdapterAutomezzo = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(false));
+        bindings.filledExposedDropdownAutomezzo.setAdapter(arrayAdapterAutomezzo);
+
+        arrayAdapterPaese = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterPaese.addAll(getAvailablePaesi(false));
+        bindings.filledExposedDropdownPaese.setAdapter(arrayAdapterPaese);
+
+
+        refreshAll();
+    }
+
+    private void initViewModelNew(DialogVenditaFiltroAvanzatoViewModel viewModel) {
+        viewModel.applyAllTests();
+
+        BindableString.registerListener(idViaggio, value -> {
+            viewModel.setIDViaggioFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+        });
+
+        BindableString.registerListener(deposito, value -> {
+            viewModel.setDepositoFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+        });
+
+        BindableString.registerListener(numOrds, value -> {
+            viewModel.setNumOrdFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+        });
+
+        BindableString.registerListener(cliente, value -> {
+            viewModel.setClienteFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+        });
+
+        BindableString.registerListener(terminiConsegna, value -> {
+            viewModel.setTerminiConsegnaFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+        });
+
+        BindableString.registerListener(vettore, value -> {
+            viewModel.setVettoreFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+        });
+
+        BindableString.registerListener(automezzo, value -> {
+            viewModel.setAutomezzoFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+        });
+
+        BindableString.resetListeners(dataConsegna);
+        BindableString.registerListener(dataConsegna, value -> {
+            viewModel.setDataConsegnaFilter(dataConsegnaDate);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+        });
+
+        BindableString.resetListeners(agente);
+        BindableString.registerListener(agente, value -> {
+            viewModel.setAgenteFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+        });
+
+        BindableString.resetListeners(paese);
+        BindableString.registerListener(paese, value -> {
+            viewModel.setPaeseFilter(value);
+            viewModel.applyAllTests();
+
+            refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true));
+            refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true));
+            refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true));
+            refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true));
+            refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true));
+            refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true));
+            refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true));
+            refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true));
+        });
+
+    }
+
+
+    private void refreshArrayAdapter(ArrayAdapter<String> arrayAdapter, List<String> inputList) {
+        arrayAdapter.clear();
+        arrayAdapter.addAll(inputList);
+        arrayAdapter.notifyDataSetChanged();
+    }
+
+
+    private List<String> getAvailableIdViaggio(boolean skipRecalc) {
+        return Stream
+                .of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .filter(x -> x.getIdViaggio() != null)
+                .sortBy(x -> -x.getIdViaggio())
+                .map(x -> x.getIdViaggio() != null ? x.getIdViaggio().toString() : null)
+                .distinct()
+                .toList();
+    }
+
+    private List<String> getAvailableAgente(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .map(OrdiniUscitaElencoDTO::getNomeAgente)
+                .distinct()
+                .withoutNulls()
+                .sorted()
+                .toList();
+    }
+
+    private List<String> getAvailableCodMdeps(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .map(OrdiniUscitaElencoDTO::getCodMdep)
+                .distinct()
+                .withoutNulls()
+                .sorted()
+                .toList();
+    }
+
+    private List<String> getAvailableCliente(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .map(OrdiniUscitaElencoDTO::getRagSocOrd)
+                .distinct()
+                .withoutNulls()
+                .sorted()
+                .toList();
+    }
+
+    private List<String> getAvailableNumOrds(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .map(x -> x.getNumOrd().toString())
+                .distinct()
+                .withoutNulls()
+                .sorted()
+                .toList();
+    }
+
+    private List<String> getAvailableTermCons(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .map(OrdiniUscitaElencoDTO::getTermCons)
+                .distinct()
+                .withoutNulls()
+                .sorted()
+                .toList();
+    }
+
+    private List<String> getAvailableVettori(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .filter(x -> x.getCodVvet() != null)
+                .map(x -> x.getCodVvet() + " - " + x.getDescrizioneVettore())
+                .distinct()
+                .withoutNulls()
+                .sorted()
+                .toList();
+    }
+
+    private List<String> getAvailableAutomezzi(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .map(OrdiniUscitaElencoDTO::getDescrizioneAuto)
+                .distinct()
+                .withoutNulls()
+                .sorted()
+                .toList();
+    }
+
+    private List<String> getAvailablePaesi(boolean skipRecalc) {
+        return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue()))
+                .map(OrdiniUscitaElencoDTO::getCitta)
+                .withoutNulls()
+                .distinct()
+                .sorted()
+                .toList();
+    }
+
+
+    public void refreshAll() {
+        deposito.refresh();
+        idViaggio.refresh();
+        numOrds.refresh();
+        cliente.refresh();
+        terminiConsegna.refresh();
+        vettore.refresh();
+        automezzo.refresh();
+        dataConsegna.refresh();
+        agente.refresh();
+        paese.refresh();
+    }
+
+
+    public void resetAll() {
+        deposito.set(null);
+        idViaggio.set(null);
+        numOrds.set(null);
+        cliente.set(null);
+        dataConsegna.set(null);
+        terminiConsegna.set(null);
+        vettore.set(null);
+        automezzo.set(null);
+        agente.set(null);
+        paese.set(null);
+    }
+
+
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java

@@ -1,21 +1,167 @@
 package it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs;
 
-import java.util.Date;
+import androidx.lifecycle.MutableLiveData;
 
-import it.integry.integrywmsnative.core.di.BindableString;
+import com.annimon.stream.Stream;
+import com.annimon.stream.function.Predicate;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
 
 public class DialogVenditaFiltroAvanzatoViewModel {
 
-    public BindableString deposito = new BindableString();
-    public BindableString idViaggio = new BindableString();
-    public BindableString numOrds = new BindableString();
-    public BindableString cliente = new BindableString();
-    public BindableString dataConsegna = new BindableString();
-    public BindableString terminiConsegna = new BindableString();
-    public BindableString agente = new BindableString();
-    public BindableString vettore = new BindableString();
-    public BindableString automezzo = new BindableString();
+    private Predicate<OrdiniUscitaElencoDTO> currentDepositoPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentIdViaggioPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentNumOrdsPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentClientePredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentDataConsPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentTermConsPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentVettorePredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentAgentePredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentAutomezzoPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentPaesePredicate = null;
 
-    public Date dataConsegnaDate;
+
+    private List<OrdiniUscitaElencoDTO> initialOrderList;
+    private MutableLiveData<List<OrdiniUscitaElencoDTO>> currentFilteredOrderList = new MutableLiveData<>();
+
+    public void init(List<OrdiniUscitaElencoDTO> initialList) {
+        this.initialOrderList = initialList;
+        this.currentFilteredOrderList.setValue(this.initialOrderList);
+    }
+
+    public MutableLiveData<List<OrdiniUscitaElencoDTO>> getMutableFilteredOrderList() {
+        return this.currentFilteredOrderList;
+    }
+
+    public void setIDViaggioFilter(String idViaggio) {
+        if(UtilityString.isNullOrEmpty(idViaggio)) currentIdViaggioPredicate = null;
+        else {
+            String[] idViaggiSplitted = idViaggio.split("[,\\ ]");
+
+            try{
+                List<Integer> idViaggiInteger = Stream.of(idViaggiSplitted)
+                        .filter(x -> !UtilityString.isNullOrEmpty(x))
+                        .map(Integer::parseInt).toList();
+
+                currentIdViaggioPredicate = o -> idViaggiInteger.contains(o.getIdViaggio());
+            } catch (NumberFormatException ex) {
+                currentIdViaggioPredicate = null;
+            }
+        }
+    }
+
+    public void setDepositoFilter(String deposito) {
+        if(UtilityString.isNullOrEmpty(deposito)) currentDepositoPredicate = null;
+        else {
+            currentDepositoPredicate = o -> o.getCodMdep().toLowerCase().equalsIgnoreCase(deposito);
+        }
+    }
+
+    public void setNumOrdFilter(String numOrds) {
+        if(UtilityString.isNullOrEmpty(numOrds)) currentNumOrdsPredicate = null;
+        else {
+            String[] numOrdsSplitted = numOrds.split("[,\\ ]");
+
+            try{
+                List<Integer> numOrdsInteger = Stream.of(numOrdsSplitted)
+                        .filter(x -> !UtilityString.isNullOrEmpty(x))
+                        .map(Integer::parseInt).toList();
+
+                currentNumOrdsPredicate = o -> numOrdsInteger.contains(o.getNumOrd());
+            } catch (NumberFormatException ex) {
+                currentNumOrdsPredicate = null;
+            }
+        }
+    }
+
+    public void setClienteFilter(String cliente) {
+        if(UtilityString.isNullOrEmpty(cliente)) currentClientePredicate = null;
+        else {
+            currentClientePredicate = o -> o.getRagSocOrd().toLowerCase().contains(cliente.toLowerCase());
+        }
+    }
+
+    public void setTerminiConsegnaFilter(String terminiConsegna) {
+        if(UtilityString.isNullOrEmpty(terminiConsegna)) currentTermConsPredicate = null;
+        else {
+            currentTermConsPredicate = o -> !UtilityString.isNullOrEmpty(o.getTermCons()) && o.getTermCons().equalsIgnoreCase(terminiConsegna);
+        }
+    }
+
+    public void setVettoreFilter(String vettore) {
+        if(UtilityString.isNullOrEmpty(vettore)) currentVettorePredicate = null;
+        else {
+            currentVettorePredicate = o -> (o.getCodVvet() + " - " + o.getDescrizioneVettore()).equalsIgnoreCase(vettore);
+        }
+    }
+
+    public void setAutomezzoFilter(String automezzo) {
+        if(UtilityString.isNullOrEmpty(automezzo)) currentAutomezzoPredicate = null;
+        else {
+            currentAutomezzoPredicate = o -> !UtilityString.isNullOrEmpty(o.getDescrizioneAuto()) && (o.getDescrizioneAuto().toLowerCase().contains(automezzo) || o.getDescrizioneAuto().equalsIgnoreCase(automezzo));
+        }
+    }
+
+    public void setDataConsegnaFilter(Date dataConsegna) {
+        if(dataConsegna == null) currentDataConsPredicate = null;
+        else {
+            currentDataConsPredicate = o -> o.getDataConsD().equals(dataConsegna);
+        }
+    }
+
+    public void setAgenteFilter(String agente) {
+        if(UtilityString.isNullOrEmpty(agente)) currentAgentePredicate = null;
+        else {
+            currentAgentePredicate = o -> !UtilityString.isNullOrEmpty(o.getNomeAgente()) && (o.getNomeAgente().toLowerCase().contains(agente) || o.getNomeAgente().equalsIgnoreCase(agente));
+        }
+    }
+
+    public void setPaeseFilter(String paese) {
+        if(UtilityString.isNullOrEmpty(paese)) currentPaesePredicate = null;
+        else {
+            currentPaesePredicate = o -> !UtilityString.isNullOrEmpty(o.getCitta()) && (o.getCitta().toLowerCase().contains(paese) || o.getCitta().equalsIgnoreCase(paese));
+        }
+    }
+
+    public void applyAllTests() {
+
+        List<OrdiniUscitaElencoDTO> returnList = null;
+
+        if (currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentTermConsPredicate == null &&
+                currentVettorePredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentDepositoPredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentAgentePredicate == null &&
+                currentPaesePredicate == null
+        ) {
+            returnList = this.initialOrderList;
+        } else {
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(this.initialOrderList)
+                    .filter(x ->
+                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
+                                    (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
+                                    (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
+                                    (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
+                                    (currentVettorePredicate == null || (currentVettorePredicate.test(x))) &&
+                                    (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
+                                    (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
+                                    (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
+                                    (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                                    (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
+                    );
+
+            returnList = tmpStream.toList();
+        }
+
+        this.currentFilteredOrderList.setValue(returnList);
+    }
 
 }

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

@@ -132,17 +132,25 @@ public class OrdiniUscitaElencoAdapter extends SectionedRecyclerViewAdapter<Ordi
             holder.mBinding.emptyView.setBackgroundColor(listModel.getEtichettaColor());
         else holder.mBinding.emptyView.setBackgroundColor(ResourcesCompat.getColor(mContext.getResources(), android.R.color.transparent, null));
 
-        if(!UtilityString.isNullOrEmpty(listModel.getDescription()))
+        if(!UtilityString.isNullOrEmpty(listModel.getDescription())) {
             holder.mBinding.descrizione.setText(Html.fromHtml(listModel.getDescription()));
+            holder.mBinding.descrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.descrizione.setVisibility(View.GONE);
 
-        if(!UtilityString.isNullOrEmpty(listModel.getSubDescription()))
+        if(!UtilityString.isNullOrEmpty(listModel.getSubDescription())) {
             holder.mBinding.subDescrizione.setText(Html.fromHtml(listModel.getSubDescription()));
+            holder.mBinding.subDescrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.subDescrizione.setVisibility(View.GONE);
 
-        if(!UtilityString.isNullOrEmpty(listModel.getRightDescription()))
+        if(!UtilityString.isNullOrEmpty(listModel.getRightDescription())) {
             holder.mBinding.rightDescrizione.setText(Html.fromHtml(listModel.getRightDescription()));
+            holder.mBinding.rightDescrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.rightDescrizione.setVisibility(View.GONE);
 
-        if(!UtilityString.isNullOrEmpty(listModel.getRightSubDescription()))
+        if(!UtilityString.isNullOrEmpty(listModel.getRightSubDescription())) {
             holder.mBinding.rightSubDescrizione.setText(Html.fromHtml(listModel.getRightSubDescription()));
+            holder.mBinding.rightSubDescrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.rightSubDescrizione.setVisibility(View.GONE);
 
         holder.mBinding.setSelected(listModel.getSelectedObservable());
         holder.mBinding.executePendingBindings();

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

@@ -13,7 +13,6 @@ import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableList;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.tfb.fbtoast.FBToast;
@@ -52,10 +51,10 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGExcep
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView;
-import it.integry.integrywmsnative.view.dialogs.DialogConsts;
-import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskCliente;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteView;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
@@ -169,7 +168,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
         mBindings.pickingLiberoMainList.setHasFixedSize(true);
         mBindings.pickingLiberoMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
 
-        DividerItemDecoration itemDecorator = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL);
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL);
         itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider));
         mBindings.pickingLiberoMainList.addItemDecoration(itemDecorator);
     }
@@ -191,7 +190,6 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
         BarcodeManager.disable();
-
         this.openProgress();
 
         this.mViewModel.processBarcodeDTO(data, () -> {
@@ -239,65 +237,65 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     @Override
     public void onLUOpened(MtbColt mtbColt) {
-        mToolbarTitleText.setText(String.format(getActivity().getText(R.string.lu_number_text).toString(), mtbColt.getNumCollo()));
+        getActivity().runOnUiThread(() -> {
+            mToolbarTitleText.setText(String.format(getActivity().getText(R.string.lu_number_text).toString(), mtbColt.getNumCollo()));
 
-        initAdapter();
+            initAdapter();
 
-        thereIsAnOpenedUL.set(true);
-        thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true);
+            thereIsAnOpenedUL.set(true);
+            thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true);
 
-        mtbColt.getMtbColr().addOnListChangedCallback(new OnListGeneralChangedCallback() {
-            @Override
-            public void onChanged(ObservableList sender) {
-                thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true);
-            }
+            mtbColt.getMtbColr().addOnListChangedCallback(new OnListGeneralChangedCallback() {
+                @Override
+                public void onChanged(ObservableList sender) {
+                    thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true);
+                }
+            });
+
+            FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
         });
-
-        FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
     }
 
     @Override
     public void onLUClosed() {
-        mToolbarTitleText.setText(getActivity().getText(R.string.free_picking_title_fragment).toString());
-        destroyAdapter();
+        getActivity().runOnUiThread(() -> {
+            mToolbarTitleText.setText(getActivity().getText(R.string.free_picking_title_fragment).toString());
+            destroyAdapter();
 
-        thereIsAnyRowInUL.set(false);
-        thereIsAnOpenedUL.set(false);
+            thereIsAnyRowInUL.set(false);
+            thereIsAnOpenedUL.set(false);
+        });
     }
 
     @Override
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
         String text = getResources().getString(R.string.alert_delete_mtb_colr);
-        DialogSimpleMessageHelper.makeWarningDialog(getActivity(),
-                new SpannableString(text),
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
                 null,
                 () -> onComplete.run(true),
                 () -> onComplete.run(false)
-        ).show();
+        ).show(getActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onError(Exception ex) {
-        this.closeProgress();
+        getActivity().runOnUiThread(() -> {
+            this.closeProgress();
 
-        if (ex instanceof InvalidPesoKGException) {
-            UtilityToast.showToast(ex.getMessage());
-        } else {
-            UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
-        }
+            if (ex instanceof InvalidPesoKGException) {
+                UtilityToast.showToast(ex.getMessage());
+            } else {
+                UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
+            }
 
-        BarcodeManager.enable();
+            BarcodeManager.enable();
+        });
     }
 
     @Override
     public void onLUClienteRequired(RunnableArgss<VtbDest, String> onComplete, Runnable onAbort) {
-        DialogAskCliente.makeBase(getActivity(), (status, result, codJcom) -> {
-            if (status == DialogConsts.Results.YES) {
-                onComplete.run(result, codJcom);
-            } else {
-                onAbort.run();
-            }
-        }).show();
+        DialogAskClienteView.newInstance(onComplete, onAbort)
+                .show(getActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -305,8 +303,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
         DialogChooseArtsFromListaArts.make(getActivity(), mtbColrsToPick, onComplete, () -> {
             onAbort.run();
             BarcodeManager.enable();
-        })
-        .show();
+        });
     }
 
     @Override
@@ -365,11 +362,12 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
     @Override
     public void onRowSaved() {
-        FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        getActivity().runOnUiThread(() -> {
+            FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        });
     }
 
 
-
     @Override
     public void onMtbColrEdit(MtbColr mtbColr) {
         this.mViewModel.dispatchRowEdit(mtbColr);
@@ -383,7 +381,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     @Override
     public void onPreDestroy(Runnable onComplete) {
         BarcodeManager.removeCallback(barcodeScannerIstanceID);
-        if(thereIsAnOpenedUL.get()) mViewModel.closeLU(onComplete);
+        if (thereIsAnOpenedUL.get()) mViewModel.closeLU(onComplete);
         else onComplete.run();
     }
 

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

@@ -179,15 +179,20 @@ 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);
-            }, onComplete);
+            }, () -> {
+
+            });
         } else {
             createNewLU_PostClienteAsk(customNumCollo, customSerCollo, null, null, onComplete);
         }
     }
 
     private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJcom, Runnable onComplete) {
+        this.sendOnLoadingStarted();
+
         MtbColt mtbColt = new MtbColt();
         mtbColt.initDefaultFields();
         mtbColt.setGestione(mDefaultGestione)
@@ -209,7 +214,7 @@ public class PickingLiberoViewModel {
             mtbColt.setCodVdes(vtbDest.getCodVdes());
         }
 
-        if(!UtilityString.isNullOrEmpty(codJcom)) {
+        if (!UtilityString.isNullOrEmpty(codJcom)) {
             mtbColt.setCodJcom(codJcom);
         }
 
@@ -376,38 +381,29 @@ public class PickingLiberoViewModel {
 
                         this.sendOnLoadingStarted();
 
-                        mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
-                            for (int i = 0; i < mtbColrObservableField.size(); i++) {
-                                MtbColr initialMtbColr = mtbColrObservableField.get(i);
+                        new Thread(() -> {
+                            mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
+                                for (int i = 0; i < mtbColrObservableField.size(); i++) {
+                                    MtbColr initialMtbColr = mtbColrObservableField.get(i);
 
-                                initialMtbColr
-                                        .setDataCollo(value.getDataColloS())
-                                        .setNumCollo(value.getNumCollo())
-                                        .setGestione(value.getGestione())
-                                        .setSerCollo(value.getSerCollo());
+                                    initialMtbColr
+                                            .setDataCollo(value.getDataColloS())
+                                            .setNumCollo(value.getNumCollo())
+                                            .setGestione(value.getGestione())
+                                            .setSerCollo(value.getSerCollo());
 
-                                initialMtbColr.setRiga(value.getMtbColr().get(i).getRiga());
+                                    initialMtbColr.setRiga(value.getMtbColr().get(i).getRiga());
+                                    mCurrentMtbColt.getMtbColr().add(mtbColrObservableField.get(i));
+                                }
 
-//                                for (int j = 0; j < value.getMtbColr().size(); j++) {
-//                                    MtbColr savedMtbColr = value.getMtbColr().get(j);
-//                                    if (savedMtbColr.getCodMart().equals(initialMtbColr.getCodMart()) &&
-//                                            UtilityString.equalsIgnoreCase(savedMtbColr.getPartitaMag(), initialMtbColr.getPartitaMag()) &&
-//                                            UtilityString.equalsIgnoreCase(savedMtbColr.getCodCol(), initialMtbColr.getCodCol()) &&
-//                                            UtilityString.equalsIgnoreCase(savedMtbColr.getCodTagl(), initialMtbColr.getCodTagl()) &&
-//                                            savedMtbColr.getQtaCol().equals(initialMtbColr.getQtaCol()) &&
-//                                            savedMtbColr.getNumCnf().equals(initialMtbColr.getNumCnf())) {
-//                                        initialMtbColr.setRiga(savedMtbColr.getRiga());
-//                                    }
-//                                }
+                                this.sendOnRowSaved();
+                                this.sendOnLoadingEnded();
 
-                                mCurrentMtbColt.getMtbColr().add(mtbColrObservableField.get(i));
-                            }
+                                onComplete.run();
 
-                            this.sendOnRowSaved();
-                            this.sendOnLoadingEnded();
+                            }, this::sendError);
 
-                            onComplete.run();
-                        }, this::sendError);
+                        }).start();
                     }
                 }, onComplete);
             } else {
@@ -646,8 +642,6 @@ public class PickingLiberoViewModel {
                 .setQtaCol(qtaTot)
                 .setPartitaMag(partitaMag)
                 .setDataScadPartita(dataScad)
-                .setUtente(SettingsManager.i().getUser().getFullname())
-                .setCausale(MtbColr.Causale.RETTIFICA)
                 .setDatetimeRow(UtilityDate.getDateInstance());
 
         mtbColt.getMtbColr().add(mtbColr);

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

@@ -35,6 +35,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
@@ -49,9 +50,9 @@ 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.DialogSimpleMessageHelper;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 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 {
@@ -179,9 +180,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
         this.mBindings.mainList.setAdapter(pickingResiListAdapter);
         this.mBindings.mainList.setLayoutManager(new LinearLayoutManager(this));
 
-        pickingResiListAdapter.setOnItemClicked(clickedItem -> {
+        pickingResiListAdapter.setOnItemClicked((clickedItem, refMtbColt) -> {
             if (!noLUPresent.get()) {
-                this.mViewmodel.dispatchOrdineRow(clickedItem);
+                this.mViewmodel.dispatchOrdineRow(clickedItem, refMtbColt);
             }
         });
     }
@@ -190,7 +191,11 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     private List<PickingResiListModel> convertDataModelToListModel(List<WithdrawableDtbDocr> dataList) {
         List<PickingResiListModel> pickingResiListModels = new ArrayList<>();
 
-        Stream.of(dataList)
+        List<WithdrawableDtbDocr> tmpList = Stream.of(dataList)
+                .filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getQtaDoc(), BigDecimal.ZERO))
+                .toList();
+
+        Stream.of(tmpList)
                 .sortBy(x -> x.getNumDoc() + " " + x.getDataDocS() + " " + x.getCodDtip() + " " + x.getSerDoc() + " " + x.getCodAnag() + " " + x.getIdRiga())
                 .forEach(x -> {
 
@@ -251,6 +256,10 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
         });
     }
 
+    public void removeListFilter() {
+        this.mViewmodel.resetMatchedRows();
+    }
+
     @Override
     public void onMtbColrEdit(MtbColr mtbColr) {
         this.mViewmodel.dispatchRowEdit(mtbColr);
@@ -321,11 +330,23 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
                     this.openProgress();
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
                 }, () -> {
-//                    this.mViewmodel.resetMatchedRows();
+                    this.mViewmodel.resetMatchedRows();
                 })
                 .show(getSupportFragmentManager(), "tag");
     }
 
+    @Override
+    public void onFilterApplied(String newValue) {
+        this.mBindings.filteredArtsInListExpandableLayout.expand(true);
+        this.mBindings.descriptionFilterText.setText(!UtilityString.isNullOrEmpty(newValue) ? newValue : "");
+    }
+
+    @Override
+    public void onFilterRemoved() {
+        this.mBindings.filteredArtsInListExpandableLayout.collapse(true);
+        this.mBindings.descriptionFilterText.setText("");
+    }
+
     @Override
     public void onRowSaved() {
         FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
@@ -334,12 +355,11 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     @Override
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
         String text = getResources().getString(R.string.alert_delete_mtb_colr);
-        DialogSimpleMessageHelper.makeWarningDialog(this,
-                new SpannableString(text),
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
                 null,
                 () -> onComplete.run(true),
                 () -> onComplete.run(false)
-        ).show();
+        ).show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -362,7 +382,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     public void onLUSuccessullyPrinted() {
         Resources res = getResources();
         String errorMessage = res.getText(R.string.alert_print_completed_message).toString();
-        DialogSimpleMessageHelper.makeSuccessDialog(this, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show();
+        DialogSimpleMessageView
+                .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null)
+                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -373,13 +395,13 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     @Override
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.closeProgress();
-        DialogSimpleMessageHelper.makeErrorDialog(
-                this,
+        DialogSimpleMessageView.makeErrorDialog(
                 new SpannableString(ex.getMessage()),
                 null,
                 null,
                 R.string.button_ignore_print,
-                onComplete).show();
+                onComplete)
+            .show(getSupportFragmentManager(), "tag");
     }
 
     @Override

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

@@ -14,7 +14,11 @@ import java.util.List;
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
+import it.integry.integrywmsnative.core.exception.InvalidLUException;
+import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
+import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
@@ -25,6 +29,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.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -39,6 +44,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.picking_resi.exceptions.DocumentsLoadException;
 import it.integry.integrywmsnative.gest.picking_resi.rest.PickingResiRESTConsumer;
 import it.integry.integrywmsnative.gest.picking_resi.rest.WithdrawableDtbDocr;
+import it.integry.integrywmsnative.gest.spedizione.exceptions.NotCurrentYearLUException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 
 public class PickingResiViewModel {
@@ -229,23 +235,26 @@ public class PickingResiViewModel {
     private void postCloseOperations(MtbColt mtbColt, Runnable onComplete) {
         this.mColliRegistrati.add(mtbColt);
 
-        Stream.of(this.mPickingList.getValue())
-                .forEach(x -> {
-                    List<MtbColr> withdraws = x.getWithdrawRows();
+        List<WithdrawableDtbDocr> tmpList = getPickingList().getValue();
 
-                    for (int k = 0; k < withdraws.size(); k++) {
-                        MtbColr withdrawRow = withdraws.get(k);
-                        x.setQtaDoc(x.getQtaDoc().subtract(withdrawRow.getQtaCol()));
-                    }
+        for (int i = 0; i < tmpList.size(); i++) {
+            WithdrawableDtbDocr x = tmpList.get(i);
+            List<MtbColr> withdraws = x.getWithdrawRows();
 
-                    x.getWithdrawRows().clear();
+            for (int k = 0; k < withdraws.size(); k++) {
+                MtbColr withdrawRow = withdraws.get(k);
+                x.setQtaDoc(x.getQtaDoc().subtract(withdrawRow.getQtaCol()));
+            }
 
-                    if (UtilityBigDecimal.equalsOrLowerThan(x.getQtaDoc(), BigDecimal.ZERO)) {
-                        this.mPickingList.getValue().remove(x);
-                    }
-                });
+            x.getWithdrawRows().clear();
 
-        this.mPickingList.postValue(this.mPickingList.getValue());
+            if (UtilityBigDecimal.equalsOrLowerThan(x.getQtaDoc(), BigDecimal.ZERO)) {
+                tmpList.remove(x);
+                i--;
+            }
+        }
+
+        this.mPickingList.postValue(tmpList);
         onComplete.run();
     }
 
@@ -259,41 +268,232 @@ public class PickingResiViewModel {
                 //Se il collo non esiste allora lo creo associandolo a questa etichetta anonima
                 //invece se esiste apro un collo nuovo e cerco gli articoli presenti nell'ul
                 //dell'etichetta anonima
-//                this.executeEtichettaAnonimaNotOpenedLU(barcodeScanDTO, onComplete);
+                this.executeEtichettaAnonimaNotOpenedLU(barcodeScanDTO, onComplete);
             } else {
-//                this.processBarcodeNotOpenedLU(barcodeScanDTO, onComplete);
+                this.processBarcodeNotOpenedLU(barcodeScanDTO, onComplete);
             }
 
         } else {
             if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
                 //Cerco gli articoli presenti nell'ul dell'etichetta anonima
-//                this.executeEtichettaLU(barcodeScanDTO.getStringValue(), onComplete);
+                this.executeEtichettaLU(barcodeScanDTO.getStringValue(), onComplete);
 
             } else {
-//                this.processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete);
+                this.processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete);
             }
         }
     }
 
-    public void dispatchOrdineRow(final WithdrawableDtbDocr withdrawableDtbDocr) {
+    private void processBarcodeNotOpenedLU(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        this.createNewLU(
+                null,
+                null,
+                () -> processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete));
+    }
+
+
+    private void processBarcodeAlreadyOpenedLU(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+
+        if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
+            //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
+            this.executeEtichettaEan128(barcodeScanDTO, onComplete);
+
+
+        } else onComplete.run();
+    }
+
+
+    private void executeEtichettaAnonimaNotOpenedLU(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.getBySSCC(barcodeScanDTO.getStringValue(), true, false, mtbColt -> {
+
+            if (mtbColt == null) {
+
+                if (!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) {
+                    this.sendError(new NotCurrentYearLUException());
+                } else {
+
+                    this.createNewLU(
+                            UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()),
+                            CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, onComplete);
+                }
+            } else {
+
+                this.createNewLU(
+                        null,
+                        null,
+                        () -> searchArtFromUL(mtbColt, onComplete)
+                );
+            }
+
+        }, this::sendError);
+    }
+
+    private void executeEtichettaLU(String SSCC, Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> {
+
+            if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                if (mtbColt.getSegno() != -1) {
+                    searchArtFromUL(mtbColt, onComplete);
+                } else this.sendError(new InvalidLUException());
+            } else {
+                this.sendError(new NoArtsFoundException());
+            }
+
+        }, this::sendError);
+    }
+
+
+    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
+
+            String barcodeProd = null;
+
+            if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
+            if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
+            if (!UtilityString.isNullOrEmpty(ean128Model.Content))
+                barcodeProd = ean128Model.Content;
+
+
+            if (!UtilityString.isNullOrEmpty(barcodeProd)) {
+
+                if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
+                    this.executeEtichettaLU(ean128Model.Sscc, onComplete);
+                } else {
+                    this.sendError(new NoLUFoundException());
+                }
+            } else {
+                //EAN 128 non completo o comunque mancano i riferimenti al prodotto
+                onComplete.run();
+            }
+        }, this::sendError);
+    }
+
+    private void searchArtFromUL(MtbColt scannedUL, Runnable onComplete) {
+
+        final List<WithdrawableDtbDocr> pickingList = mPickingList.getValue();
+        final List<WithdrawableDtbDocr> matchPickingObject = new ArrayList<>();
+
+
+        //Controllo se nel collo ho degli articoli che corrispondono per codice / taglia / colore / lotto
+        Stream.of(scannedUL.getMtbColr())
+                .filter(x -> !UtilityString.isNullOrEmpty(x.getCodMart()))
+                .forEach(x -> {
+
+                    for (WithdrawableDtbDocr pickingObject : pickingList) {
+                        //Da verificare se il controllo per partita deve essere sempre effettuato
+                        if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getCodMart()) &&
+                                UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getCodTagl()) &&
+                                UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getCodCol())) {
+
+                            if (!matchPickingObject.contains(pickingObject)) {
+                                matchPickingObject.add(pickingObject);
+                            }
+
+                        }
+                    }
+                });
+
+        for (WithdrawableDtbDocr matchedObject : matchPickingObject) {
+            MtbColt cloneMtbColt = (MtbColt) scannedUL.clone();
+            ObservableArrayList<MtbColr> cloneMtbColrs = (ObservableArrayList<MtbColr>) cloneMtbColt.getMtbColr().clone();
+
+
+            Stream.of(cloneMtbColt.getMtbColr())
+                    .filter(x -> !(UtilityString.equalsIgnoreCase(x.getCodMart(), matchedObject.getCodMart()) &&
+                            UtilityString.equalsIgnoreCase(x.getCodTagl(), matchedObject.getCodTagl()) &&
+                            UtilityString.equalsIgnoreCase(x.getCodCol(), matchedObject.getCodCol())))
+                    .forEach(cloneMtbColrs::remove);
+
+            cloneMtbColt.setMtbColr(cloneMtbColrs);
+
+            PickDataDTO tempPickData = new PickDataDTO()
+                    .setSourceMtbColt(cloneMtbColt);
+
+            matchedObject.setTempPickData(tempPickData);
+        }
+
+
+        this.loadMatchedRows(matchPickingObject);
+        onComplete.run();
+    }
+
+
+    private void loadMatchedRows(List<WithdrawableDtbDocr> matchedRows) {
+        if (matchedRows == null || matchedRows.size() == 0) {
+            this.sendError(new NoArtsFoundException());
+        } else if (matchedRows.size() == 1) {
+            WithdrawableDtbDocr matchedItem = matchedRows.get(0);
+
+            if (matchedItem.getWithdrawRows() != null && matchedItem.getWithdrawRows().size() > 1) {
+
+                List<WithdrawableDtbDocr> pickingList = mPickingList.getValue();
+
+                Stream.of(pickingList)
+                        .filter(x -> x != matchedItem)
+                        .forEach(x -> x.setHidden(true));
+
+                this.sendFilterApplied(null);
+                this.getPickingList().postValue(pickingList);
+            } else {
+                this.dispatchOrdineRow(matchedItem, matchedItem.getRefMtbColt());
+            }
+
+        } else {
+            List<WithdrawableDtbDocr> pickingList = mPickingList.getValue();
+
+            for (int i = 0; i < pickingList.size(); i++) {
+                if (!matchedRows.contains(pickingList.get(i))) {
+                    pickingList.get(i).setHidden(true);
+                }
+            }
+
+            this.sendFilterApplied(null);
+            this.getPickingList().postValue(pickingList);
+
+        }
+    }
+
+
+    public void dispatchOrdineRow(final WithdrawableDtbDocr withdrawableDtbDocr, final MtbColt refMtbColt) {
         BigDecimal totalQtaDoc = withdrawableDtbDocr.getQtaDoc();
         BigDecimal totalNumCnfDoc = withdrawableDtbDocr.getNumCnf();
         BigDecimal qtaCnfDoc = withdrawableDtbDocr.getQtaCnf();
 
+        //TODO: Al posto di prelevare la prima riga bisognerebbe controllare se c'è ne una che corrisponde con la partita richiesta
+        MtbColr mtbColrToDispatch = withdrawableDtbDocr.getTempPickData() != null &&
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt() != null &&
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr() != null &&
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().size() > 0 ?
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null;
+
+        BigDecimal totalAvailableQtaCol;
+        BigDecimal totalAvailableQtaCnf;
+        BigDecimal totalAvailableNumCnf;
+
+        if (mtbColrToDispatch != null) {
+            totalAvailableQtaCol = mtbColrToDispatch.getQtaCol();
+            totalAvailableQtaCnf = mtbColrToDispatch.getQtaCnf();
+            totalAvailableNumCnf = mtbColrToDispatch.getNumCnf();
+        } else {
+            totalAvailableQtaCol = totalQtaDoc;
+            totalAvailableQtaCnf = qtaCnfDoc;
+            totalAvailableNumCnf = totalNumCnfDoc;
+        }
 
         this.sendOnItemDispatched(
                 withdrawableDtbDocr.getMtbAart(),
-                totalNumCnfDoc,
-                qtaCnfDoc,
-                totalQtaDoc,
-                totalQtaDoc,
-                totalNumCnfDoc,
-                qtaCnfDoc,
+                totalAvailableNumCnf,
+                totalAvailableQtaCnf,
+                totalAvailableQtaCol,
+                totalAvailableQtaCol,
+                totalAvailableNumCnf,
+                totalAvailableQtaCnf,
                 withdrawableDtbDocr.getPartitaMag(),
                 withdrawableDtbDocr.getDataScadPartitaMagD(),
                 (pickedQuantityDTO, shouldCloseLU) -> {
 
                     this.saveNewRow(withdrawableDtbDocr,
+                            refMtbColt,
                             pickedQuantityDTO.getNumCnf(),
                             pickedQuantityDTO.getQtaCnf(),
                             pickedQuantityDTO.getQtaTot(),
@@ -328,7 +528,7 @@ public class PickingResiViewModel {
     }
 
 
-    public void saveNewRow(WithdrawableDtbDocr withdrawableDtbDocr, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
+    public void saveNewRow(WithdrawableDtbDocr withdrawableDtbDocr, MtbColt refMtbColt, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
         this.sendOnLoadingStarted();
 
         final MtbColr mtbColr = new MtbColr()
@@ -348,6 +548,39 @@ public class PickingResiViewModel {
                 .setDataDoc(withdrawableDtbDocr.getDataDocS())
                 .setIdRigaDoc(withdrawableDtbDocr.getIdRiga());
 
+        //TODO: Al posto di prelevare la prima riga bisognerebbe controllare se c'è ne una che corrisponde con la partita richiesta
+        MtbColr mtbColrToDispatch = withdrawableDtbDocr.getTempPickData() != null &&
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt() != null &&
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr() != null &&
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().size() > 0 ?
+                withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null;
+
+        if (mtbColrToDispatch != null) {
+            if (UtilityString.isNullOrEmpty(mCurrentMtbColt.getCodTcol()))
+                mCurrentMtbColt.setCodTcol(UtilityString.empty2null(withdrawableDtbDocr.getTempPickData().getSourceMtbColt().getCodTcol()));
+
+            mtbColr
+                    .setCodJcom(UtilityString.empty2null(mtbColrToDispatch.getCodJcom()))
+                    .setSerColloRif(UtilityString.empty2null(mtbColrToDispatch.getSerCollo()))
+                    .setNumColloRif(mtbColrToDispatch.getNumCollo())
+                    .setGestioneRif(UtilityString.empty2null(mtbColrToDispatch.getGestione()))
+                    .setDataColloRif(UtilityString.empty2null(mtbColrToDispatch.getDataColloS()));
+
+
+            if (mtbColrToDispatch.getPesoNettoKg() != null) {
+                //Proporzione
+                BigDecimal pesoNettoKg = UtilityBigDecimal.divide(UtilityBigDecimal.multiply(qtaTot, mtbColrToDispatch.getPesoNettoKg()), mtbColrToDispatch.getQtaCol());
+                mtbColr.setPesoNettoKg(pesoNettoKg);
+            }
+
+            if (mtbColrToDispatch.getPesoLordoKg() != null) {
+                //Proporzione
+                BigDecimal pesoLordoKg = UtilityBigDecimal.divide(UtilityBigDecimal.multiply(qtaTot, mtbColrToDispatch.getPesoLordoKg()), mtbColrToDispatch.getQtaCol());
+                mtbColr.setPesoLordoKg(pesoLordoKg);
+            }
+        }
+
+
         mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
         MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
@@ -482,6 +715,17 @@ public class PickingResiViewModel {
         });
     }
 
+    public void resetMatchedRows() {
+        for (WithdrawableDtbDocr pickingObjectDTO : this.mPickingList.getValue()) {
+            pickingObjectDTO
+                    .setTempPickData(null)
+                    .setHidden(false);
+        }
+
+        this.mPickingList.postValue(this.mPickingList.getValue());
+        this.sendFilterRemoved();
+    }
+
 
     public MutableLiveData<List<WithdrawableDtbDocr>> getPickingList() {
         return mPickingList;
@@ -549,6 +793,14 @@ public class PickingResiViewModel {
         if (this.mListener != null) mListener.onRowSaved();
     }
 
+    private void sendFilterApplied(String newValue) {
+        if (this.mListener != null) mListener.onFilterApplied(newValue);
+    }
+
+    private void sendFilterRemoved() {
+        if (this.mListener != null) mListener.onFilterRemoved();
+    }
+
 
     public PickingResiViewModel setListener(Listener listener) {
         this.mListener = listener;
@@ -572,5 +824,9 @@ public class PickingResiViewModel {
                               Date dataScad,
                               RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
 
+        void onFilterApplied(String newValue);
+
+        void onFilterRemoved();
+
     }
 }

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

@@ -20,7 +20,8 @@ import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
+import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.PickingResiMainListItemBinding;
@@ -31,7 +32,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
 
     private Context mContext;
     private final List<PickingResiListModel> mDataset = new ArrayList<>();
-    private RunnableArgs<WithdrawableDtbDocr> mOnItemClicked;
+    private RunnableArgss<WithdrawableDtbDocr, MtbColt> mOnItemClicked;
 
     static class SubheaderHolder extends RecyclerView.ViewHolder {
         PickingResiMainListItemHeaderBinding mBinding;
@@ -65,7 +66,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
         });
     }
 
-    public void setOnItemClicked(RunnableArgs<WithdrawableDtbDocr> onItemClicked) {
+    public void setOnItemClicked(RunnableArgss<WithdrawableDtbDocr, MtbColt> onItemClicked) {
         this.mOnItemClicked = onItemClicked;
     }
 
@@ -123,7 +124,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
 
         holder.mBinding.getRoot().setOnClickListener(v -> {
             if (this.mOnItemClicked != null)
-                this.mOnItemClicked.run(pickingResiListModel.getOriginalModel());
+                this.mOnItemClicked.run(pickingResiListModel.getOriginalModel(), pickingResiListModel.getSourceMtbColt());
         });
     }
 

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

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.picking_resi.core;
 
 import java.math.BigDecimal;
 
+import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.gest.picking_resi.rest.WithdrawableDtbDocr;
 
 public class PickingResiListModel {
@@ -19,6 +20,7 @@ public class PickingResiListModel {
     private boolean active;
 
     private WithdrawableDtbDocr mOriginalModel;
+    private MtbColt mSourceMtbColt;
 
     public String getGroupTitle() {
         return groupTitle;
@@ -100,4 +102,13 @@ public class PickingResiListModel {
         this.mOriginalModel = originalModel;
         return this;
     }
+
+    public MtbColt getSourceMtbColt() {
+        return mSourceMtbColt;
+    }
+
+    public PickingResiListModel setSourceMtbColt(MtbColt sourceMtbColt) {
+        this.mSourceMtbColt = sourceMtbColt;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java

@@ -63,7 +63,7 @@ public class PickingResiRESTConsumer {
                             .distinct()
                             .toList();
 
-                    mArticoloRESTConsumer.getByCodMart(codMarts, arts -> {
+                    mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
 
                         if(arts != null && arts.size() > 0) {
                             for (DtbDocr value : values) {

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/WithdrawableDtbDocr.java

@@ -5,13 +5,18 @@ import java.util.List;
 
 import it.integry.integrywmsnative.core.model.DtbDocr;
 import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 
 public class WithdrawableDtbDocr extends DtbDocr {
 
     private String gestione;
-
     private List<MtbColr> withdrawRows = new ArrayList<>();
 
+    private PickDataDTO tempPickData;
+    private MtbColt refMtbColt;
+    private boolean hidden = false;
+
     public WithdrawableDtbDocr() {
         super();
     }
@@ -33,4 +38,31 @@ public class WithdrawableDtbDocr extends DtbDocr {
         this.gestione = gestione;
         return this;
     }
+
+    public MtbColt getRefMtbColt() {
+        return refMtbColt;
+    }
+
+    public WithdrawableDtbDocr setRefMtbColt(MtbColt refMtbColt) {
+        this.refMtbColt = refMtbColt;
+        return this;
+    }
+
+    public PickDataDTO getTempPickData() {
+        return tempPickData;
+    }
+
+    public WithdrawableDtbDocr setTempPickData(PickDataDTO tempPickData) {
+        this.tempPickData = tempPickData;
+        return this;
+    }
+
+    public boolean isHidden() {
+        return hidden;
+    }
+
+    public WithdrawableDtbDocr setHidden(boolean hidden) {
+        this.hidden = hidden;
+        return this;
+    }
 }

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

@@ -41,7 +41,7 @@ import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.core.Or
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.core.OrdineProduzioneListAdapter;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.dialog.DialogOrdineProduzioneFiltroAvanzato;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -137,7 +137,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
 
                     String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
                     if (errorMessage == null) errorMessage = ex.getMessage();
-                    DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show();
+                    DialogSimpleMessageView
+                            .makeErrorDialog(new SpannableString(errorMessage), null, null)
+                            .show(getActivity().getSupportFragmentManager(), "tag");
                 }
         );
     }
@@ -197,8 +199,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
                             .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione())
                             .count();
 
-                    DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
-                            getText(R.string.orders).toString(),
+                    DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(),
                             Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter)
                                     + "<br /><br />" +
                                     "<b>" + artsCounter + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, (int) artsCounter)),
@@ -213,7 +214,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
                                 myIntent.putExtra("keySitArts", cacheSitArtItemID);
                                 getActivity().startActivity(myIntent);
 
-                            }).show();
+                            }).show(getActivity().getSupportFragmentManager(), "tag");
 
                 },
 
@@ -224,7 +225,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit
                     String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
                     if (errorMessage == null)
                         errorMessage = ex.getMessage() + "\n" + ex.getCause().getCause().getMessage();
-                    DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show();
+                    DialogSimpleMessageView
+                            .makeErrorDialog(new SpannableString(errorMessage), null, null)
+                            .show(getActivity().getSupportFragmentManager(), "tag");
                 });
 
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java

@@ -262,7 +262,7 @@ public class ProdRecuperoMaterialeHelper {
                             .distinct()
                             .toList();
 
-                    ArticoloRESTConsumer.getByCodMartStatic(codMarts, arts -> {
+                    ArticoloRESTConsumer.getByCodMartsStatic(codMarts, arts -> {
 
                         if(arts != null && arts.size() > 0) {
                             for (HistoryVersamentoProdULDTO value : newUlList) {

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java

@@ -42,10 +42,10 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuper
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
-import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
+import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView;
 
 public class ProdRecuperoMaterialeViewModel {
 
@@ -369,7 +369,8 @@ public class ProdRecuperoMaterialeViewModel {
         };
 
         if (sourceMtbColt != null) saveRunnable.run(sourceMtbColt, false);
-        else DialogScanOrCreateLU.make(mContext, true, false, saveRunnable).show();
+        else DialogScanOrCreateLUView.newInstance(true, false, saveRunnable)
+                .show(mContext.getSupportFragmentManager(), "tag");
 
     }
 
@@ -386,13 +387,13 @@ public class ProdRecuperoMaterialeViewModel {
                     }, ex -> {
                         progress.dismiss();
                         String errorMessage = ex.getMessage();
-                        DialogSimpleMessageHelper.makeErrorDialog(
-                                mContext,
+                        DialogSimpleMessageView.makeErrorDialog(
                                 new SpannableString(errorMessage),
                                 null,
                                 null,
                                 R.string.button_ignore_print,
-                                onComplete).show();
+                                onComplete)
+                                .show(mContext.getSupportFragmentManager(), "tag");
                     });
 
                 } catch (Exception ex) {
@@ -402,7 +403,9 @@ public class ProdRecuperoMaterialeViewModel {
             } else {
                 progress.dismiss();
                 String errorMessage = "Nessuna stampante configurata";
-                DialogSimpleMessageHelper.makeWarningDialog(mContext, new SpannableString(errorMessage), null, onComplete).show();
+                DialogSimpleMessageView
+                        .makeWarningDialog(new SpannableString(errorMessage), null, onComplete)
+                        .show(mContext.getSupportFragmentManager(), "tag");
             }
         }, ex -> {
             UtilityExceptions.defaultException(mContext, ex, progress);

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ProdRientroMerceComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ProdRientroMerceComponent create();
+    }
+
+    void inject(ProdRientroMerceFragment prodRientroMerceFragment);
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java

@@ -0,0 +1,161 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceBinding;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailFragment;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_list.ProdRientroMerceOrderListFragment;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
+import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+
+public class ProdRientroMerceFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ProdRientroMerceViewModel.Listener, BottomSheetFragmentLUContentView.Listener, BottomSheetMtbColrEditView.Listener {
+
+
+    @Inject
+    ProdRientroMerceViewModel mViewModel;
+
+    private AppCompatTextView mAppBarTitle;
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+
+    private FragmentProdRientroMerceBinding mBindings;
+
+    private ProdRientroMerceOrderListFragment mProdRientroMerceOrderListFragment;
+    private ProdRientroMerceOrderDetailFragment mProdRientroMerceOrderDetailFragment;
+    private ElevatedToolbar mToolbar;
+
+    public static ProdRientroMerceFragment newInstance() {
+        return new ProdRientroMerceFragment();
+    }
+
+    @Override
+    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+
+        mProdRientroMerceOrderListFragment = ProdRientroMerceOrderListFragment.newInstance(mToolbar);
+        mProdRientroMerceOrderDetailFragment = ProdRientroMerceOrderDetailFragment.newInstance();
+
+        mProdRientroMerceOrderListFragment.setOnItemSelectedRunnable(mProdRientroMerceOrderDetailFragment::setOrder);
+        mProdRientroMerceOrderDetailFragment.setOnMtbColtClicked(item -> {
+            mBindings.bottomSheetMtbColrEdit.setMtbColr(item.getMtbColr().get(0));
+            mBindings.bottomSheetMtbColrEdit.expand();
+        });
+
+        getChildFragmentManager()
+                .beginTransaction()
+                .replace(R.id.order_list_fragment, mProdRientroMerceOrderListFragment)
+                .replace(R.id.order_detail_fragment, mProdRientroMerceOrderDetailFragment)
+                .commit();
+
+        MainApplication.appComponent
+                .prodRientroMerceComponent()
+                .create()
+                .inject(this);
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), R.layout.fragment_prod_rientro_merce, container, false);
+        mBindings.setLifecycleOwner(this);
+
+        mViewModel.setListener(this);
+
+        this.initBottomSheet();
+
+        return mBindings.getRoot();
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        if(savedInstanceState == null) {
+            this.mViewModel.getOrdiniLavorazioneAperti().observe(this.getViewLifecycleOwner(), this::ordersUpdated);
+
+            mViewModel.init();
+        }
+    }
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        mAppBarTitle = titleText;
+        mAppBarTitle.setText(context.getText(R.string.rientro_merce_fragment_title).toString());
+
+    }
+
+    @Override
+    public void addOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        for (Runnable onPreDestroy :
+                mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+    }
+
+    @Override
+    public void onDataSaved() {
+    }
+
+    private void ordersUpdated(List<OrdineLavorazioneDTO> ordiniLavorazioneList) {
+        this.mProdRientroMerceOrderListFragment.pushOrderList(ordiniLavorazioneList);
+    }
+
+    @Override
+    public void setScrollToolbar(ElevatedToolbar toolbar) {
+        mToolbar = toolbar;
+    }
+
+
+
+    private void initBottomSheet() {
+        mBindings.bottomSheetMtbColrEdit.setListener(this);
+        mBindings.bottomSheetMtbColrEdit.disableEditButton();
+        mBindings.bottomSheetMtbColrEdit.init(mBindings.bottomSheetMtbColrEdit, mBindings.bottomSheetMtbColrEditBackground);
+    }
+
+    @Override
+    public void onMtbColrEdit(MtbColr mtbColr) {
+
+    }
+
+    @Override
+    public void onMtbColrDelete(MtbColr mtbColr) {
+        String text = getResources().getString(R.string.alert_delete_mtb_colr);
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
+                null,
+                () -> mProdRientroMerceOrderDetailFragment.deleteMtbColr(mtbColr),
+                () -> {}
+        ).show(getActivity().getSupportFragmentManager(), "tag");
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceModule.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
+
+@Module(subcomponents = ProdRientroMerceComponent.class)
+public class ProdRientroMerceModule {
+
+    @Provides
+    ProdRientroMerceViewModel providesProdRientroMerceViewModel(MesRESTConsumer mesRESTConsumer) {
+        return new ProdRientroMerceViewModel(mesRESTConsumer);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java

@@ -0,0 +1,68 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce;
+
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
+import it.integry.integrywmsnative.gest.picking_resi.exceptions.DocumentsLoadException;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+
+public class ProdRientroMerceViewModel {
+
+
+    private final MutableLiveData<List<OrdineLavorazioneDTO>> mOrdiniLavorazioneAperti = new MutableLiveData<>();
+
+    private Listener mListener;
+
+    private final MesRESTConsumer mMesRESTConsumer;
+
+    @Inject
+    public ProdRientroMerceViewModel(MesRESTConsumer mesRESTConsumer) {
+        this.mMesRESTConsumer = mesRESTConsumer;
+    }
+
+    public void init() {
+        new Thread(this::sendOnLoadingStarted).start();
+
+        this.mMesRESTConsumer.getOrdiniLavorazione("I", null, ordiniLavorazioneList -> {
+            this.mOrdiniLavorazioneAperti.postValue(ordiniLavorazioneList);
+            this.sendOnLoadingEnded();
+        }, ex -> this.sendError(new DocumentsLoadException(ex)));
+    }
+
+    public MutableLiveData<List<OrdineLavorazioneDTO>> getOrdiniLavorazioneAperti() {
+        return mOrdiniLavorazioneAperti;
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+
+    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 onDataSaved();
+
+        void onError(Exception ex);
+
+    }
+
+
+}

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

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ProdRientroMerceOrderDetailComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ProdRientroMerceOrderDetailComponent create();
+    }
+
+    void inject(ProdRientroMerceOrderDetailFragment prodRientroMerceOrderDetailFragment);
+}

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

@@ -0,0 +1,277 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
+
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.content.ContextCompat;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.MutableLiveData;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.DtbOrdSteps;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderDetailBinding;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
+import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdDTO;
+import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdView;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link ProdRientroMerceOrderDetailFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements ProdRientroMerceOrderDetailViewModel.Listener {
+
+
+    public final MutableLiveData<OrdineLavorazioneDTO> currentOrder = new MutableLiveData<>();
+
+    @Inject
+    ArticoloRESTConsumer mArticoloRESTConsumer;
+
+    @Inject
+    SystemRESTConsumer mSystemRESTConsumer;
+
+    @Inject
+    ProdRientroMerceOrderDetailViewModel mViewModel;
+
+    private FragmentProdRientroMerceOrderDetailBinding mBindings;
+    private ProdRientroMerceOrderDetailMtbColtListAdapter mAdapter;
+
+    private RunnableArgs<MtbColt> onMtbColtClicked;
+
+    public ProdRientroMerceOrderDetailFragment() {
+        // Required empty public constructor
+    }
+
+    public static ProdRientroMerceOrderDetailFragment newInstance() {
+        return new ProdRientroMerceOrderDetailFragment();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        mBindings = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), R.layout.fragment_prod_rientro_merce_order_detail, container, false);
+        mBindings.setLifecycleOwner(this);
+
+        mBindings.setView(this);
+
+        MainApplication.appComponent
+                .prodRientroMerceOrderDetailComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+
+        this.mViewModel.mtbColtsOfOrder.observe(getViewLifecycleOwner(), this::refreshList);
+
+        this.initRecyclerView();
+
+        return mBindings.getRoot();
+    }
+
+    private void initRecyclerView() {
+        mBindings.mainList.setNestedScrollingEnabled(false);
+        mBindings.mainList.setHasFixedSize(true);
+        mBindings.mainList.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL);
+        itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider));
+        mBindings.mainList.addItemDecoration(itemDecorator);
+
+        mAdapter = new ProdRientroMerceOrderDetailMtbColtListAdapter(new ObservableArrayList<>());
+        mAdapter.setEmptyView(mBindings.mtbColtEmptyView);
+
+        mBindings.mainList.setAdapter(mAdapter);
+        mAdapter.setOnItemClickListener(item -> {
+            if(this.onMtbColtClicked != null) this.onMtbColtClicked.run(item);
+        });
+    }
+
+    public void setOrder(OrdineLavorazioneDTO order) {
+        currentOrder.postValue(order);
+        mBindings.invalidateAll();
+        mAdapter.clearDataset();
+
+        mViewModel.setOrder(order);
+    }
+
+    private void refreshList(List<MtbColt> mtbColts) {
+        mAdapter.updateDataset(mtbColts);
+    }
+
+    @Override
+    public void onDataSaved() {
+
+    }
+
+
+    public void addULButtonClick() {
+        this.openProgress();
+
+        String codProd = this.currentOrder.getValue().getCodProd();
+        mArticoloRESTConsumer.getByCodMart(codProd, mtbAart -> {
+
+            String sql = "SELECT TOP 1 * " +
+                    "FROM ( " +
+                    "         SELECT MAX(id_step) OVER ( PARTITION BY gestione, num_ord, data_ord) as last_step, " +
+                    "                * " +
+                    "         FROM dtb_ord_steps " +
+                    "         WHERE cod_jfas IS NOT NULL " +
+                    "           AND gestione = " + UtilityDB.valueToString(this.currentOrder.getValue().getGestione()) +
+                    "           AND num_ord = " + UtilityDB.valueToString(this.currentOrder.getValue().getNumOrd()) +
+                    "           AND data_ord = " + UtilityDB.valueToString(this.currentOrder.getValue().getDataOrdD()) +
+                    "     ) tmp " +
+                    "WHERE data_iniz IS NOT NULL " +
+                    "  AND (data_fine IS NULL OR last_step = id_step) " +
+                    "ORDER BY id_step DESC";
+
+            mSystemRESTConsumer.<List<DtbOrdSteps>>processSql(sql, new TypeToken<ArrayList<DtbOrdSteps>>() {}.getType(), dtbOrdStep -> {
+
+                this.closeProgress();
+
+                DialogInputLUProdDTO dialogInputLUProdDTO = new DialogInputLUProdDTO()
+                        .setMtbAart(mtbAart)
+                        .setNumCnf(this.currentOrder.getValue().getColliPedana())
+                        .setQtaCnf(mtbAart.getQtaCnf())
+                        .setQtaTot(this.currentOrder.getValue().getColliPedana().multiply(mtbAart.getQtaCnf()))
+                        .setPartitaMag(this.currentOrder.getValue().getPartitaMag())
+                        .setDataScad(this.currentOrder.getValue().getDataScadD())
+                        .setCodJfasParent(this.currentOrder.getValue().getCodJfas())
+                        .setCodTcol(this.currentOrder.getValue().getCodTcolUl())
+                        .setSuggestedCodJfas(dtbOrdStep != null && dtbOrdStep.size() > 0 ? dtbOrdStep.get(0).getCodJfas() : null);
+
+
+                DialogInputLUProdView
+                        .newInstance(dialogInputLUProdDTO, resultDTO -> {
+                            ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO()
+                                    .setNumCnf(resultDTO.getNumCnf())
+                                    .setPesoCollo(resultDTO.getPesoCollo())
+                                    .setPesoNetto(resultDTO.getPesoNetto())
+                                    .setTaraPed(resultDTO.getTaraPed())
+                                    .setTaraCol(resultDTO.getTaraCol())
+                                    .setPesoLordo(resultDTO.getPesoLordo())
+                                    .setMtbTCol(resultDTO.getMtbTCol())
+                                    .setJtbFasi(resultDTO.getJtbFasi());
+
+                            this.mViewModel.createLU(pickedQuantityDTO);
+                        }, () -> {
+                            this.closeProgress();
+                        })
+                        .show(getActivity().getSupportFragmentManager(), "tag");
+
+            }, this::onError);
+
+        }, this::onError);
+    }
+
+    public ProdRientroMerceOrderDetailFragment setOnMtbColtClicked(RunnableArgs<MtbColt> onMtbColtClicked) {
+        this.onMtbColtClicked = onMtbColtClicked;
+        return this;
+    }
+
+    public void editMtbColr(MtbColr mtbColr) {
+
+    }
+
+    public void deleteMtbColr(MtbColr mtbColr) {
+        MtbColt mtbColt = new MtbColt()
+                .setGestione(mtbColr.getGestione())
+                .setDataCollo(mtbColr.getDataColloS())
+                .setSerCollo(mtbColr.getSerCollo())
+                .setNumCollo(mtbColr.getNumCollo());
+
+        this.mViewModel.deleteLU(mtbColt);
+    }
+
+    public Drawable getOrderStatusIcon() {
+        if (currentOrder.getValue() != null) {
+            switch (currentOrder.getValue().getStatoEnum()) {
+                case IN_CORSO:
+                    return ContextCompat.getDrawable(getActivity(), R.drawable.ic_play_circle_filled_24dp);
+                case PAUSA:
+                    return ContextCompat.getDrawable(getActivity(), R.drawable.ic_pause_circle_filled_24dp);
+                case PROGRAMMATO:
+                default:
+                    return ContextCompat.getDrawable(getActivity(), R.drawable.ic_clock_circle_outline_24dp);
+            }
+        }
+        else
+            return ContextCompat.getDrawable(getActivity(), R.drawable.ic_clock_circle_outline_24dp);
+    }
+
+    public Integer getOrderStatusIconTintColor() {
+        if (currentOrder.getValue() != null) {
+            switch (currentOrder.getValue().getStatoEnum()) {
+                case IN_CORSO:
+                    return ContextCompat.getColor(getActivity(), R.color.green_800);
+                case PAUSA:
+                    return ContextCompat.getColor(getActivity(), R.color.yellow_800);
+                case PROGRAMMATO:
+                default:
+                    return ContextCompat.getColor(getActivity(), R.color.blue_800);
+            }
+        }
+        else
+            return ContextCompat.getColor(getActivity(), R.color.blue_800);
+    }
+
+    public Drawable getOrderStatusLabelBackgroud() {
+        if (currentOrder.getValue() != null) {
+            switch (currentOrder.getValue().getStatoEnum()) {
+                case IN_CORSO:
+                    return ContextCompat.getDrawable(getActivity(), R.drawable.label_success_text);
+                case PAUSA:
+                    return ContextCompat.getDrawable(getActivity(), R.drawable.label_warning_text);
+                case PROGRAMMATO:
+                default:
+                    return ContextCompat.getDrawable(getActivity(), R.drawable.label_primary_text);
+            }
+        }
+        else
+            return ContextCompat.getDrawable(getActivity(), R.drawable.label_primary_text);
+    }
+
+    public Integer getOrderStatusLabelTextColor() {
+        if (currentOrder.getValue() != null) {
+            switch (currentOrder.getValue().getStatoEnum()) {
+                case IN_CORSO:
+                    return ContextCompat.getColor(getActivity(), R.color.green_800);
+                case PAUSA:
+                    return ContextCompat.getColor(getActivity(), R.color.yellow_800);
+                case PROGRAMMATO:
+                default:
+                    return ContextCompat.getColor(getActivity(), R.color.blue_800);
+            }
+        }
+        else
+            return ContextCompat.getColor(getActivity(), R.color.blue_800);
+    }
+}

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

@@ -0,0 +1,24 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.ProdRientroMerceOrderDetailRESTConsumer;
+
+@Module(subcomponents = ProdRientroMerceOrderDetailComponent.class)
+public class ProdRientroMerceOrderDetailModule {
+
+    @Provides
+    ProdRientroMerceOrderDetailRESTConsumer provideProdRientroMerceOrderDetailRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new ProdRientroMerceOrderDetailRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    ProdRientroMerceOrderDetailViewModel provideProdRientroMerceOrderDetailViewModel(
+            ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer,
+            ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) {
+        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer);
+    }
+
+}

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

@@ -0,0 +1,89 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.recyclerview.widget.RecyclerView;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderDetailMtbColtItemModelBinding;
+
+public class ProdRientroMerceOrderDetailMtbColtListAdapter extends ExtendedRecyclerView<MtbColt, ProdRientroMerceOrderDetailMtbColtListAdapter.ViewHolder> {
+
+    private OnItemClickListener mOnItemClickListener;
+
+    public ProdRientroMerceOrderDetailMtbColtListAdapter(ObservableArrayList<MtbColt> myDataset) {
+        super(myDataset);
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        protected FragmentProdRientroMerceOrderDetailMtbColtItemModelBinding mViewDataBinding;
+
+
+        public ViewHolder(FragmentProdRientroMerceOrderDetailMtbColtItemModelBinding v) {
+            super(v.getRoot());
+            mViewDataBinding = v;
+        }
+
+        public void bind(MtbColt mtbColt) {
+            mViewDataBinding.setMtbColt(mtbColt);
+            mViewDataBinding.executePendingBindings();
+        }
+    }
+
+
+    @Override
+    public ProdRientroMerceOrderDetailMtbColtListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        // create a new view
+        FragmentProdRientroMerceOrderDetailMtbColtItemModelBinding viewDataBinding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.fragment_prod_rientro_merce_order_detail__mtb_colt_item_model, parent, false);
+
+        return new ProdRientroMerceOrderDetailMtbColtListAdapter.ViewHolder(viewDataBinding);
+    }
+
+
+
+    @Override
+    public void onBindViewHolder(ProdRientroMerceOrderDetailMtbColtListAdapter.ViewHolder holder, int position) {
+        MtbColt mtbColt = mDataset.get(position);
+        holder.bind(mtbColt);
+
+        //Setting qty with unt_mis
+//        if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())){
+//            String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
+//
+//            if(mtbColr.getMtbAart() != null) {
+//                text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
+//            }
+//
+//            holder.mViewDataBinding.qtaTextview.setText(text);
+//        } else {
+//            holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
+//        }
+
+        holder.mViewDataBinding.getRoot().setOnClickListener(x -> {
+            if(mOnItemClickListener != null) {
+                mOnItemClickListener.onItemClick(holder.mViewDataBinding.getMtbColt());
+            }
+        });
+
+        holder.mViewDataBinding.executePendingBindings();
+    }
+
+
+
+
+
+    public ProdRientroMerceOrderDetailMtbColtListAdapter setOnItemClickListener(ProdRientroMerceOrderDetailMtbColtListAdapter.OnItemClickListener onItemClickListener) {
+        this.mOnItemClickListener = onItemClickListener;
+        return this;
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(MtbColt item);
+    }
+
+}

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

@@ -0,0 +1,91 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.model.JtbFasi;
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class ProdRientroMerceOrderDetailPickedQuantityDTO {
+
+    private BigDecimal numCnf;
+    private BigDecimal pesoCollo;
+    private BigDecimal pesoNetto;
+    private BigDecimal taraPed;
+    private BigDecimal taraCol;
+    private BigDecimal pesoLordo;
+
+    private MtbTCol mtbTCol;
+    private JtbFasi jtbFasi;
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public BigDecimal getPesoCollo() {
+        return pesoCollo;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setPesoCollo(BigDecimal pesoCollo) {
+        this.pesoCollo = pesoCollo;
+        return this;
+    }
+
+    public BigDecimal getPesoNetto() {
+        return pesoNetto;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setPesoNetto(BigDecimal pesoNetto) {
+        this.pesoNetto = pesoNetto;
+        return this;
+    }
+
+    public BigDecimal getTaraPed() {
+        return taraPed;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setTaraPed(BigDecimal taraPed) {
+        this.taraPed = taraPed;
+        return this;
+    }
+
+    public BigDecimal getTaraCol() {
+        return taraCol;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setTaraCol(BigDecimal taraCol) {
+        this.taraCol = taraCol;
+        return this;
+    }
+
+    public BigDecimal getPesoLordo() {
+        return pesoLordo;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setPesoLordo(BigDecimal pesoLordo) {
+        this.pesoLordo = pesoLordo;
+        return this;
+    }
+
+    public MtbTCol getMtbTCol() {
+        return mtbTCol;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setMtbTCol(MtbTCol mtbTCol) {
+        this.mtbTCol = mtbTCol;
+        return this;
+    }
+
+    public JtbFasi getJtbFasi() {
+        return jtbFasi;
+    }
+
+    public ProdRientroMerceOrderDetailPickedQuantityDTO setJtbFasi(JtbFasi jtbFasi) {
+        this.jtbFasi = jtbFasi;
+        return this;
+    }
+}

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

@@ -0,0 +1,144 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
+
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.ProdRientroMerceOrderDetailRESTConsumer;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto.ImportColliDaProduzioneRequestDTO;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+
+public class ProdRientroMerceOrderDetailViewModel {
+
+    public MutableLiveData<List<MtbColt>> mtbColtsOfOrder = new MutableLiveData<>();
+    private OrdineLavorazioneDTO currentOrder;
+
+    private final ProdRientroMerceOrderDetailRESTConsumer mProdRientroMerceOrderDetailRESTConsumer;
+    private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
+
+    private Listener mListener;
+
+    @Inject
+    public ProdRientroMerceOrderDetailViewModel(ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer,
+                                                ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) {
+        this.mProdRientroMerceOrderDetailRESTConsumer = prodRientroMerceOrderDetailRESTConsumer;
+        this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
+    }
+
+    public void setOrder(OrdineLavorazioneDTO order) {
+        this.currentOrder = order;
+
+        refreshMtbColts();
+    }
+
+    private void refreshMtbColts() {
+        this.sendOnLoadingStarted();
+        this.mtbColtsOfOrder.postValue(null);
+
+        this.mProdRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> {
+            for (MtbColt mtbColt : mtbColts) {
+                mtbColt.getMtbColr().get(0).setDescrizione(currentOrder.getDescrizioneProd());
+            }
+
+            this.mtbColtsOfOrder.postValue(mtbColts);
+            this.sendOnLoadingEnded();
+        }, this::sendError);
+    }
+
+    public void createLU(ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO) {
+
+        new Thread(this::sendOnLoadingStarted).start();
+
+        new Thread(() -> {
+
+            ImportColliDaProduzioneRequestDTO importColliDaProduzioneRequestDTO =
+                    new ImportColliDaProduzioneRequestDTO()
+                            .setColliBancale(pickedQuantityDTO.getNumCnf().intValue())
+                            .setQtaCnf(pickedQuantityDTO.getPesoCollo())
+                            .setQtaCol(pickedQuantityDTO.getPesoNetto())
+                            .setCodJcom(currentOrder.getCodJcom())
+                            .setCodJfas(pickedQuantityDTO.getJtbFasi().getCodJfas())
+                            .setCodMart(currentOrder.getCodProd())
+                            .setCodTcol(pickedQuantityDTO.getMtbTCol().getCodTcol())
+                            .setDataCollo(new Date())
+                            .setDataOrd(currentOrder.getDataOrdD())
+                            .setNumOrd(currentOrder.getNumOrd())
+                            .setGestione(currentOrder.getGestione())
+                            .setPartitaMag(currentOrder.getPartitaMag())
+                            .setFornitore(currentOrder.getRagSocAnag())
+                            .setPesoLordo(pickedQuantityDTO.getPesoLordo())
+                            .setPesoNetto(pickedQuantityDTO.getPesoNetto());
+
+            this.mProdRientroMerceOrderDetailRESTConsumer.importColloDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
+
+                synchronized (this.mtbColtsOfOrder) {
+                    refreshMtbColts();
+                }
+
+                this.sendOnLoadingEnded();
+            }, this::sendError);
+
+
+        }).start();
+
+    }
+
+    public void deleteLU(MtbColt mtbColt) {
+        new Thread(this::sendOnLoadingStarted).start();
+
+        new Thread(() -> {
+            this.mProdRientroMerceOrderDetailRESTConsumer.deleteColloDaProduzione(mtbColt, () -> {
+                synchronized (this.mtbColtsOfOrder) {
+                    Optional<MtbColt> mtbColtToRemove = Stream.of(this.mtbColtsOfOrder.getValue())
+                            .filter(x -> x.getNumCollo().equals(mtbColt.getNumCollo()) &&
+                                    x.getSerCollo().equalsIgnoreCase(mtbColt.getSerCollo()) &&
+                                    x.getDataColloD().compareTo(mtbColt.getDataColloD()) == 0 &&
+                                    x.getGestione().equalsIgnoreCase(mtbColt.getGestione()))
+                            .findFirst();
+
+                    if (mtbColtToRemove.isPresent()) {
+                        this.mtbColtsOfOrder.getValue().remove(mtbColtToRemove.get());
+                        this.mtbColtsOfOrder.postValue(this.mtbColtsOfOrder.getValue());
+                    }
+
+                }
+
+                this.sendOnLoadingEnded();
+            }, this::sendError);
+        }).start();
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+
+    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 onDataSaved();
+
+        void onError(Exception ex);
+
+    }
+}

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

@@ -0,0 +1,155 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest;
+
+import androidx.databinding.ObservableArrayList;
+
+import com.annimon.stream.Stream;
+import com.google.gson.reflect.TypeToken;
+import com.orhanobut.logger.Logger;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.core.utility.UtilityQuery;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto.ImportColliDaProduzioneRequestDTO;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer {
+
+    private final SystemRESTConsumer systemRESTConsumer;
+
+    @Inject
+    public ProdRientroMerceOrderDetailRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.systemRESTConsumer = systemRESTConsumer;
+    }
+
+
+    public void getMtbColtsOfOrder(OrdineLavorazioneDTO ordineLavorazioneDTO, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        String sql = "SELECT mtb_colr.* " +
+                " FROM mtb_colr " +
+                " INNER JOIN mtb_colt mc ON mtb_colr.gestione = mc.gestione AND mtb_colr.data_collo = mc.data_collo AND " +
+                "                                   mtb_colr.ser_collo = mc.ser_collo AND mtb_colr.num_collo = mc.num_collo " +
+                " WHERE " +
+                " mtb_colr.num_ord = " + UtilityDB.valueToString(ordineLavorazioneDTO.getNumOrd()) + " AND" +
+                " mtb_colr.data_ord = " + UtilityDB.valueToString(ordineLavorazioneDTO.getDataOrdD()) + " AND" +
+                " mtb_colr.gestione = 'L' AND" +
+                " mc.segno = 1";
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColr>>() {
+        }.getType();
+        systemRESTConsumer.<List<MtbColr>>processSql(sql, typeOfObjectsList, mtbColrList -> {
+
+
+            if (mtbColrList != null && !mtbColrList.isEmpty()) {
+
+                List<HashMap<String, Object>> params = new ArrayList<>();
+
+                for (MtbColr mtbcolr :
+                        mtbColrList) {
+                    HashMap<String, Object> parm = new HashMap<>();
+
+                    parm.put("data_collo", mtbcolr.getDataColloD());
+                    parm.put("gestione", mtbcolr.getGestione());
+                    parm.put("ser_collo", mtbcolr.getSerCollo());
+                    parm.put("num_collo", mtbcolr.getNumCollo());
+
+                    params.add(parm);
+                }
+
+                String mtbColtSql = "SELECT * FROM mtb_colt WHERE " + UtilityQuery.concatFieldListInWhereCond(params) + "";
+
+
+                Type mtbColtTypeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
+                }.getType();
+                systemRESTConsumer.<List<MtbColt>>processSql(mtbColtSql, mtbColtTypeOfObjectsList, mtbColtList -> {
+
+                    if(mtbColtList == null) mtbColtList = new ArrayList<>();
+
+                    for (MtbColt mtbColt : mtbColtList) {
+
+                        ObservableArrayList<MtbColr> mtbColrsRoAdd = new ObservableArrayList<>();
+                        mtbColrsRoAdd.addAll(Stream.of(mtbColrList)
+                                .filter(x -> x.getNumCollo().equals(mtbColt.getNumCollo()) &&
+                                        x.getDataColloD().compareTo(mtbColt.getDataColloD()) == 0 &&
+                                        x.getGestione().equals(mtbColt.getGestione()) &&
+                                        x.getSerCollo().equals(mtbColt.getSerCollo()))
+                                .toList());
+
+                        mtbColt.setMtbColr(mtbColrsRoAdd);
+                    }
+
+                    onComplete.run(mtbColtList);
+
+                }, onFailed);
+
+            } else {
+                onComplete.run(new ArrayList<>());
+            }
+
+
+        }, onFailed);
+    }
+
+
+
+
+    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>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
+                analyzeAnswer(response, "importColliDaProduzione", mtbColt -> {
+                    onComplete.run(mtbColt);
+                }, ex -> {
+                    if(onFailed != null) onFailed.run(ex);
+                });
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
+                Logger.e(t, "importColliDaProduzione");
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+
+    public void deleteColloDaProduzione(MtbColt mtbColtToDelete, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        ProdRientroMerceOrderDetailRESTConsumerService service = RESTBuilder.getService(ProdRientroMerceOrderDetailRESTConsumerService.class);
+        service.deleteColloDaProduzione(mtbColtToDelete).enqueue(new Callback<ServiceRESTResponse<Object>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                analyzeAnswer(response, "deleteColloDaProduzione", mtbColt -> {
+                    onComplete.run();
+                }, ex -> {
+                    if(onFailed != null) onFailed.run(ex);
+                });
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                Logger.e(t, "deleteColloDaProduzione");
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto.ImportColliDaProduzioneRequestDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+public interface ProdRientroMerceOrderDetailRESTConsumerService {
+
+
+    @POST("importColliDaProduzioneJson")
+    Call<ServiceRESTResponse<MtbColt>> importColliDaProduzione(@Body List<ImportColliDaProduzioneRequestDTO> importColliDaProduzioneRequestDTO);
+
+    @POST("importColloDaProduzioneJson")
+    Call<ServiceRESTResponse<MtbColt>> importColloDaProduzione(@Body ImportColliDaProduzioneRequestDTO importColloDaProduzioneRequestDTO);
+
+    @POST("cancellaColloDaProduzione")
+    Call<ServiceRESTResponse<Object>> deleteColloDaProduzione(@Body MtbColt mtbColtToDelete);
+
+}

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

@@ -0,0 +1,190 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ImportColliDaProduzioneRequestDTO {
+
+    private String codMart;
+    private String codJcom;
+    private String partitaMag;
+    private BigDecimal pesoLordo;
+    private BigDecimal pesoNetto;
+    private String codTcol;
+    private String fornitore;
+
+    private int colliBancale;
+    private BigDecimal qtaCnf;
+    private Date dataCollo;
+
+    private Date dataOrd;
+    private int numOrd;
+    private String codJfas;
+    private String gestione;
+    private BigDecimal qtaCol;
+    private Integer rigaOrd;
+    private Integer numRisorse;
+    private String annotazioni;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public BigDecimal getPesoLordo() {
+        return pesoLordo;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setPesoLordo(BigDecimal pesoLordo) {
+        this.pesoLordo = pesoLordo;
+        return this;
+    }
+
+    public BigDecimal getPesoNetto() {
+        return pesoNetto;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setPesoNetto(BigDecimal pesoNetto) {
+        this.pesoNetto = pesoNetto;
+        return this;
+    }
+
+    public String getCodTcol() {
+        return codTcol;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setCodTcol(String codTcol) {
+        this.codTcol = codTcol;
+        return this;
+    }
+
+    public String getFornitore() {
+        return fornitore;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setFornitore(String fornitore) {
+        this.fornitore = fornitore;
+        return this;
+    }
+
+    public int getColliBancale() {
+        return colliBancale;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setColliBancale(int colliBancale) {
+        this.colliBancale = colliBancale;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public Date getDataCollo() {
+        return dataCollo;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setDataCollo(Date dataCollo) {
+        this.dataCollo = dataCollo;
+        return this;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public int getNumOrd() {
+        return numOrd;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setNumOrd(int numOrd) {
+        this.numOrd = numOrd;
+        return this;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public BigDecimal getQtaCol() {
+        return qtaCol;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setQtaCol(BigDecimal qtaCol) {
+        this.qtaCol = qtaCol;
+        return this;
+    }
+
+    public Integer getRigaOrd() {
+        return rigaOrd;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setRigaOrd(Integer rigaOrd) {
+        this.rigaOrd = rigaOrd;
+        return this;
+    }
+
+    public Integer getNumRisorse() {
+        return numRisorse;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setNumRisorse(Integer numRisorse) {
+        this.numRisorse = numRisorse;
+        return this;
+    }
+
+    public String getAnnotazioni() {
+        return annotazioni;
+    }
+
+    public ImportColliDaProduzioneRequestDTO setAnnotazioni(String annotazioni) {
+        this.annotazioni = annotazioni;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListAdapter.java

@@ -0,0 +1,197 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_list;
+
+import android.content.Context;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.content.ContextCompat;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderListListGroupModelBinding;
+import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderListListModelBinding;
+
+public class ProdRientroMerceOrderListAdapter extends SectionedRecyclerViewAdapter<ProdRientroMerceOrderListAdapter.SubheaderHolder, ProdRientroMerceOrderListAdapter.SingleItemViewHolder> {
+
+    private final Context mContext;
+    private final List<ProdRientroMerceOrderListModel> mDataset = new ArrayList<>();
+    private View mEmptyView;
+
+    private RunnableArgs<String> mOnGroupItemClicked;
+    private RunnableArgs<ProdRientroMerceOrderListModel> mOnItemChecked;
+
+    static class SubheaderHolder extends RecyclerView.ViewHolder {
+
+        FragmentProdRientroMerceOrderListListModelBinding mBinding;
+
+        SubheaderHolder(FragmentProdRientroMerceOrderListListModelBinding binding) {
+            super(binding.getRoot());
+            this.mBinding = binding;
+        }
+
+    }
+
+    static class SingleItemViewHolder extends RecyclerView.ViewHolder {
+
+        FragmentProdRientroMerceOrderListListGroupModelBinding mBinding;
+
+        SingleItemViewHolder(FragmentProdRientroMerceOrderListListGroupModelBinding binding) {
+            super(binding.getRoot());
+            this.mBinding = binding;
+        }
+    }
+
+    public ProdRientroMerceOrderListAdapter(Context context, ObservableArrayList<ProdRientroMerceOrderListModel> mutableDataSet) {
+        this.mContext = context;
+
+        mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+            @Override
+            public void onChanged(ObservableList sender) {
+                mDataset.clear();
+                mDataset.addAll(sender);
+                notifyDataSetChanged();
+                notifyDataChanged();
+                checkIfEmpty();
+            }
+        });
+    }
+
+    public ProdRientroMerceOrderListAdapter setOnGroupItemClicked(RunnableArgs<String> onGroupItemClicked) {
+        this.mOnGroupItemClicked = onGroupItemClicked;
+        return this;
+    }
+
+    public ProdRientroMerceOrderListAdapter setOnItemChecked(RunnableArgs<ProdRientroMerceOrderListModel> onItemChecked) {
+        this.mOnItemChecked = onItemChecked;
+        return this;
+    }
+
+    public ProdRientroMerceOrderListAdapter setEmptyView(View emptyView) {
+        this.mEmptyView = emptyView;
+        this.checkIfEmpty();
+        return this;
+    }
+
+    private void checkIfEmpty() {
+        if (mEmptyView != null) {
+            final boolean emptyViewVisible = getItemCount() == 0;
+            mEmptyView.setVisibility(emptyViewVisible ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    @Override
+    public ProdRientroMerceOrderListAdapter.SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
+        FragmentProdRientroMerceOrderListListModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_prod_rientro_merce_order_list__list_model, parent, false);
+        return new ProdRientroMerceOrderListAdapter.SubheaderHolder(binding);
+    }
+
+    @Override
+    public ProdRientroMerceOrderListAdapter.SingleItemViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+        FragmentProdRientroMerceOrderListListGroupModelBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.fragment_prod_rientro_merce_order_list__list_group_model, parent, false);
+        return new ProdRientroMerceOrderListAdapter.SingleItemViewHolder(binding);
+    }
+
+    @Override
+    public void onBindSubheaderViewHolder(ProdRientroMerceOrderListAdapter.SubheaderHolder subheaderHolder, int nextItemPosition) {
+        ProdRientroMerceOrderListModel pickingObjectDTO = this.mDataset.get(nextItemPosition);
+
+        subheaderHolder.mBinding.groupTitle.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getGroupTitle()) ? View.GONE : View.VISIBLE);
+        subheaderHolder.mBinding.groupTitle.setText(Html.fromHtml(pickingObjectDTO.getGroupTitle()));
+
+        subheaderHolder.mBinding.getRoot().setOnClickListener(new OnSingleClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+                if (mOnGroupItemClicked != null)
+                    mOnGroupItemClicked.run(pickingObjectDTO.getGroupTitle());
+            }
+        });
+    }
+
+    @Override
+    public void onBindItemViewHolder(final ProdRientroMerceOrderListAdapter.SingleItemViewHolder holder, final int position) {
+        ProdRientroMerceOrderListModel listModel = this.mDataset.get(position);
+
+        switch (listModel.getIcon()) {
+            case START:
+                holder.mBinding.ordineStateIcon.setImageResource(R.drawable.ic_play_circle_filled_24dp);
+                holder.mBinding.ordineStateIcon.setColorFilter(ContextCompat.getColor(mContext, R.color.green_800), android.graphics.PorterDuff.Mode.SRC_IN);
+                break;
+            case PAUSE:
+                holder.mBinding.ordineStateIcon.setImageResource(R.drawable.ic_pause_circle_filled_24dp);
+                holder.mBinding.ordineStateIcon.setColorFilter(ContextCompat.getColor(mContext, R.color.yellow_800), android.graphics.PorterDuff.Mode.SRC_IN);
+                break;
+            case SCHEDULED:
+            default:
+                holder.mBinding.ordineStateIcon.setImageResource(R.drawable.ic_clock_circle_outline_24dp);
+                holder.mBinding.ordineStateIcon.setColorFilter(ContextCompat.getColor(mContext, R.color.blue_700), android.graphics.PorterDuff.Mode.SRC_IN);
+                break;
+        }
+
+        if (!UtilityString.isNullOrEmpty(listModel.getPreDescription())) {
+            holder.mBinding.preFirstRow.setText(Html.fromHtml(listModel.getPreDescription()));
+            holder.mBinding.preFirstRow.setVisibility(View.VISIBLE);
+        } else holder.mBinding.preFirstRow.setVisibility(View.GONE);
+
+        if (!UtilityString.isNullOrEmpty(listModel.getDescription())) {
+            holder.mBinding.descrizione.setText(Html.fromHtml(listModel.getDescription()));
+            holder.mBinding.descrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.descrizione.setVisibility(View.GONE);
+
+        if (!UtilityString.isNullOrEmpty(listModel.getSubDescription())) {
+            holder.mBinding.subDescrizione.setText(Html.fromHtml(listModel.getSubDescription()));
+            holder.mBinding.subDescrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.subDescrizione.setVisibility(View.GONE);
+
+        if (!UtilityString.isNullOrEmpty(listModel.getRightDescription())) {
+            holder.mBinding.rightDescrizione.setText(Html.fromHtml(listModel.getRightDescription()));
+            holder.mBinding.rightDescrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.rightDescrizione.setVisibility(View.GONE);
+
+        if (!UtilityString.isNullOrEmpty(listModel.getRightSubDescription())) {
+            holder.mBinding.rightSubDescrizione.setText(Html.fromHtml(listModel.getRightSubDescription()));
+            holder.mBinding.rightSubDescrizione.setVisibility(View.VISIBLE);
+        } else holder.mBinding.rightSubDescrizione.setVisibility(View.GONE);
+
+        holder.mBinding.executePendingBindings();
+
+        holder.mBinding.getRoot().setOnClickListener(v -> {
+            if (this.mOnItemChecked != null) this.mOnItemChecked.run(listModel);
+        });
+    }
+
+    @Override
+    public boolean onPlaceSubheaderBetweenItems(int position) {
+
+        if (getItemSize() == 1) return true;
+        else if (getItemSize() > 1) {
+            ProdRientroMerceOrderListModel compare1 = this.mDataset.get(position);
+            ProdRientroMerceOrderListModel compare2 = this.mDataset.get(position + 1);
+
+            if (UtilityString.equalsIgnoreCase(compare1.getGroupTitle(), compare2.getGroupTitle())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public int getItemSize() {
+        return mDataset.size();
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java

@@ -0,0 +1,167 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_list;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.content.ContextCompat;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.annimon.stream.ComparatorCompat;
+import com.annimon.stream.Stream;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.data_cache.DataCache;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.FragmentProdRientroMerceOrderListBinding;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link ProdRientroMerceOrderListFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class ProdRientroMerceOrderListFragment extends Fragment {
+
+    private final ObservableArrayList<ProdRientroMerceOrderListModel> mOrdiniApertiMutableData = new ObservableArrayList<>();
+
+    private FragmentProdRientroMerceOrderListBinding mBindings = null;
+
+    private RunnableArgs<OrdineLavorazioneDTO> mOnItemSelectedRunnable;
+
+    private ElevatedToolbar mToolbar;
+
+    public ProdRientroMerceOrderListFragment() {
+        // Required empty public constructor
+    }
+
+    public static ProdRientroMerceOrderListFragment newInstance(ElevatedToolbar elevatedToolbar) {
+        Bundle args = new Bundle();
+
+        args.putString("toolbarInstance", DataCache.addItem(elevatedToolbar));
+        final ProdRientroMerceOrderListFragment prodRientroMerceOrderListFragment = new ProdRientroMerceOrderListFragment();
+        prodRientroMerceOrderListFragment.setArguments(args);
+        return prodRientroMerceOrderListFragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+
+        mToolbar = DataCache.retrieveItem(getArguments().getString("toolbarInstance"));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_rientro_merce_order_list, container, false);
+
+        mBindings.setLifecycleOwner(this);
+
+        if(savedInstanceState == null) this.initRecyclerView();
+
+        return mBindings.getRoot();
+    }
+
+    private void initRecyclerView() {
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL);
+        itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider));
+        this.mBindings.mainList.addItemDecoration(itemDecorator);
+
+
+        ProdRientroMerceOrderListAdapter prodRientroMerceOrderListAdapter = new ProdRientroMerceOrderListAdapter(getActivity(), mOrdiniApertiMutableData)
+                .setEmptyView(this.mBindings.emptyView)
+                .setOnItemChecked(x -> {
+                    if(mOnItemSelectedRunnable != null) mOnItemSelectedRunnable.run(x.getOriginalModel());
+                });
+
+        this.mBindings.mainList.setAdapter(prodRientroMerceOrderListAdapter);
+        this.mBindings.mainList.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+        this.mToolbar.setRecyclerView(mBindings.mainList);
+    }
+
+    public void pushOrderList(List<OrdineLavorazioneDTO> orderList) {
+        this.mOrdiniApertiMutableData.clear();
+        this.mOrdiniApertiMutableData.addAll(convertDataModelToListModel(orderList));
+
+    }
+
+
+    private List<ProdRientroMerceOrderListModel> convertDataModelToListModel(List<OrdineLavorazioneDTO> dataList) {
+
+        ComparatorCompat<OrdineLavorazioneDTO> comparator = ComparatorCompat
+                .comparing(OrdineLavorazioneDTO::getCodJfas)
+                .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataInizProd() != null ? ordineLavorazioneDTO.getDataInizProd() : "zzzzzzzz"))
+                .thenComparing(ComparatorCompat.comparing(OrdineLavorazioneDTO::getNumOrd));
+
+        if(dataList == null) return new ArrayList<>();
+
+        List<ProdRientroMerceOrderListModel> notHiddenElements = Stream.of(dataList)
+                .sorted(comparator)
+                .map(x -> {
+                    ProdRientroMerceOrderListModel listModel = new ProdRientroMerceOrderListModel();
+
+                    switch (x.getStatoEnum()) {
+                        case IN_CORSO:
+                            listModel.setIcon(ProdRientroMerceOrderListModel.StatoIconEnum.START);
+                            break;
+                        case PAUSA:
+                            listModel.setIcon(ProdRientroMerceOrderListModel.StatoIconEnum.PAUSE);
+                            break;
+                        case PROGRAMMATO:
+                        default:
+                            listModel.setIcon(ProdRientroMerceOrderListModel.StatoIconEnum.SCHEDULED);
+                            break;
+                    }
+
+                    listModel.setGroupTitle(x.getCodJfas());
+
+                    if(!UtilityString.isNullOrEmpty(x.getRagSocAnag()))
+                        listModel.setPreDescription("Provenienza: " + x.getRagSocAnag());
+
+                    String testataOrdString = "N° " + x.getNumOrd();
+                    listModel.setDescription(testataOrdString);
+
+                    listModel.setSubDescription(x.getDescrizioneProd());
+
+                    listModel.setRightDescription(x.getCodJcom() != null ? (x.getDescCommessa() + " (" + x.getCodJcom() + ")") : "");
+
+                    try {
+                        listModel.setRightSubDescription(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                    } catch (Exception ex) {
+
+                    }
+
+                    listModel.setOriginalModel(x);
+
+                    return listModel;
+                })
+                .toList();
+
+        return notHiddenElements;
+    }
+
+    public ProdRientroMerceOrderListFragment setOnItemSelectedRunnable(RunnableArgs<OrdineLavorazioneDTO> onItemSelectedRunnable) {
+        this.mOnItemSelectedRunnable = onItemSelectedRunnable;
+        return this;
+    }
+
+    public RecyclerView getList() {
+        return mBindings.mainList;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListModel.java

@@ -0,0 +1,108 @@
+package it.integry.integrywmsnative.gest.prod_rientro_merce.order_list;
+
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+
+public class ProdRientroMerceOrderListModel implements Cloneable {
+    private String groupTitle;
+
+    private StatoIconEnum icon;
+    private String preDescription;
+    private String description;
+    private String subDescription;
+    private String rightDescription;
+    private String rightSubDescription;
+
+    private boolean hidden;
+
+
+    private OrdineLavorazioneDTO originalModel;
+
+
+    public String getGroupTitle() {
+        return groupTitle;
+    }
+
+    public ProdRientroMerceOrderListModel setGroupTitle(String groupTitle) {
+        this.groupTitle = groupTitle;
+        return this;
+    }
+
+    public StatoIconEnum getIcon() {
+        return icon;
+    }
+
+    public ProdRientroMerceOrderListModel setIcon(StatoIconEnum icon) {
+        this.icon = icon;
+        return this;
+    }
+
+    public String getPreDescription() {
+        return preDescription;
+    }
+
+    public ProdRientroMerceOrderListModel setPreDescription(String preDescription) {
+        this.preDescription = preDescription;
+        return this;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public ProdRientroMerceOrderListModel setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public String getSubDescription() {
+        return subDescription;
+    }
+
+    public ProdRientroMerceOrderListModel setSubDescription(String subDescription) {
+        this.subDescription = subDescription;
+        return this;
+    }
+
+    public String getRightDescription() {
+        return rightDescription;
+    }
+
+    public ProdRientroMerceOrderListModel setRightDescription(String rightDescription) {
+        this.rightDescription = rightDescription;
+        return this;
+    }
+
+    public String getRightSubDescription() {
+        return rightSubDescription;
+    }
+
+    public ProdRientroMerceOrderListModel setRightSubDescription(String rightSubDescription) {
+        this.rightSubDescription = rightSubDescription;
+        return this;
+    }
+
+    public boolean isHidden() {
+        return hidden;
+    }
+
+    public ProdRientroMerceOrderListModel setHidden(boolean hidden) {
+        this.hidden = hidden;
+        return this;
+    }
+
+    public OrdineLavorazioneDTO getOriginalModel() {
+        return originalModel;
+    }
+
+    public ProdRientroMerceOrderListModel setOriginalModel(OrdineLavorazioneDTO originalModel) {
+        this.originalModel = originalModel;
+        return this;
+    }
+
+
+    public static enum StatoIconEnum {
+        PAUSE,
+        START,
+        SCHEDULED
+    }
+}