Finish v1.16.1(183)

Vario.

.idea/runConfigurations/app_base.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_base" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
+    <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="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <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="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
@@ -41,11 +42,16 @@
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_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>

.idea/runConfigurations/app_frudis.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_frudis" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
+    <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="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <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="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
@@ -41,11 +42,16 @@
     </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>

.idea/runConfigurations/app_gramm.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_gramm" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
+    <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="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <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="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
@@ -41,11 +42,16 @@
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_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>

.idea/runConfigurations/app_ime.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_ime" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
+    <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="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_saporiveri,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <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="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
@@ -41,11 +42,16 @@
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_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>

.idea/runConfigurations/app_saporiveri.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_saporiveri" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
+    <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="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri_pv,dynamic_vgalimenti" />
+    <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="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
@@ -41,11 +42,16 @@
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_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>

.idea/runConfigurations/app_saporiveri_pv.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_saporiveri_pv" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
+    <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="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_vgalimenti" />
+    <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="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
@@ -41,11 +42,16 @@
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_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>

.idea/runConfigurations/app_vglimenti.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_vglimenti" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
+    <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="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv" />
+    <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="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
@@ -41,11 +42,16 @@
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_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>

app/build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 154
-    def appVersionName = '1.13.8'
+    def appVersionCode = 183
+    def appVersionName = '1.16.1'
 
     signingConfigs {
         release {
@@ -21,7 +21,7 @@ android {
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            output.outputFileName = "android-release_v2.apk"
+            output.outputFileName = "android-release.apk"
         }
     }
 
@@ -60,8 +60,8 @@ android {
 
     build {
         doLast {
-            delete "$projectDir/build/outputs/apk/release/version_v2.txt"
-            file("$projectDir/build/outputs/apk/release/version_v2.txt").text = appVersionCode + '\n' + appVersionName
+            delete "$projectDir/build/outputs/apk/release/version.txt"
+            file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName
         }
     }
 
@@ -82,33 +82,42 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.orhanobut:logger:2.2.0'
-    implementation 'com.google.firebase:firebase-core:17.5.0'
-    implementation 'com.google.firebase:firebase-crash:16.2.1'
-    implementation 'com.google.firebase:firebase-perf:19.0.8'
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+
+    //Firebase
+
+    // Import the Firebase BoM
+    implementation platform('com.google.firebase:firebase-bom:26.3.0')
+    implementation 'com.google.firebase:firebase-analytics'
+    implementation 'com.google.firebase:firebase-core'
+    implementation 'com.google.firebase:firebase-crash'
+    implementation 'com.google.firebase:firebase-crashlytics'
+    implementation 'com.google.firebase:firebase-perf'
+    implementation 'com.google.android.gms:play-services-basement:17.5.0'
+
+
     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-alpha02'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'com.google.android.material:material:1.3.0-rc01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    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:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
-    implementation 'org.apache.commons:commons-text:1.8'
+    implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.27'
+    def dagger2_version = '2.29.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
     api "com.google.dagger:dagger:$dagger2_version"
@@ -125,7 +134,7 @@ dependencies {
     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'
+    testImplementation 'junit:junit:4.13.1'
     implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
@@ -145,8 +154,8 @@ dependencies {
     implementation project(':honeywellscannerlibrary')
     implementation project(':keyobardemulatorscannerlibrary')
     implementation project(':barcode_kaiteki')
-    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1'
-    androidTestImplementation 'org.testng:testng:7.1.0'
+    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    androidTestImplementation 'org.testng:testng:7.3.0'
 }
 repositories {
     mavenCentral()

app/google-services.json

@@ -14,14 +14,6 @@
         }
       },
       "oauth_client": [
-        {
-          "client_id": "963231271247-b50hgcd89u9ksfc7189mri044kq8aq1p.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "it.integry.integrywmsnative",
-            "certificate_hash": "864b69dcc40196befa65638a868cec1c61245fa6"
-          }
-        },
         {
           "client_id": "963231271247-59qdc1vobbnjfp135ce4hv12c53s9hse.apps.googleusercontent.com",
           "client_type": 1,
@@ -30,6 +22,14 @@
             "certificate_hash": "3b6d97a981f446f5011049d781aeb9960f9352af"
           }
         },
+        {
+          "client_id": "963231271247-b50hgcd89u9ksfc7189mri044kq8aq1p.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "it.integry.integrywmsnative",
+            "certificate_hash": "864b69dcc40196befa65638a868cec1c61245fa6"
+          }
+        },
         {
           "client_id": "963231271247-6jof105pci1g0g7m2e7kjbtrtk2443g4.apps.googleusercontent.com",
           "client_type": 3
@@ -41,20 +41,13 @@
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 1
-        },
         "appinvite_service": {
-          "status": 2,
           "other_platform_oauth_client": [
             {
               "client_id": "963231271247-6jof105pci1g0g7m2e7kjbtrtk2443g4.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
-        },
-        "ads_service": {
-          "status": 2
         }
       }
     }

app/src/main/AndroidManifest.xml

@@ -22,13 +22,17 @@
             android:name=".gest.spedizione.SpedizioneActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" ></activity>
+            android:windowSoftInputMode="adjustNothing" />
         <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
         <activity
-            android:name=".gest.picking_resi.PickingResiActivity"
+            android:name=".gest.picking_resi_OLD.PickingResiActivity"
             android:label="@string/activity_ultime_consegne_title"
             android:screenOrientation="portrait"
             android:theme="@style/Light" />
+        <activity
+            android:name=".gest.picking_resi.PickingResiActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Light" />
         <activity
             android:name=".MainActivity"
             android:screenOrientation="portrait"
@@ -41,12 +45,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
-        <activity
-            android:name=".gest.spedizione.VenditaOrdineInevasoActivity"
+            android:name=".gest.accettazione_picking.AccettazionePickingActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />

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

@@ -175,8 +175,8 @@ public class MainActivity extends BaseActivity
                     break;
 
                 case R.id.nav_logout:
-                    UtilitySettings.logout(this.mAppDatabase);
                     ServerStatusChecker.dispose();
+                    UtilitySettings.logout();
 
                     startLoginActivity();
                     break;
@@ -296,12 +296,12 @@ public class MainActivity extends BaseActivity
 
         if(fragment instanceof IScrollableFragment) {
             ((IScrollableFragment) fragment).setScrollToolbar(mBinding.appBarMain.elevatedToolbar);
-            ((IScrollableFragment) fragment).setOnPreDestroy(() -> {
+            ((IScrollableFragment) fragment).setScrollableOnPreDestroy(() -> {
                 mBinding.appBarMain.elevatedToolbar.resetAll();
             });
         }
 
-        if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isEnabled()) {
+        if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isSelectAllButtonEnabled()) {
             mBinding.appBarMain.mainSelectAll.setVisibility(View.VISIBLE);
             mBinding.appBarMain.mainSelectAll.setOnClickListener(new OnSingleClickListener() {
                 @Override
@@ -309,9 +309,10 @@ public class MainActivity extends BaseActivity
                     ((ISelectAllFragment)fragment).onSelectAll();
                 }
             });
-        } else {
-            mBinding.appBarMain.mainSelectAll.setVisibility(View.GONE);
-            mBinding.appBarMain.mainSelectAll.setOnClickListener(null);
+            ((ISelectAllFragment) fragment).setSelectAllOnPreDestroy(() -> {
+                mBinding.appBarMain.mainSelectAll.setVisibility(View.GONE);
+                mBinding.appBarMain.mainSelectAll.setOnClickListener(null);
+            });
         }
 
         if(fragment instanceof IFilterableFragment) {

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

@@ -34,6 +34,8 @@ public class MainApplication extends Application {
                 .roomModule(roomModule)
                 .build();
 
+        appComponent.inject(appContext);
+
         appContext.init();
         res = getResources();
     }

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

@@ -3,9 +3,18 @@ package it.integry.integrywmsnative;
 import javax.inject.Singleton;
 
 import dagger.Component;
+import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;
+import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingComponent;
+import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingModule;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoComponent;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoModule;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoComponent;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoModule;
+import it.integry.integrywmsnative.gest.picking_resi.PickingResiComponent;
+import it.integry.integrywmsnative.gest.picking_resi.PickingResiModule;
+import it.integry.integrywmsnative.gest.prod_posizionamento_da_ord.ProdPosizionamentoDaOrdComponent;
+import it.integry.integrywmsnative.gest.prod_posizionamento_da_ord.ProdPosizionamentoDaOrdModule;
 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;
@@ -14,6 +23,10 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComp
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
+import it.integry.integrywmsnative.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;
 
 // Definition of the Application graph
 @Singleton
@@ -25,7 +38,13 @@ import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
         PVOrdineAcquistoEditModule.class,
         PickingLiberoModule.class,
         RettificaGiacenzeModule.class,
-        SpedizioneModule.class})
+        SpedizioneModule.class,
+        AccettazionePickingModule.class,
+        PickingResiModule.class,
+        ProdPosizionamentoDaOrdModule.class,
+        OrdiniUscitaElencoModule.class,
+        DialogInputQuantityV2Module.class,
+        DialogScanArtModule.class})
 public interface MainApplicationComponent {
 
     MainActivityComponent.Factory mainActivityComponent();
@@ -34,5 +53,15 @@ public interface MainApplicationComponent {
     PickingLiberoComponent.Factory pickingLiberoComponent();
     RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
     SpedizioneComponent.Factory spedizioneComponent();
+    AccettazionePickingComponent.Factory accettazionePickingComponent();
+    PickingResiComponent.Factory pickingResiComponent();
+    ProdPosizionamentoDaOrdComponent.Factory prodPosizionamentoDaOrdComponent();
+    OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
+    DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
+    DialogScanArtComponent.Factory dialogScanArtComponent();
+
+
+
+    void inject(AppContext appContext);
 
 }

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

@@ -11,7 +11,9 @@ import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 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.OrdiniRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 
@@ -40,8 +42,14 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    OrdiniRESTConsumer provideOrdiniRESTConsumer() {
-        return new OrdiniRESTConsumer();
+    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new OrdiniRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    GestSetupRESTConsumer provideGestSetupRESTConsumer() {
+        return new GestSetupRESTConsumer();
     }
 
     @Provides
@@ -52,8 +60,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer() {
-        return new ColliMagazzinoRESTConsumer();
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
+        return new ColliMagazzinoRESTConsumer(articoloRESTConsumer);
     }
 
     @Provides
@@ -74,5 +82,11 @@ public class MainApplicationModule {
         return new SystemRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    PosizioniRESTConsumer providesPosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new PosizioniRESTConsumer(systemRESTConsumer);
+    }
+
 
 }

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

@@ -3,15 +3,14 @@ package it.integry.integrywmsnative.core.class_router.configs;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
-import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
-import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
-import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
+import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
 
 public class MenuConfiguration extends BaseMenuConfiguration {
@@ -48,7 +47,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.vendita_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_spedizione)
                                 .setDrawerIcon(R.drawable.ic_black_upload)
-                                .setFragmentFactory(MainVenditaFragment::newInstance))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_free_picking)
@@ -79,7 +78,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                         .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
                         .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
                         .setDrawerIcon(R.drawable.ic_black_external)
-                        .setFragmentFactory(ProdOrdineLavorazioneElencoFragment::newInstance))
+                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1)))
 
                 .addItem(new MenuItem()
                         .setID(R.id.nav_free_lav_picking)
@@ -88,6 +87,13 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                         .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
                         .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE)))
 
+                .addItem(new MenuItem()
+                        .setID(R.id.nav_prod_posizionamento_da_ord)
+                        .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title)
+                        .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
+                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, 1)))
+
                 .addItem(new MenuItem()
                         .setID(R.id.nav_prod_versamento_materiale)
                         .setTitleText(R.string.prod_versamento_materiale_title_fragment)

app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IOrdiniVendita.java

@@ -1,16 +1,13 @@
 package it.integry.integrywmsnative.core.class_router.interfaces;
 
-import android.app.Dialog;
-import android.app.ProgressDialog;
-
 import java.util.List;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 
 public interface IOrdiniVendita {
 
-    void distribuisciCollo(MtbColt mtbColt, List<OrdineVenditaInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed);
+    void distribuisciCollo(MtbColt mtbColt, List<OrdineUscitaInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed);
 
 }

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

@@ -6,12 +6,16 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.AndroidLogAdapter;
 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;
 import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
+import it.integry.integrywmsnative.core.utility.UtilitySettings;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.core.utility.UtilityToast;
 
@@ -20,6 +24,9 @@ public class AppContext {
     //Note: this is the Application Context NOT the Activity Context
     private final Context mContext;
 
+    @Inject
+    AppDatabase mAppDatabase;
+
     public AppContext(Context context) {
         this.mContext = context;
     }
@@ -50,11 +57,11 @@ public class AppContext {
             FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
 
             if(     SettingsManager.isInstanceAvailable() &&
-                    (SettingsManager.i().userSession != null && !UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB)) &&
-                    (SettingsManager.i().user != null && !UtilityString.isNullOrEmpty(SettingsManager.i().user.fullname))) {
+                    (SettingsManager.i().getUserSession() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB())) &&
+                    (SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()))) {
 
-                crashlytics.setUserId(SettingsManager.i().user.fullname);
-                crashlytics.setCustomKey("profile_db", SettingsManager.i().userSession.profileDB);
+                crashlytics.setUserId(SettingsManager.i().getUser().getFullname());
+                crashlytics.setCustomKey("profile_db", SettingsManager.i().getUserSession().getProfileDB());
             }
         }
     }
@@ -63,6 +70,7 @@ public class AppContext {
         UtilityContext.initApplicationContext(mContext);
         UtilityResources.init(mContext);
         UtilityToast.init(mContext);
+        UtilitySettings.init(mAppDatabase);
     }
 
     private void initLogger() {

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

@@ -3,15 +3,18 @@ package it.integry.integrywmsnative.core.context;
 import android.content.Context;
 import android.text.SpannableString;
 
-import java.lang.reflect.Method;
-
 import androidx.appcompat.app.AppCompatActivity;
 
-import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
+import java.lang.reflect.Method;
+
+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.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;
 
 public class MainContext {
@@ -44,7 +47,10 @@ public class MainContext {
     private void initDBData(Runnable onComplete) {
         SettingsManager.loadDBVariables(onComplete, ex -> {
                     DialogSimpleMessageHelper.makeErrorDialog(mContext,
-                            new SpannableString(ex.getMessage()), null, mContext::finish).show();
+                            new SpannableString(ex.getMessage()), null, mContext::finish, R.string.logout, () -> {
+                                UtilitySettings.logout();
+                                MainApplication.exit();
+                            }).show();
                 }
         );
     }

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

@@ -8,12 +8,8 @@ import com.google.android.gms.common.util.IOUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -22,8 +18,8 @@ import java.util.Random;
 
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 
 public class ColliDataRecover {
 
@@ -35,7 +31,7 @@ public class ColliDataRecover {
         private String gestioneCollo;
         private String filtro;
 
-        private List<OrdineVenditaInevasoDTO> testateOrdini;
+        private List<OrdineUscitaInevasoDTO> testateOrdini;
 
         public int getId() {
             return id;
@@ -91,11 +87,11 @@ public class ColliDataRecover {
             return this;
         }
 
-        public List<OrdineVenditaInevasoDTO> getTestateOrdini() {
+        public List<OrdineUscitaInevasoDTO> getTestateOrdini() {
             return testateOrdini;
         }
 
-        public RecoverDTO setTestateOrdini(List<OrdineVenditaInevasoDTO> testateOrdini) {
+        public RecoverDTO setTestateOrdini(List<OrdineUscitaInevasoDTO> testateOrdini) {
             this.testateOrdini = testateOrdini;
             return this;
         }
@@ -153,7 +149,7 @@ public class ColliDataRecover {
         return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
     }
 
-    public static int startNewSession(MtbColt mtbColtSession, List<OrdineVenditaInevasoDTO> testateOrdini) {
+    public static int startNewSession(MtbColt mtbColtSession, List<OrdineUscitaInevasoDTO> testateOrdini) {
         Integer newId = null;
 
         while(newId == null) {

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

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.data_recover;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 
 public class ColliDataRecoverDTO {
 
@@ -14,7 +14,7 @@ public class ColliDataRecoverDTO {
     private String gestioneCollo;
     private String filtro;
 
-    private List<OrdineVenditaInevasoDTO> testateOrdini;
+    private List<OrdineUscitaInevasoDTO> testateOrdini;
 
     public int getId() {
         return id;
@@ -70,11 +70,11 @@ public class ColliDataRecoverDTO {
         return this;
     }
 
-    public List<OrdineVenditaInevasoDTO> getTestateOrdini() {
+    public List<OrdineUscitaInevasoDTO> getTestateOrdini() {
         return testateOrdini;
     }
 
-    public ColliDataRecoverDTO setTestateOrdini(List<OrdineVenditaInevasoDTO> testateOrdini) {
+    public ColliDataRecoverDTO setTestateOrdini(List<OrdineUscitaInevasoDTO> testateOrdini) {
         this.testateOrdini = testateOrdini;
         return this;
     }

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

@@ -21,8 +21,8 @@ import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 
 @Singleton
 public class ColliDataRecoverService {
@@ -72,7 +72,7 @@ public class ColliDataRecoverService {
         return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
     }
 
-    public int startNewSession(MtbColt mtbColtSession, List<OrdineVenditaInevasoDTO> testateOrdini) {
+    public int startNewSession(MtbColt mtbColtSession, List<OrdineUscitaInevasoDTO> testateOrdini) {
         Integer newId = null;
 
         while(newId == null) {

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

@@ -6,7 +6,7 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
-import java.util.Date;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 @Entity(
         tableName = "articoli_griglia",
@@ -159,7 +159,7 @@ public class ArticoloGriglia {
         articolo.setQtaCnf(this.getQtaCnf());
         articolo.setUntMis(this.getUntMis());
         articolo.setDescrizione(this.getDescrizione());
-        articolo.setDataIns(new Date());
+        articolo.setDataIns(UtilityDate.getDateInstance());
         articolo.setQtaOrd(0);
 
         return articolo;

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

@@ -1,23 +1,6 @@
 package it.integry.integrywmsnative.core.di;
 
-import androidx.annotation.ColorRes;
-import androidx.annotation.IdRes;
-import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView;
-import androidx.appcompat.widget.LinearLayoutCompat;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.databinding.BindingAdapter;
-import androidx.databinding.BindingConversion;
-import androidx.constraintlayout.widget.Guideline;
-
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-
-import androidx.core.util.Pair;
-import androidx.appcompat.widget.AppCompatCheckBox;
-import androidx.appcompat.widget.AppCompatTextView;
-
 import android.app.DatePickerDialog;
-import android.content.Context;
 import android.content.res.ColorStateList;
 import android.util.Log;
 import android.view.View;
@@ -25,10 +8,25 @@ import android.widget.AutoCompleteTextView;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
+import androidx.annotation.ColorRes;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.constraintlayout.widget.Guideline;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.util.Pair;
+import androidx.databinding.BindingAdapter;
+import androidx.databinding.BindingConversion;
+import androidx.databinding.Observable;
+import androidx.databinding.ObservableField;
+
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -37,15 +35,10 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 
-import androidx.databinding.Observable;
-import androidx.databinding.ObservableField;
-import androidx.lifecycle.MutableLiveData;
-
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
-import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -178,7 +171,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         String newValue = observableString.get();
-        String viewValue = view.getText().toString().trim();
+        String viewValue = view.getText().toString();
 
         if(!viewValue.equalsIgnoreCase(newValue)) {
             view.setText(newValue);
@@ -386,7 +379,7 @@ public class Converters {
     }
 
 
-    @BindingAdapter({"app:visibility"})
+    @BindingAdapter({"visibility"})
     public static void bindViewVisibility(View view, final BindableBoolean bindableBoolean) {
         if (view.getTag(R.id.bound_observable) != bindableBoolean) {
             view.setTag(R.id.bound_observable, bindableBoolean);

app/src/main/java/it/integry/integrywmsnative/core/exception/AlreadyUsedAnonymousLabelException.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 AlreadyUsedAnonymousLabelException extends Exception {
+
+    public AlreadyUsedAnonymousLabelException() {
+        super(UtilityResources.getString(R.string.already_used_anonymous_barcode));
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidLUMultiCodMdepException.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 InvalidLUMultiCodMdepException extends Exception {
+
+    public InvalidLUMultiCodMdepException() {
+        super(UtilityResources.getString(R.string.error_multiple_cod_mdep_ord));
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidLUMultiGestioneException.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 InvalidLUMultiGestioneException extends Exception {
+
+    public InvalidLUMultiGestioneException() {
+        super(UtilityResources.getString(R.string.error_multiple_gest));
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidOrderTypeException.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 InvalidOrderTypeException extends Exception {
+
+    public InvalidOrderTypeException() {
+        super(UtilityResources.getString(R.string.error_wrong_order_type));
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/exception/LUScanNotGrantedException.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 LUScanNotGrantedException extends Exception {
+
+    public LUScanNotGrantedException() {
+        super(UtilityResources.getString(R.string.lu_scan_not_granted_here));
+    }
+}

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

@@ -5,6 +5,6 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 
 public class NoPrintersFoundException extends Exception {
     public NoPrintersFoundException() {
-        super(UtilityResources.getString(R.string.exception_printer_not_found));
+        super(UtilityResources.getString(R.string.exception_no_printer_found));
     }
 }

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

@@ -1,15 +1,19 @@
 package it.integry.integrywmsnative.core.expansion;
 
+import android.app.Dialog;
 import android.view.KeyEvent;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.exception.MyExceptionHandler;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
 
 public class BaseActivity extends AppCompatActivity {
 
 
+    protected Dialog mCurrentProgress;
+
     public BaseActivity() {
         Thread.setDefaultUncaughtExceptionHandler(new MyExceptionHandler(this, BaseActivity.class));
     }
@@ -33,4 +37,19 @@ public class BaseActivity extends AppCompatActivity {
 
         );
     }
+
+
+
+    protected void openProgress() {
+        if (this.mCurrentProgress == null) {
+            this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(this);
+        }
+    }
+
+    protected void closeProgress() {
+        if (mCurrentProgress != null) {
+            mCurrentProgress.dismiss();
+            mCurrentProgress = null;
+        }
+    }
 }

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

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.core.expansion;
+
+import android.view.KeyEvent;
+
+import androidx.fragment.app.DialogFragment;
+
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+
+public class BaseDialogFragment extends DialogFragment {
+
+    private boolean mBarcodeListener = false;
+
+    public BaseDialogFragment() {
+        super();
+        if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) {
+            getDialog().setOnKeyListener((dialog, keyCode, event) -> {
+                if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) {
+                    return BarcodeManager.onKeyDown(event.getKeyCode(), event);
+                }
+                return false;
+            });
+        }
+    }
+
+    private boolean isControlKey(KeyEvent keyEvent) {
+        int keyCode = keyEvent.getKeyCode();
+        return (
+                keyCode == KeyEvent.KEYCODE_BACK ||
+                        keyCode == KeyEvent.KEYCODE_SHIFT_LEFT ||
+                        keyCode == KeyEvent.KEYCODE_DEL
+        );
+    }
+
+    public void setBarcodeListener(boolean listen) {
+        this.mBarcodeListener = listen;
+    }
+}

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

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.expansion;
+
+public interface RunnableArgsWithReturn<T, R> {
+
+    R run(T data);
+
+}

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

@@ -0,0 +1,6 @@
+package it.integry.integrywmsnative.core.expansion;
+
+public interface RunnableArgssss<S, T, U, V> {
+
+    void run(S data1, T data2, U data3, V data4);
+}

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

@@ -40,6 +40,7 @@ public abstract class ExtendedRecyclerView<T, VH extends RecyclerView.ViewHolder
 
     public ExtendedRecyclerView<T, VH> setEmptyView(View emptyView) {
         this.mEmptyView = emptyView;
+        this.checkIfEmpty();
         return this;
     }
 

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

@@ -6,6 +6,6 @@ public interface IScrollableFragment {
 
     void setScrollToolbar(ElevatedToolbar toolbar);
 
-    void setOnPreDestroy(Runnable onPreDestroy);
+    void setScrollableOnPreDestroy(Runnable onPreDestroy);
 
 }

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

@@ -2,8 +2,10 @@ package it.integry.integrywmsnative.core.interfaces;
 
 public interface ISelectAllFragment {
 
-    boolean isEnabled();
+    boolean isSelectAllButtonEnabled();
 
     void onSelectAll();
 
+    void setSelectAllOnPreDestroy(Runnable onPreDestroy);
+
 }

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

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.interfaces;
 
 import android.content.Context;
 
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.AppCompatTextView;
 
 /**
@@ -13,4 +12,6 @@ public interface ITitledFragment {
 
     void onCreateActionBar(AppCompatTextView titleText, Context context);
 
+    void onActionBarPreDestroy(Runnable onActionBarPreDestroy);
+
 }

app/src/main/java/it/integry/integrywmsnative/core/interfaces/viewmodel_listeners/ILUBaseOperationsListener.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.core.interfaces.viewmodel_listeners;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public interface ILUBaseOperationsListener {
+
+    void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete);
+
+    void onLUOpened(MtbColt mtbColt);
+
+    void onLUClosed();
+
+    void onRowSaved();
+}

app/src/main/java/it/integry/integrywmsnative/core/interfaces/viewmodel_listeners/ILoadingListener.java

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.interfaces.viewmodel_listeners;
+
+public interface ILoadingListener {
+
+    void onLoadingStarted();
+
+    void onLoadingEnded();
+
+}

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

@@ -141,6 +141,8 @@ public class DtbDocr {
 
     private MtbAart mtbAart;
 
+    private String dataScadPartitaMag;
+
     public String getCodAnag() {
         return codAnag;
     }
@@ -739,6 +741,19 @@ public class DtbDocr {
         return this;
     }
 
+    public String getDataScadPartitaMag() {
+        return dataScadPartitaMag;
+    }
+
+    public Date getDataScadPartitaMagD() {
+        return UtilityDate.recognizeDateWithExceptionHandler(getDataScadPartitaMag());
+    }
+
+    public DtbDocr setDataScadPartitaMag(String dataScadPartitaMag) {
+        this.dataScadPartitaMag = dataScadPartitaMag;
+        return this;
+    }
+
     public MtbAart getMtbAart() {
         return mtbAart;
     }

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

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.model;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -21,8 +20,8 @@ public class MtbCols extends EntityBase {
 
     public MtbCols() {
         type = "mtb_cols";
-        setCodMdep(SettingsManager.i().userSession.depo.getCodMdep());
-        setModificatoDa(SettingsManager.i().user.fullname);
+        setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
+        setModificatoDa(SettingsManager.i().getUser().getFullname());
         setDataMove(UtilityDate.getDateInstance());
     }
 

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

@@ -54,6 +54,7 @@ public class MtbColt extends EntityBase {
     private BigDecimal lunghezzaCm;
     private BigDecimal larghezzaCm;
     private BigDecimal altezzaCm;
+    private String codJcom;
 
     private List<MtbCols> mtbCols;
 
@@ -86,7 +87,7 @@ public class MtbColt extends EntityBase {
     private ObservableArrayList<MtbColr> mtbColr = new ObservableArrayList<>();
 
     public ObservableArrayList<MtbColr> getMtbColr() {
-        return mtbColr;
+        return mtbColr == null ? new ObservableArrayList<>() : mtbColr;
     }
 
     public MtbColt setMtbColr(ObservableArrayList<MtbColr> mtbColr) {
@@ -101,8 +102,8 @@ public class MtbColt extends EntityBase {
     }
 
     public MtbColt initDefaultFields() {
-        setCodMdep(SettingsManager.i().userSession.depo.getCodMdep());
-        setPreparatoDa(SettingsManager.i().user.fullname);
+        setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
+        setPreparatoDa(SettingsManager.i().getUser().getFullname());
         setOraInizPrep(UtilityDate.getDateInstance());
         setCodAnag(SettingsManager.iDB().getDefaultCodAnag());
 
@@ -312,6 +313,10 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public Date getDataOrdD() {
+        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrd());
+    }
+
     public String getDataOrd() {
         return dataOrd;
     }
@@ -496,6 +501,15 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public MtbColt setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";
@@ -537,6 +551,10 @@ public class MtbColt extends EntityBase {
     }
 
 
+    public boolean isDocumentPresent() {
+        return this.getNumDoc() != null && this.getDataDoc() != null && this.getSerDoc() != null;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

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

@@ -0,0 +1,60 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.util.Date;
+
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class OrdineInevasoDTO {
+
+    private String data;
+    private Integer numero;
+    private String gestione;
+    private String codMdep;
+
+    public String getDataOrdS() {
+        return data;
+    }
+
+    public Date getDataOrdD() {
+        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
+    }
+
+    public OrdineInevasoDTO setData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    public Integer getNumOrd() {
+        return numero;
+    }
+
+    public OrdineInevasoDTO setNumero(Integer numero) {
+        this.numero = numero;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public GestioneEnum getGestioneEnum() {
+        return GestioneEnum.fromString(getGestione());
+    }
+
+
+    public OrdineInevasoDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public OrdineInevasoDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.gest.spedizione.model;
+package it.integry.integrywmsnative.core.model.dto;
 
 import java.math.BigDecimal;
 
@@ -10,9 +10,19 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class PickDataDTO {
 
+    private MtbColt refMtbColt;
     private MtbColt sourceMtbColt;
     private ManualPickDTO manualPickDTO;
 
+    public MtbColt getRefMtbColt() {
+        return refMtbColt;
+    }
+
+    public PickDataDTO setRefMtbColt(MtbColt refMtbColt) {
+        this.refMtbColt = refMtbColt;
+        return this;
+    }
+
     public MtbColt getSourceMtbColt() {
         return sourceMtbColt;
     }

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

@@ -19,9 +19,9 @@ public class HttpInterceptor implements Interceptor {
     @Override
     public Response intercept(Chain chain) throws IOException {
 
-        final String PROFILE_DB     = SettingsManager.i().userSession == null ? null : SettingsManager.i().userSession.profileDB;
-        final String USERNAME       = SettingsManager.i().user.username;
-        final String PASSWORD       = SettingsManager.i().user.password;
+        final String PROFILE_DB     = SettingsManager.i().getUserSession() == null ? null : SettingsManager.i().getUserSession().getProfileDB();
+        final String USERNAME       = SettingsManager.i().getUser().getUsername();
+        final String PASSWORD       = SettingsManager.i().getUser().getPassword();
 
         final Request request = chain.request();
         final HttpUrl url = request.url().newBuilder()

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

@@ -20,12 +20,12 @@ public class RESTBuilder {
 
     public static <T> T getService(final Class<T> service) {
 //        return getService(service, "192.168.2.13", 8080);
-        return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true);
+        return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true);
 
     }
     public static <T> T getService(final Class<T> service, int timeout) {
 //        return getService(service, "192.168.2.13", 8080);
-        return getService(service, SettingsManager.i().server.host, SettingsManager.i().server.port, true, true, timeout);
+        return getService(service, SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), true, true, timeout);
 
     }
 

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

@@ -40,7 +40,11 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public static void getByCodMart(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getByCodMart(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
+        getByCodMartStatic(codMartToFind, onComplete, onFailed);
+    }
+
+    public static void getByCodMartStatic(List<String> codMartToFind, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
 
         String joinedCods = Stream.of(codMartToFind)
                 .collect(Collectors.joining(","));

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

@@ -45,6 +45,13 @@ import retrofit2.Response;
 @Singleton
 public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
+    private ArticoloRESTConsumer mArticoloRESTConsumer;
+
+    public ColliMagazzinoRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
+        this.mArticoloRESTConsumer = articoloRESTConsumer;
+    }
+
+
     public static void saveColloStatic(MtbColt mtbColtToSave, final ISimpleOperationCallback<MtbColt> callback) {
 
         for (int i = 0; i < mtbColtToSave.getMtbColr().size(); i++) {
@@ -88,8 +95,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     }
 
+    public void saveColli(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        saveColliStatic(mtbColtsToSave, onComplete, onFailed);
+    }
 
-    public static void saveColli(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public static void saveColliStatic(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
 
         for (MtbColt mtbColt : mtbColtsToSave) {
             mtbColt.setMtbCols(null);
@@ -375,7 +385,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                                 }
                             }
 
-
                             onComplete.run(newList);
                         }, onFailed);
                     }
@@ -430,7 +439,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         }
 
 
-        ArticoloRESTConsumer.getByCodMart(codMarts, arts -> {
+        ArticoloRESTConsumer.getByCodMartStatic(codMarts, arts -> {
 
             if (arts != null && arts.size() > 0) {
                 for (MtbColt mtbColt : mtbColts) {

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

@@ -4,6 +4,8 @@ import android.util.Log;
 
 import java.util.List;
 
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.model.StbGestSetup;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.GestSetupDTO;
@@ -14,9 +16,14 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+@Singleton
 public class GestSetupRESTConsumer extends _BaseRESTConsumer {
 
-    public static void getValue(String gestName, String sectionName, String keySection, RunnableArgs<GestSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getValue(String gestName, String sectionName, String keySection, RunnableArgs<GestSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        getValueStatic(gestName, sectionName, keySection, onComplete, onFailed);
+    }
+
+    public static void getValueStatic(String gestName, String sectionName, String keySection, RunnableArgs<GestSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
         service.getGestSetupValue(gestName, sectionName, keySection).enqueue(new Callback<ServiceRESTResponse<GestSetupDTO>>() {
             @Override
@@ -34,7 +41,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
     }
 
     public static void getBooleanValue(String gestName, String sectionName, String keySection, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
-        getValue(gestName, sectionName, keySection, value -> {
+        getValueStatic(gestName, sectionName, keySection, value -> {
             if(value != null){
                 onComplete.run("S".equalsIgnoreCase(value.value));
             } else onComplete.run(false);
@@ -43,7 +50,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public static void getValue(String gestName, String sectionName, String keySection, String codMdep, RunnableArgs<GestSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
+    public static void getValueStatic(String gestName, String sectionName, String keySection, String codMdep, RunnableArgs<GestSetupDTO> onComplete, RunnableArgs<Exception> onFailed) {
         GestSetupRESTConsumerService service = RESTBuilder.getService(GestSetupRESTConsumerService.class);
         service.getGestSetupValue(gestName, sectionName, keySection, codMdep).enqueue(new Callback<ServiceRESTResponse<GestSetupDTO>>() {
             @Override
@@ -61,7 +68,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
     }
 
     public static void getBooleanValue(String gestName, String sectionName, String keySection, String codMdep, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
-        getValue(gestName, sectionName, keySection, codMdep, value -> {
+        getValueStatic(gestName, sectionName, keySection, codMdep, value -> {
             if(value != null){
                 onComplete.run("S".equalsIgnoreCase(value.value));
             } else onComplete.run(false);

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

@@ -11,7 +11,7 @@ import retrofit2.http.Query;
 public interface MesRESTConsumerService {
 
 
-    @GET("mes/getOrdiniLavorazioneMateriale")
+    @GET("mes_v2/getOrdiniLavorazioneMateriale")
     Call<ServiceRESTResponse<List<OrdineLavorazioneDTO>>> getOrdiniLavorazioneMateriale(@Query("codJfas") String codJfas, @Query("idMateriale") String idMateriale);
 
 }

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

@@ -1,18 +1,28 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
 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.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 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.UtilityLogger;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -21,31 +31,10 @@ import retrofit2.Response;
 @Singleton
 public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
-    public static void retrieveListaArticoliFromOrdiniUscita(List<OrdineVenditaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    private final SystemRESTConsumer mSystemRESTConsumer;
 
-        List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
-                .map(x -> new GetPickingListDTO()
-                        .setData(x.getDataOrdS())
-                        .setGestione(x.getGestione())
-                        .setNumero(x.getNumOrd())
-                        .setDataConsegna(x.getDataConsS())
-                        .setIdViaggio(x.getIdViaggio()))
-                .toList();
-
-        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
-
-        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
-                analyzeAnswer(response, "retrieveListaArticoliFromOrdiniVendita", onComplete, onFailed);
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.errorMe(new Exception(t));
-                onFailed.run(new Exception(t));
-            }
-        });
+    public OrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
     }
 
     public void getSuggestedPickingList(String codMdep, List<SitArtOrdDTO> sitArtOrdList, RunnableArgs<List<PickingObjectDTO>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -69,4 +58,94 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
     }
 
+    public void getOrdiniInevasi(String codMdep, GestioneEnum gestione, RunnableArgs<List<OrdineUscitaInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);
+
+        service.getOrdiniInevasi(codMdep, gestione.getText())
+                .enqueue(new Callback<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
+                        analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
+                            if(responseDtoList == null) responseDtoList = new ArrayList<>();
+                            onComplete.run(responseDtoList);
+                        }, ex -> {
+                            Logger.e(ex, "Errore durante il caricamento degli ordini di lavorazione");
+                            if(onFailed != null) onFailed.run(ex);
+                        });
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Throwable t) {
+                        Logger.e(t, "Errore durante il caricamento degli ordini di lavorazione");
+                        if(onFailed != null) onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
+    public void retrieveListaArticoliFromOrdiniUscita(List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
+                .map(x -> new GetPickingListDTO()
+                        .setData(x.getDataOrdS())
+                        .setGestione(x.getGestione())
+                        .setNumero(x.getNumOrd())
+                        .setDataConsegna(x.getDataConsS())
+                        .setIdViaggio(x.getIdViaggio()))
+                .toList();
+
+        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
+
+        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
+                analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
+                UtilityLogger.errorMe(new Exception(t));
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+
+    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, GestioneEnum gestione, int segno, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        String baseSql = "SELECT DISTINCT mtb_colt.* " +
+                "FROM mtb_colt, " +
+                "     mtb_colr " +
+                "WHERE mtb_colt.gestione = mtb_colr.gestione " +
+                "  AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
+                "  AND mtb_colt.data_collo = mtb_colr.data_collo " +
+                "  AND mtb_colt.num_collo = mtb_colr.num_collo " +
+                "  AND mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " " +
+                "  AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " +
+                "  AND mtb_colt.data_doc IS NULL AND ";
+
+        List<HashMap<String, Object>> whereCondMapList = new ArrayList<>();
+        for (OrdineInevasoDTO ordineInevaso : orders) {
+            HashMap<String, Object> whereCondMap = new HashMap<>();
+            whereCondMap.put("mtb_colr.data_ord", ordineInevaso.getDataOrdD());
+            whereCondMap.put("mtb_colr.num_ord", ordineInevaso.getNumOrd());
+            whereCondMap.put("mtb_colr.gestione", ordineInevaso.getGestione());
+
+            whereCondMapList.add(whereCondMap);
+        }
+
+        baseSql += "(" + UtilityQuery.concatFieldListInWhereCond(whereCondMapList) + ")";
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();
+        this.mSystemRESTConsumer.processSql(baseSql, typeOfObjectsList, new ISimpleOperationCallback<List<MtbColt>>() {
+            @Override
+            public void onSuccess(List<MtbColt> value) {
+                if(onComplete != null) onComplete.run(value);
+            }
+
+            @Override
+            public void onFailed(Exception ex) {
+                if(onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
 }

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

@@ -4,10 +4,12 @@ import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
 
@@ -18,4 +20,7 @@ public interface OrdiniRESTConsumerService {
 
     @POST("wms/getSuggestedPickingList")
     Call<ServiceRESTResponse<List<PickingObjectDTO>>> getSuggestedPickingList(@Query("codMdep") String codMdep, @Body List<SitArtOrdDTO> sitArtOrdDTOList);
+
+    @GET("SM2GetOrdiniVenditaInevasi")
+    Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> getOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione);
 }

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

@@ -6,7 +6,6 @@ import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
@@ -18,6 +17,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.DtbOrdt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityThread;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dto.ArtDTO;
@@ -84,7 +84,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
         }
 
         ordineDTO.setChiaveGriglia(griglia.getCodAlis());
-        ordineDTO.setDataConsD(new Date());
+        ordineDTO.setDataConsD(UtilityDate.getDateInstance());
         ordineDTO.setArtRows(artRows);
         saveDTO.setGestione("O");
         saveDTO.setOrdineDTO(ordineDTO);
@@ -101,7 +101,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                                 if (dtoList.size() > 0){
                                     DtbOrdt dto = dtoList.get(0);
                                     ordine.setTransmitted(true);
-                                    ordine.setTransmissionDate(new Date());
+                                    ordine.setTransmissionDate(UtilityDate.getDateInstance());
                                     ordine.setGestione(dto.getGestione());
                                     ordine.setDataOrdS(dto.getDataOrd());
                                     ordine.setCodMdep(dto.getCodMdep());

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

@@ -6,6 +6,8 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 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;
@@ -17,11 +19,17 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+@Singleton
 public class PosizioniRESTConsumer extends _BaseRESTConsumer{
 
+    private final SystemRESTConsumer mSystemRESTConsumer;
+
+    public PosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRESTConsumer = systemRESTConsumer;
+    }
 
     public static void getAvailablePosizioni(RunnableArgs<List<MtbDepoPosizione>> onComplete, RunnableArgs<Exception> onFailed) {
-        String codMdep = SettingsManager.i().userSession.depo.getCodMdep();
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
         PosizioniRESTConsumerService posizioniRESTConsumerService = RESTBuilder.getService(PosizioniRESTConsumerService.class);
         posizioniRESTConsumerService.getAvailablePosizioni(codMdep).enqueue(new Callback<ServiceRESTResponse<List<MtbDepoPosizione>>>() {
@@ -39,12 +47,12 @@ public class PosizioniRESTConsumer extends _BaseRESTConsumer{
         });
     }
 
+    public void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        getBancaliInPosizioneStatic(mtbDepoPosizione, onComplete, onFailed);
+    }
 
-
-    public static void getBancaliInPosizione(MtbDepoPosizione mtbDepoPosizione, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
-
-
-        String sql = "SELECT * FROM mtb_colt WHERE cod_mdep = " + UtilityDB.valueToString(mtbDepoPosizione.getCodMdep()) + " AND posizione = " + UtilityDB.valueToString(mtbDepoPosizione.getPosizione());
+    public static void getBancaliInPosizioneStatic(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());
 
 
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();

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

@@ -4,6 +4,7 @@ import android.util.Log;
 
 import com.annimon.stream.Stream;
 
+import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -11,6 +12,8 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.JasperDTO;
+import it.integry.integrywmsnative.core.rest.model.JasperPairDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -89,7 +92,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
         printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
-                analyzeAnswer(response, "GetAvailablePrinters", onComplete, onFailed);
+                analyzeAnswer(response, "GetAvailablePrinters", printerList -> {
+                    printerList = Stream.of(printerList).filter(x -> !UtilityString.isNullOrEmpty(x)).toList();
+                    onComplete.run(printerList);
+                }, onFailed);
             }
 
             @Override
@@ -130,7 +136,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new Callback<ServiceRESTResponse<Object>>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
-                        analyzeAnswer(response, "PrintCollo", data -> {
+                        analyzeAnswer(response, "printCollo", data -> {
                             onComplete.run();
                         }, onFailed);
                     }
@@ -142,7 +148,38 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
                         } else onFailed.run(new Exception(t));
                     }
                 });
+    }
 
+    public void printReport(String printerName, String reportName, HashMap<String, Object> params, int quantity, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+//        if(BuildConfig.DEBUG) {
+//            onComplete.run();
+//            return;
+//        }
+
+        JasperDTO jasperDTO = new JasperDTO();
+        jasperDTO.setReportName(reportName);
+
+        Stream.of(params)
+                .forEach(x -> jasperDTO.getParams().add(new JasperPairDTO(x.getKey(), x.getValue())));
+
+        PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
+        printerService
+                .processPrintReport(printerName, quantity, jasperDTO)
+                .enqueue(new Callback<ServiceRESTResponse<Object>>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                        analyzeAnswer(response, "printReport", data -> {
+                            onComplete.run();
+                        }, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                        if(t.getMessage().contains("Printer not found")) {
+                            onFailed.run(new NoPrintersFoundException());
+                        } else onFailed.run(new Exception(t));
+                    }
+        });
     }
 
 }

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

@@ -2,8 +2,10 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import java.util.List;
 
+import it.integry.integrywmsnative.core.rest.model.JasperDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;
@@ -34,4 +36,11 @@ public interface PrinterRESTConsumerService {
     );
 
 
+    @POST("processPrintReport")
+    Call<ServiceRESTResponse<Object>> processPrintReport(
+            @Query("printerName") String printerName,
+            @Query("numberOfCopies") int printQuantity,
+            @Body JasperDTO jasperDTO
+    );
+
 }

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

@@ -5,6 +5,7 @@ import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.orhanobut.logger.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -66,7 +67,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
 
             @Override
             public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
-                Log.e("ProcessSql", t.toString());
+                Logger.e(t, "ProcessSQL");
                 onFailed.run(new Exception(t));
             }
         });
@@ -92,7 +93,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
     public static void getAvailableProfiles(final ISimpleOperationCallback<List<String>> callback){
 
         SystemRESTConsumerService service = RESTBuilder.getService(SystemRESTConsumerService.class);
-        service.getAvailableProfiles(SettingsManager.i().user.username, SettingsManager.i().user.password).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
+        service.getAvailableProfiles(SettingsManager.i().getUser().getUsername(), SettingsManager.i().getUser().getPassword()).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
                 analyzeAnswer(response, "ProfilesAvailable", callback);
@@ -139,7 +140,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
 
     public static void sendErrorLogMail(String message, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
-        String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : " [" + SettingsManager.i().userSession.profileDB + "]";
+        String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : " [" + SettingsManager.i().getUserSession().getProfileDB() + "]";
 
         String dest = "";
         if(BuildConfig.DEBUG) {

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

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.model;
 public class Ean13PesoModel {
 
     private String precode;
+    //TODO: Change to bigdecimal
     private Float peso;
 
     public String getPrecode() {

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

@@ -0,0 +1,28 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class JasperDTO {
+
+    private String reportName;
+    private List<JasperPairDTO> params = new ArrayList<>();
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public JasperDTO setReportName(String reportName) {
+        this.reportName = reportName;
+        return this;
+    }
+
+    public List<JasperPairDTO> getParams() {
+        return params;
+    }
+
+    public JasperDTO setParams(List<JasperPairDTO> params) {
+        this.params = params;
+        return this;
+    }
+}

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

@@ -0,0 +1,30 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+public class JasperPairDTO {
+
+    private String name;
+    private Object value;
+
+    public JasperPairDTO(String name, Object value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public JasperPairDTO setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public JasperPairDTO setValue(Object value) {
+        this.value = value;
+        return this;
+    }
+}

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

@@ -1,23 +1,18 @@
-package it.integry.integrywmsnative.gest.vendita.dto;
+package it.integry.integrywmsnative.core.rest.model;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Date;
 
-import it.integry.integrywmsnative.core.di.BindableBoolean;
-import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
-public class OrdineVenditaInevasoDTO {
+public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
 
-    private String data;
-    private Integer numero;
     private Integer idViaggio;
-    private String gestione;
     private String listino;
     private String termCons;
     private String codAuto;
-    private String codMdep;
     private String descrizioneAuto;
     private String codVvet;
     private String descrizioneVettore;
@@ -49,64 +44,25 @@ public class OrdineVenditaInevasoDTO {
     private String nomeAgente;
     private String codJfas;
 
-    public BindableBoolean selected;
 
 
-    public OrdineVenditaInevasoDTO() {
-        this.selected = new BindableBoolean(false);
-    }
-
-
-    public String getDataOrdS() {
-        return data;
-    }
-
-    public Date getDataOrdD() {
-        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
-    }
-
-    public OrdineVenditaInevasoDTO setData(String data) {
-        this.data = data;
-        return this;
-    }
-
-    public Integer getNumOrd() {
-        return numero;
-    }
-
-    public OrdineVenditaInevasoDTO setNumero(Integer numero) {
-        this.numero = numero;
-        return this;
-    }
 
     public Integer getIdViaggio() {
         return idViaggio;
     }
 
-    public OrdineVenditaInevasoDTO setIdViaggio(Integer idViaggio) {
+    public OrdineUscitaInevasoDTO setIdViaggio(Integer idViaggio) {
         this.idViaggio = idViaggio;
         return this;
     }
 
-    public String getGestione() {
-        return gestione;
-    }
 
-    public GestioneEnum getGestioneEnum() {
-        return GestioneEnum.fromString(getGestione());
-    }
-
-
-    public OrdineVenditaInevasoDTO setGestione(String gestione) {
-        this.gestione = gestione;
-        return this;
-    }
 
     public String getListino() {
         return listino;
     }
 
-    public OrdineVenditaInevasoDTO setListino(String listino) {
+    public OrdineUscitaInevasoDTO setListino(String listino) {
         this.listino = listino;
         return this;
     }
@@ -115,7 +71,7 @@ public class OrdineVenditaInevasoDTO {
         return termCons;
     }
 
-    public OrdineVenditaInevasoDTO setTermCons(String termCons) {
+    public OrdineUscitaInevasoDTO setTermCons(String termCons) {
         this.termCons = termCons;
         return this;
     }
@@ -124,25 +80,16 @@ public class OrdineVenditaInevasoDTO {
         return codAuto;
     }
 
-    public OrdineVenditaInevasoDTO setCodAuto(String codAuto) {
+    public OrdineUscitaInevasoDTO setCodAuto(String codAuto) {
         this.codAuto = codAuto;
         return this;
     }
 
-    public String getCodMdep() {
-        return codMdep;
-    }
-
-    public OrdineVenditaInevasoDTO setCodMdep(String codMdep) {
-        this.codMdep = codMdep;
-        return this;
-    }
-
     public String getDescrizioneAuto() {
         return descrizioneAuto;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizioneAuto(String descrizioneAuto) {
+    public OrdineUscitaInevasoDTO setDescrizioneAuto(String descrizioneAuto) {
         this.descrizioneAuto = descrizioneAuto;
         return this;
     }
@@ -151,7 +98,7 @@ public class OrdineVenditaInevasoDTO {
         return codVvet;
     }
 
-    public OrdineVenditaInevasoDTO setCodVvet(String codVvet) {
+    public OrdineUscitaInevasoDTO setCodVvet(String codVvet) {
         this.codVvet = codVvet;
         return this;
     }
@@ -160,7 +107,7 @@ public class OrdineVenditaInevasoDTO {
         return descrizioneVettore;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizioneVettore(String descrizioneVettore) {
+    public OrdineUscitaInevasoDTO setDescrizioneVettore(String descrizioneVettore) {
         this.descrizioneVettore = descrizioneVettore;
         return this;
     }
@@ -173,7 +120,7 @@ public class OrdineVenditaInevasoDTO {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS());
     }
 
-    public OrdineVenditaInevasoDTO setDataInizTrasp(String dataInizTrasp) {
+    public OrdineUscitaInevasoDTO setDataInizTrasp(String dataInizTrasp) {
         this.dataInizTrasp = dataInizTrasp;
         return this;
     }
@@ -182,7 +129,7 @@ public class OrdineVenditaInevasoDTO {
         return descrizionePaga;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizionePaga(String descrizionePaga) {
+    public OrdineUscitaInevasoDTO setDescrizionePaga(String descrizionePaga) {
         this.descrizionePaga = descrizionePaga;
         return this;
     }
@@ -191,7 +138,7 @@ public class OrdineVenditaInevasoDTO {
         return rifOrd;
     }
 
-    public OrdineVenditaInevasoDTO setRifOrd(String rifOrd) {
+    public OrdineUscitaInevasoDTO setRifOrd(String rifOrd) {
         this.rifOrd = rifOrd;
         return this;
     }
@@ -200,7 +147,7 @@ public class OrdineVenditaInevasoDTO {
         return codAnagOrd;
     }
 
-    public OrdineVenditaInevasoDTO setCodAnagOrd(String codAnagOrd) {
+    public OrdineUscitaInevasoDTO setCodAnagOrd(String codAnagOrd) {
         this.codAnagOrd = codAnagOrd;
         return this;
     }
@@ -209,7 +156,7 @@ public class OrdineVenditaInevasoDTO {
         return codJcom;
     }
 
-    public OrdineVenditaInevasoDTO setCodJcom(String codJcom) {
+    public OrdineUscitaInevasoDTO setCodJcom(String codJcom) {
         this.codJcom = codJcom;
         return this;
     }
@@ -218,7 +165,7 @@ public class OrdineVenditaInevasoDTO {
         return descrizioneCom;
     }
 
-    public OrdineVenditaInevasoDTO setDescrizioneCom(String descrizioneCom) {
+    public OrdineUscitaInevasoDTO setDescrizioneCom(String descrizioneCom) {
         this.descrizioneCom = descrizioneCom;
         return this;
     }
@@ -227,7 +174,7 @@ public class OrdineVenditaInevasoDTO {
         return ragSocCom;
     }
 
-    public OrdineVenditaInevasoDTO setRagSocCom(String ragSocCom) {
+    public OrdineUscitaInevasoDTO setRagSocCom(String ragSocCom) {
         this.ragSocCom = ragSocCom;
         return this;
     }
@@ -236,7 +183,7 @@ public class OrdineVenditaInevasoDTO {
         return ragSocOrd;
     }
 
-    public OrdineVenditaInevasoDTO setRagSocOrd(String ragSocOrd) {
+    public OrdineUscitaInevasoDTO setRagSocOrd(String ragSocOrd) {
         this.ragSocOrd = ragSocOrd;
         return this;
     }
@@ -245,7 +192,7 @@ public class OrdineVenditaInevasoDTO {
         return destinatario;
     }
 
-    public OrdineVenditaInevasoDTO setDestinatario(String destinatario) {
+    public OrdineUscitaInevasoDTO setDestinatario(String destinatario) {
         this.destinatario = destinatario;
         return this;
     }
@@ -254,7 +201,7 @@ public class OrdineVenditaInevasoDTO {
         return citta;
     }
 
-    public OrdineVenditaInevasoDTO setCitta(String citta) {
+    public OrdineUscitaInevasoDTO setCitta(String citta) {
         this.citta = citta;
         return this;
     }
@@ -263,7 +210,7 @@ public class OrdineVenditaInevasoDTO {
         return provincia;
     }
 
-    public OrdineVenditaInevasoDTO setProvincia(String provincia) {
+    public OrdineUscitaInevasoDTO setProvincia(String provincia) {
         this.provincia = provincia;
         return this;
     }
@@ -272,7 +219,7 @@ public class OrdineVenditaInevasoDTO {
         return indirizzo;
     }
 
-    public OrdineVenditaInevasoDTO setIndirizzo(String indirizzo) {
+    public OrdineUscitaInevasoDTO setIndirizzo(String indirizzo) {
         this.indirizzo = indirizzo;
         return this;
     }
@@ -281,7 +228,7 @@ public class OrdineVenditaInevasoDTO {
         return pesoTotale;
     }
 
-    public OrdineVenditaInevasoDTO setPesoTotale(BigDecimal pesoTotale) {
+    public OrdineUscitaInevasoDTO setPesoTotale(BigDecimal pesoTotale) {
         this.pesoTotale = pesoTotale;
         return this;
     }
@@ -290,7 +237,7 @@ public class OrdineVenditaInevasoDTO {
         return numCnfdaEvadere;
     }
 
-    public OrdineVenditaInevasoDTO setNumCnfdaEvadere(BigDecimal numCnfdaEvadere) {
+    public OrdineUscitaInevasoDTO setNumCnfdaEvadere(BigDecimal numCnfdaEvadere) {
         this.numCnfdaEvadere = numCnfdaEvadere;
         return this;
     }
@@ -299,7 +246,7 @@ public class OrdineVenditaInevasoDTO {
         return numCnfDisp;
     }
 
-    public OrdineVenditaInevasoDTO setNumCnfDisp(BigDecimal numCnfDisp) {
+    public OrdineUscitaInevasoDTO setNumCnfDisp(BigDecimal numCnfDisp) {
         this.numCnfDisp = numCnfDisp;
         return this;
     }
@@ -312,7 +259,7 @@ public class OrdineVenditaInevasoDTO {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS());
     }
 
-    public OrdineVenditaInevasoDTO setDataCons(String dataCons) {
+    public OrdineUscitaInevasoDTO setDataCons(String dataCons) {
         this.dataCons = dataCons;
         return this;
     }
@@ -321,7 +268,7 @@ public class OrdineVenditaInevasoDTO {
         return barcode;
     }
 
-    public OrdineVenditaInevasoDTO setBarcode(String barcode) {
+    public OrdineUscitaInevasoDTO setBarcode(String barcode) {
         this.barcode = barcode;
         return this;
     }
@@ -330,7 +277,7 @@ public class OrdineVenditaInevasoDTO {
         return numRighe;
     }
 
-    public OrdineVenditaInevasoDTO setNumRighe(Integer numRighe) {
+    public OrdineUscitaInevasoDTO setNumRighe(Integer numRighe) {
         this.numRighe = numRighe;
         return this;
     }
@@ -339,7 +286,7 @@ public class OrdineVenditaInevasoDTO {
         return righeInPartenza;
     }
 
-    public OrdineVenditaInevasoDTO setRigheInPartenza(Integer righeInPartenza) {
+    public OrdineUscitaInevasoDTO setRigheInPartenza(Integer righeInPartenza) {
         this.righeInPartenza = righeInPartenza;
         return this;
     }
@@ -348,7 +295,7 @@ public class OrdineVenditaInevasoDTO {
         return saldoContabile;
     }
 
-    public OrdineVenditaInevasoDTO setSaldoContabile(BigDecimal saldoContabile) {
+    public OrdineUscitaInevasoDTO setSaldoContabile(BigDecimal saldoContabile) {
         this.saldoContabile = saldoContabile;
         return this;
     }
@@ -357,7 +304,7 @@ public class OrdineVenditaInevasoDTO {
         return codVzon;
     }
 
-    public OrdineVenditaInevasoDTO setCodVzon(String codVzon) {
+    public OrdineUscitaInevasoDTO setCodVzon(String codVzon) {
         this.codVzon = codVzon;
         return this;
     }
@@ -366,7 +313,7 @@ public class OrdineVenditaInevasoDTO {
         return ragSocOrdV;
     }
 
-    public OrdineVenditaInevasoDTO setRagSocOrdV(String ragSocOrdV) {
+    public OrdineUscitaInevasoDTO setRagSocOrdV(String ragSocOrdV) {
         this.ragSocOrdV = ragSocOrdV;
         return this;
     }
@@ -375,7 +322,7 @@ public class OrdineVenditaInevasoDTO {
         return colliRiservati;
     }
 
-    public OrdineVenditaInevasoDTO setColliRiservati(int colliRiservati) {
+    public OrdineUscitaInevasoDTO setColliRiservati(int colliRiservati) {
         this.colliRiservati = colliRiservati;
         return this;
     }
@@ -384,7 +331,7 @@ public class OrdineVenditaInevasoDTO {
         return existColloBoolean;
     }
 
-    public OrdineVenditaInevasoDTO setExistColloBoolean(boolean existColloBoolean) {
+    public OrdineUscitaInevasoDTO setExistColloBoolean(boolean existColloBoolean) {
         this.existColloBoolean = existColloBoolean;
         return this;
     }
@@ -393,7 +340,7 @@ public class OrdineVenditaInevasoDTO {
         return flagEvaso;
     }
 
-    public OrdineVenditaInevasoDTO setFlagEvaso(boolean flagEvaso) {
+    public OrdineUscitaInevasoDTO setFlagEvaso(boolean flagEvaso) {
         this.flagEvaso = flagEvaso;
         return this;
     }
@@ -402,7 +349,7 @@ public class OrdineVenditaInevasoDTO {
         return nomeAgente;
     }
 
-    public OrdineVenditaInevasoDTO setNomeAgente(String nomeAgente) {
+    public OrdineUscitaInevasoDTO setNomeAgente(String nomeAgente) {
         this.nomeAgente = nomeAgente;
         return this;
     }
@@ -411,36 +358,27 @@ public class OrdineVenditaInevasoDTO {
         return codJfas;
     }
 
-    public OrdineVenditaInevasoDTO setCodJfas(String codJfas) {
+    public OrdineUscitaInevasoDTO setCodJfas(String codJfas) {
         this.codJfas = codJfas;
         return this;
     }
 
-    public boolean isSelected() {
-        return selected.get();
-    }
-
-    public OrdineVenditaInevasoDTO setSelected(boolean selected) {
-        this.selected.set(selected);
-        return this;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        OrdineVenditaInevasoDTO that = (OrdineVenditaInevasoDTO) o;
+        OrdineUscitaInevasoDTO that = (OrdineUscitaInevasoDTO) o;
 
-        if (!data.equals(that.data)) return false;
-        if (!numero.equals(that.numero)) return false;
+        if (!getDataOrdS().equals(that.getDataOrdS())) return false;
+        if (!getNumOrd().equals(that.getNumOrd())) return false;
         return getGestione().equals(that.getGestione());
     }
 
     @Override
     public int hashCode() {
-        int result = data.hashCode();
-        result = 31 * result + numero.hashCode();
+        int result = getDataOrdS().hashCode();
+        result = 31 * result + getNumOrd().hashCode();
         result = 31 * result + getGestione().hashCode();
         return result;
     }

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

@@ -30,8 +30,8 @@ public class ServerStatusChecker {
     private Runnable runnableCode = new Runnable() {
         @Override
         public void run() {
-            if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().server.host)) {
-                UtilityServer.isEmsApiAvailable(SettingsManager.i().server.host, SettingsManager.i().server.port, mInternalCallback);
+            if(shouldExecute && !UtilityString.isNullOrEmpty(SettingsManager.i().getServer().getHost())) {
+                UtilityServer.isEmsApiAvailable(SettingsManager.i().getServer().getHost(), SettingsManager.i().getServer().getPort(), mInternalCallback);
                 handler.postDelayed(this, MILLIS_DELAY);
             }
         }

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

@@ -21,6 +21,7 @@ public class DBSettingsModel {
     private String defaultCausaleRettificaGiacenze;
     private DistribuzioneColloDTO.CriterioDistribuzione defaultCriterioDistribuzione;
     private boolean flagAskClienteInPickingLibero;
+    private boolean flagAllowEmptyClienteInPickingLibero;
 
     private boolean flagCanAddExtraItemSpedizione;
     private boolean flagCanAutoOpenNewULAccettazione;
@@ -31,7 +32,9 @@ public class DBSettingsModel {
     private boolean flagAskPesoColloSpedizione;
     private boolean flagForceAllToColli;
     private boolean flagSpedizioneEnableManualPick;
+    private boolean flagSpedizioneCanSelectMultipleOrders;
     private String produzioneDefaultCodAnag;
+    private String reportNameSpedizionChiudiOrdine;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -65,7 +68,7 @@ public class DBSettingsModel {
     }
 
     public DBSettingsModel setDatiAzienda(Azienda datiAzienda) {
-        this.datiAzienda = datiAzienda;
+            this.datiAzienda = datiAzienda;
         return this;
     }
 
@@ -131,6 +134,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagAllowEmptyClienteInPickingLibero() {
+        return flagAllowEmptyClienteInPickingLibero;
+    }
+
+    public DBSettingsModel setFlagAllowEmptyClienteInPickingLibero(boolean flagAllowEmptyClienteInPickingLibero) {
+        this.flagAllowEmptyClienteInPickingLibero = flagAllowEmptyClienteInPickingLibero;
+        return this;
+    }
+
     public boolean isFlagCanAddExtraItemSpedizione() {
         return flagCanAddExtraItemSpedizione;
     }
@@ -213,6 +225,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagSpedizioneCanSelectMultipleOrders() {
+        return flagSpedizioneCanSelectMultipleOrders;
+    }
+
+    public DBSettingsModel setFlagSpedizioneCanSelectMultipleOrders(boolean flagSpedizioneCanSelectMultipleOrders) {
+        this.flagSpedizioneCanSelectMultipleOrders = flagSpedizioneCanSelectMultipleOrders;
+        return this;
+    }
+
     public String getProduzioneDefaultCodAnag() {
         return produzioneDefaultCodAnag;
     }
@@ -221,4 +242,13 @@ public class DBSettingsModel {
         this.produzioneDefaultCodAnag = produzioneDefaultCodAnag;
         return this;
     }
+
+    public String getReportNameSpedizionChiudiOrdine() {
+        return reportNameSpedizionChiudiOrdine;
+    }
+
+    public DBSettingsModel setReportNameSpedizionChiudiOrdine(String reportNameSpedizionChiudiOrdine) {
+        this.reportNameSpedizionChiudiOrdine = reportNameSpedizionChiudiOrdine;
+        return this;
+    }
 }

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

@@ -38,7 +38,7 @@ public class SettingsManager {
         if(settingsModelIstance == null) {
             settingsModelIstance = new SettingsModel();
 
-            settingsModelIstance.server = new SettingsModel.Server();
+            settingsModelIstance.setServer(new SettingsModel.Server());
             //settingsModelIstance.user = new SettingsModel.User();
             //settingsModelIstance.userSession = new SettingsModel.UserSession();
 
@@ -136,10 +136,10 @@ public class SettingsManager {
 
                 boolean codMdepExistsAnymore = false;
 
-                if(settingsModelIstance.userSession.depo != null){
+                if(settingsModelIstance.getUserSession().getDepo() != null){
                     for(AvailableCodMdepsDTO availableCodMdepDTO : availableCodMdeps){
                         //Controllo se il codMdep salvato esiste ancora
-                        if(availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.userSession.depo.getCodMdep())) {
+                        if(availableCodMdepDTO.getCodMdep().equalsIgnoreCase(settingsModelIstance.getUserSession().getDepo().getCodMdep())) {
                             codMdepExistsAnymore = true;
                             break;
                         }
@@ -147,7 +147,7 @@ public class SettingsManager {
                 }
 
                 if(!codMdepExistsAnymore){
-                    settingsModelIstance.userSession.depo = availableCodMdeps.get(0);
+                    settingsModelIstance.getUserSession().setDepo(availableCodMdeps.get(0));
                 }
 
                 if(onComplete != null) onComplete.run();
@@ -202,6 +202,10 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("PICKING_LIBERO")
                 .setKeySection("FLAG_ASK_CLIENTE"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("FLAG_ALLOW_EMPTY_CLIENTE"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -246,6 +250,14 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
                 .setKeySection("ENABLE_FAKE_GIACENZA"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_CAN_SELECT_MULTIPLE_ORDERS"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("REPORT_PACKING_LIST"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@@ -255,6 +267,7 @@ public class SettingsManager {
             dbSettingsModelIstance.setDefaultCodAnag(getValueFromList(list, "SETUP","COD_ANAG_DEFAULT", String.class));
             dbSettingsModelIstance.setDefaultCriterioDistribuzione(getValueFromList(list, "SETUP","DEFAULT_CRITERIO_DISTRIBUZIONE", String.class));
             dbSettingsModelIstance.setFlagAskClienteInPickingLibero(getValueFromList(list, "PICKING_LIBERO", "FLAG_ASK_CLIENTE", Boolean.class));
+            dbSettingsModelIstance.setFlagAllowEmptyClienteInPickingLibero(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_CLIENTE", Boolean.class));
             dbSettingsModelIstance.setFlagCanAddExtraItemSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_ITEMS", Boolean.class));
             dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(getValueFromList(list, "ACCETTAZIONE", "FLAG_AUTO_OPEN_NEW_UL", Boolean.class));
             dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class));
@@ -266,6 +279,8 @@ public class SettingsManager {
             dbSettingsModelIstance.setProduzioneDefaultCodAnag(getValueFromList(list, "PRODUZIONE", "DEFAULT_COD_ANAG", String.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class));
+            dbSettingsModelIstance.setFlagSpedizioneCanSelectMultipleOrders(getValueFromList(list, "SPEDIZIONE", "FLAG_CAN_SELECT_MULTIPLE_ORDERS", Boolean.class));
+            dbSettingsModelIstance.setReportNameSpedizionChiudiOrdine(getValueFromList(list, "SPEDIZIONE", "REPORT_PACKING_LIST", String.class));
 
             if(onComplete != null) onComplete.run();
         }, onFailed);

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

@@ -4,9 +4,9 @@ import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
 
 public class SettingsModel {
 
-    public Server server;
-    public User user;
-    public UserSession userSession;
+    private Server server;
+    private User user;
+    private UserSession userSession;
 
     public boolean isUserLoggedIn() {
         return user != null;
@@ -19,9 +19,9 @@ public class SettingsModel {
 
 
     public static class Server {
-        public String codAzienda;
-        public String host;
-        public int port;
+        private String codAzienda;
+        private String host;
+        private int port;
 
         public String getCodAzienda() {
             return codAzienda;
@@ -52,9 +52,9 @@ public class SettingsModel {
     }
 
     public static class User {
-        public String username;
-        public String password;
-        public String fullname;
+        private String username;
+        private String password;
+        private String fullname;
 
         public String getUsername() {
             return username;
@@ -85,9 +85,9 @@ public class SettingsModel {
     }
 
     public static class UserSession {
-        public String profileDB;
-        public AvailableCodMdepsDTO depo;
-        public Integer defaultOrdinamentoPickingAccettazione = 0;
+        private String profileDB;
+        private AvailableCodMdepsDTO depo;
+        private Integer defaultOrdinamentoPickingAccettazione = 0;
 
         public String getProfileDB() {
             return profileDB;

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

@@ -36,8 +36,8 @@ public class UpdatesManager {
             suffix = "";
         }
 
-        String currentVersionUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/currentVersion";
-        String currentDownloadUrl = "http://" + SettingsManager.i().server.host + ":" + SettingsManager.i().server.port + "/ems-api/wms/android-release"+suffix+"_v2.apk";
+        String currentVersionUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/currentVersion";
+        String currentDownloadUrl = "http://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release"+suffix+"_v2.apk";
 
 
         AppUpdater appUpdater = new AppUpdater(context)

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

@@ -50,7 +50,7 @@ public class UtilityBarcode {
     }
 
     public static boolean isEtichettaArt(BarcodeScanDTO barcodeScanDTO) {
-        return isEan8(barcodeScanDTO) || isEan13(barcodeScanDTO) || isUPCA(barcodeScanDTO);
+        return isEan8(barcodeScanDTO) || isEan13(barcodeScanDTO) || isUPCA(barcodeScanDTO) || isInterleaved2Of5(barcodeScanDTO);
     }
 
 
@@ -71,6 +71,10 @@ public class UtilityBarcode {
         return barcodeScanDTO != null && barcodeScanDTO.getType() == BarcodeType.UPCA;
     }
 
+    public static boolean isInterleaved2Of5(BarcodeScanDTO barcodeScanDTO) {
+        return barcodeScanDTO != null && barcodeScanDTO.getType() == BarcodeType.INTERLEAVED_2OF5;
+    }
+
 
 
     public static Integer getNumColloFromULAnonima(String barcode) {

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

@@ -26,6 +26,14 @@ public class UtilityBigDecimal {
         return input.compareTo(toCompareWith) < 0;
     }
 
+    public static boolean equalsOrLowerThan(BigDecimal input, BigDecimal toCompareWith) {
+        return equalsTo(input, toCompareWith) || lowerThan(input, toCompareWith);
+    }
+
+    public static boolean equalsOrGreaterThan(BigDecimal input, BigDecimal toCompareWith) {
+        return equalsTo(input, toCompareWith) || greaterThan(input, toCompareWith);
+    }
+
     public static BigDecimal getLowerBetween(BigDecimal input1, BigDecimal input2) {
         if(input1 == null) return input2;
         if(input2 == null) return input1;

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

@@ -8,14 +8,14 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 public class UtilityFirebase {
 
     public static Trace getNewPerformanceTrace(String traceName) {
-        String username = SettingsManager.i().user != null && !UtilityString.isNullOrEmpty(SettingsManager.i().user.fullname) ?
-                SettingsManager.i().user.fullname :
+        String username = SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()) ?
+                SettingsManager.i().getUser().getFullname() :
                 "N / A";
 
         Trace newTrace = FirebasePerformance.getInstance().newTrace(traceName);
 
         newTrace.putAttribute("user_fullame", username);
-        newTrace.putAttribute("profile_db", SettingsManager.i().userSession.profileDB);
+        newTrace.putAttribute("profile_db", SettingsManager.i().getUserSession().getProfileDB());
 
         return newTrace;
     }

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

@@ -73,7 +73,7 @@ public class UtilityLogger {
 //
 //            message = message.replace("__ERROR_STACKTRACE__", sw.toString());
 //
-//            String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : SettingsManager.i().userSession.profileDB;
+//            String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB()) ? "" : SettingsManager.i().getUserSession().getProfileDB();
 //            message = message.replace("__CUSTOMER_NAME__", currentAzienda);
 //
 //            message = message.replace("__ERROR_DATE__", UtilityDate.formatDate(UtilityDate.getDateInstance(), UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));

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

@@ -0,0 +1,60 @@
+package it.integry.integrywmsnative.core.utility;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class UtilityReflections {
+
+
+    public static void copy(Object from, Object to) throws Exception {
+        UtilityReflections.copy(from, to, Object.class);
+    }
+
+    public static void copy(Object from, Object to, Class depth) throws Exception {
+        Class fromClass = from.getClass();
+        Class toClass = to.getClass();
+        List<Field> fromFields = collectFields(fromClass, depth);
+        List<Field> toFields = collectFields(toClass, depth);
+        Field target;
+        for (Field source : fromFields) {
+            if ((target = findAndRemove(source, toFields)) != null) {
+                source.setAccessible(true);
+                target.setAccessible(true);
+                target.set(to, source.get(from));
+            }
+        }
+    }
+
+    private static List<Field> collectFields(Class c, Class depth) {
+        List<Field> accessibleFields = new ArrayList<>();
+        do {
+            int modifiers;
+            for (Field field : c.getDeclaredFields()) {
+                modifiers = field.getModifiers();
+                if (!Modifier.isStatic(modifiers)/* && Modifier.isPublic(modifiers)*/) {
+                    accessibleFields.add(field);
+                }
+            }
+            c = c.getSuperclass();
+        } while (c != null && c != depth);
+        return accessibleFields;
+    }
+
+    private static Field findAndRemove(Field field, List<Field> fields) {
+        Field actual;
+        for (Iterator<Field> i = fields.iterator(); i.hasNext();) {
+            actual = i.next();
+            if (field.getName().equals(actual.getName())
+                    && field.getType().equals(actual.getType())) {
+                i.remove();
+                return actual;
+            }
+        }
+        return null;
+    }
+
+
+}

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

@@ -6,10 +6,16 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 public class UtilitySettings {
 
 
-    public static void logout(AppDatabase appDatabase){
-        SettingsManager.i().user = null;
-        SettingsManager.i().userSession = null;
-        UtilityThread.executeParallel(appDatabase::clearAllTables);
+    private static AppDatabase mAppDatabase;
+
+    public static void init(AppDatabase appDatabase) {
+        mAppDatabase = appDatabase;
+    }
+
+    public static void logout(){
+        SettingsManager.i().setUser(null);
+        SettingsManager.i().setUserSession(null);
+        UtilityThread.executeParallel(mAppDatabase::clearAllTables);
         SettingsManager.update();
     }
 

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

@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.core.utility;
 import android.text.Html;
 import android.text.Spanned;
 
-import androidx.annotation.IdRes;
 import androidx.annotation.StringRes;
 
 import java.util.regex.Matcher;
@@ -19,6 +18,10 @@ public class UtilityString {
         return stringToCheck == null || stringToCheck.trim().length() == 0;
     }
 
+    public static String isNull(String stringToCheck, String alternativeString){
+        return isNullOrEmpty(stringToCheck) ? alternativeString : stringToCheck;
+    }
+
     public static String empty2null(String stringToCheck) {
         return (stringToCheck != null && stringToCheck.trim().length() == 0 || stringToCheck == null) ? null : stringToCheck.trim();
     }

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

@@ -4,13 +4,7 @@ package it.integry.integrywmsnative.gest.accettazione;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
-
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
 import android.text.Html;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
@@ -18,33 +12,40 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.annimon.stream.Stream;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.rest.CommonRESTException;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ISearcableFragment;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.rest.CommonRESTException;
+import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.databinding.FragmentMainAccettazioneBinding;
 import it.integry.integrywmsnative.gest.accettazione.core.AccettazioneHelper;
 import it.integry.integrywmsnative.gest.accettazione.core.MainListAccettazioneAdapter;
-import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
-import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity;
+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;
 
 public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment {
 
-    private Runnable mOnPreDestroy;
+    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private FragmentMainAccettazioneBinding mBinding;
@@ -80,11 +81,15 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         mAppBarTitle.setText(context.getText(R.string.accettazione_title_fragment).toString());
     }
 
+    @Override
+    public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) {
+        this.mOnPreDestroyList.add(onActionBarPreDestroy);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-
         init();
     }
 
@@ -109,7 +114,9 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
     @Override
     public void onDestroy() {
-        if(mOnPreDestroy != null) mOnPreDestroy.run();
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
         super.onDestroy();
     }
 
@@ -172,49 +179,43 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
     private void onAccettazioneMainFabClick() {
 
         List<OrdineAccettazioneInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
-        List<String> barcodes = new ArrayList<>();
-
-        for(OrdineAccettazioneInevasoDTO ordine : selectedOrders){
-            if(!barcodes.contains(ordine.getBarcode())) barcodes.add(ordine.getBarcode());
-        }
 
         final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity());
 
-        mHelper.retrievePickingList(barcodes, ordini -> {
+        OrdiniAccettazioneRESTConsumer.retrievePickingListNewStatic(selectedOrders, sitArtOrds -> {
                 progress.dismiss();
 
-                AtomicInteger artsCounter = new AtomicInteger();
 
-                Stream.of(ordini).forEach(x -> {
-                    artsCounter.addAndGet((int) Stream.of(x.getOrdini()).filter(y -> y.getQtaDaEvadere().floatValue() > 0).count());
-                });
+                long artsCounter = Stream.of(sitArtOrds)
+                        .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO))
+                        .map(SitArtOrdDTO::getCodMart)
+                        .distinct()
+                        .count();
 
-                List<String> ordersKeys = new ArrayList<>();
+                long ordsCounter = Stream.of(sitArtOrds)
+                        .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione())
+                        .count();
 
-                for(OrdineAccettazioneDTO ordine : ordini){
-                    if(!ordersKeys.contains(ordine.getData() + " " + ordine.getNumero() + " " + ordine.getGestione())){
-                        ordersKeys.add(ordine.getData() + " " + ordine.getNumero() + " " + ordine.getGestione());
-                    }
-                }
 
                 DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
                 getText(R.string.orders).toString(),
-                                Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, ordersKeys.size()), ordersKeys.size())
+                                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, artsCounter.get())),
+                                "<b>" + artsCounter + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, (int) artsCounter)),
                 null,
                 () -> {
 
-                    String cacheItemID = DataCache.addItem(ordini);
+                    String cacheSitArtItemID = DataCache.addItem(sitArtOrds);
+                    String cacheOrdersItemID = DataCache.addItem(selectedOrders);
 
-                    Intent myIntent = new Intent(getActivity(), AccettazioneOrdineInevasoActivity.class);
-                    myIntent.putExtra("key", cacheItemID);
+                    Intent myIntent = new Intent(getActivity(), AccettazionePickingActivity.class);
+                    myIntent.putExtra("keyOrders", cacheOrdersItemID);
+                    myIntent.putExtra("keySitArts", cacheSitArtItemID);
                     getActivity().startActivity(myIntent);
 
                 }).show();
 
             }, ex -> {
-//                Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_LONG).show();
                 progress.dismiss();
 
                 String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
@@ -254,7 +255,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
     }
 
     @Override
-    public void setOnPreDestroy(Runnable onPreDestroy) {
-        mOnPreDestroy = onPreDestroy;
+    public void setScrollableOnPreDestroy(Runnable onPreDestroy) {
+        this.mOnPreDestroyList.add(onPreDestroy);
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java

@@ -1,21 +1,17 @@
 package it.integry.integrywmsnative.gest.accettazione.core;
 
 import android.content.Context;
-import android.text.TextUtils;
-import android.util.Log;
 
 import com.annimon.stream.Stream;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.EsitoType;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione.rest.OrdiniAccettazioneRESTConsumerService;
 import retrofit2.Call;
@@ -35,7 +31,7 @@ public class AccettazioneHelper {
     }
 
     public void loadOrdini(RunnableArgs<List<OrdineAccettazioneInevasoDTO>> onComplete, RunnableArgs<Exception> onFailed){
-        String codMdep = SettingsManager.i().userSession.depo.getCodMdep();
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
         OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
         service.listOrdiniInevasi(codMdep, "A").enqueue(new Callback<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>>() {
@@ -65,50 +61,6 @@ public class AccettazioneHelper {
         });
     }
 
-    public void retrievePickingList(List<String> barcodeOrdini, RunnableArgs<List<OrdineAccettazioneDTO>> onComplete, RunnableArgs<Exception> onFailed){
-
-        String joinedBarcodes = TextUtils.join(",", barcodeOrdini);
-
-        OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
-
-        service.pickingListAccettazione(joinedBarcodes).enqueue(new Callback<ServiceRESTResponse<List<OrdineAccettazioneDTO>>>() {
-            @Override
-            public void onResponse(Call<ServiceRESTResponse<List<OrdineAccettazioneDTO>>> call, Response<ServiceRESTResponse<List<OrdineAccettazioneDTO>>> response) {
-                if(response.isSuccessful()) {
-
-                    if(response.body() != null) {
-                        if(response.body().getEsito() == EsitoType.OK) {
-                            List<OrdineAccettazioneDTO> dto = response.body().getDto();
-
-                            for (OrdineAccettazioneDTO ordine : dto) {
-                                for(OrdineAccettazioneDTO.Riga riga : ordine.getOrdini()){
-                                    riga.numOrd = ordine.getNumero();
-                                    riga.dataOrd = ordine.getData();
-                                    riga.gestioneOrd = ordine.getGestione();
-                                    riga.codAlis = ordine.getCodAlis();
-                                }
-                            }
-
-                            onComplete.run(dto);
-                        } else {
-                            onFailed.run(new Exception(response.body().getErrorMessage()));
-                        }
-                    } else {
-                        onFailed.run(new Exception(response.message()));
-                    }
-                } else {
-                    onFailed.run(new Exception("Status " + response.code() + ": " + response.message()));
-                }
-            }
-
-            @Override
-            public void onFailure(Call<ServiceRESTResponse<List<OrdineAccettazioneDTO>>> call, Throwable t) {
-                onFailed.run(new Exception(t));
-            }
-        });
-
-    }
-
 
 
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/GetPickingListAccettazioneDTO.java

@@ -0,0 +1,35 @@
+package it.integry.integrywmsnative.gest.accettazione.dto;
+
+public class GetPickingListAccettazioneDTO {
+    private String data;
+    private Integer numero;
+    private String gestione;
+
+
+    public String getData() {
+        return data;
+    }
+
+    public GetPickingListAccettazioneDTO setData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    public Integer getNumero() {
+        return numero;
+    }
+
+    public GetPickingListAccettazioneDTO setNumero(Integer numero) {
+        this.numero = numero;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public GetPickingListAccettazioneDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneInevasoDTO.java

@@ -3,8 +3,8 @@ package it.integry.integrywmsnative.gest.accettazione.dto;
 import java.util.Date;
 
 import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 
 /**
  * Created by GiuseppeS on 06/03/2018.
@@ -31,6 +31,7 @@ public class OrdineAccettazioneInevasoDTO {
     private String  dataCons;
     private String  barcode;
     private String  gestione;
+    private boolean ordTrasf;
 
     public BindableBoolean selected;
 
@@ -223,11 +224,23 @@ public class OrdineAccettazioneInevasoDTO {
         return gestione;
     }
 
+    public GestioneEnum getGestioneEnum() {
+        return GestioneEnum.fromString(gestione);
+    }
+
     public OrdineAccettazioneInevasoDTO setGestione(String gestione) {
         this.gestione = gestione;
         return this;
     }
 
+    public boolean isOrdTrasf() {
+        return ordTrasf;
+    }
+
+    public OrdineAccettazioneInevasoDTO setOrdTrasf(boolean ordTrasf) {
+        this.ordTrasf = ordTrasf;
+        return this;
+    }
 
     public boolean isSelected() {
         return selected.get();

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/SitArtOrdDTO.java

@@ -0,0 +1,282 @@
+package it.integry.integrywmsnative.gest.accettazione.dto;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+
+public class SitArtOrdDTO {
+    private String codJcom;
+    private String codMart;
+    private String codCol;
+    private String codTagl;
+    private String codAlis;
+    private String codArtFor;
+    private BigDecimal qtaOrd;
+    private BigDecimal numCnfOrd;
+    private BigDecimal qtaCnfOrd;
+    private BigDecimal qtaEvasa;
+    private BigDecimal qtaDaEvadere;
+    private BigDecimal numCnfDaEvadere;
+    private BigDecimal qtaRiservata;
+    private String untOrd;
+    private String codMdep;
+    private String dataOrd;
+    private int numOrd;
+    private String gestione;
+    private int rigaOrd;
+    private String codAnagOrd;
+    private String ragSocOrd;
+    private String codAnagCom;
+    private String ragSocCom;
+    private String rifOrd;
+    private String descrizioneCommessa;
+    private String termCons;
+    private String descrizioneEstesaArt;
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public SitArtOrdDTO setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public SitArtOrdDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getCodCol() {
+        return codCol;
+    }
+
+    public SitArtOrdDTO setCodCol(String codCol) {
+        this.codCol = codCol;
+        return this;
+    }
+
+    public String getCodTagl() {
+        return codTagl;
+    }
+
+    public SitArtOrdDTO setCodTagl(String codTagl) {
+        this.codTagl = codTagl;
+        return this;
+    }
+
+    public String getCodAlis() {
+        return codAlis;
+    }
+
+    public SitArtOrdDTO setCodAlis(String codAlis) {
+        this.codAlis = codAlis;
+        return this;
+    }
+
+    public String getCodArtFor() {
+        return codArtFor;
+    }
+
+    public SitArtOrdDTO setCodArtFor(String codArtFor) {
+        this.codArtFor = codArtFor;
+        return this;
+    }
+
+    public BigDecimal getQtaOrd() {
+        return qtaOrd;
+    }
+
+    public SitArtOrdDTO setQtaOrd(BigDecimal qtaOrd) {
+        this.qtaOrd = qtaOrd;
+        return this;
+    }
+
+    public BigDecimal getNumCnfOrd() {
+        return numCnfOrd;
+    }
+
+    public SitArtOrdDTO setNumCnfOrd(BigDecimal numCnfOrd) {
+        this.numCnfOrd = numCnfOrd;
+        return this;
+    }
+
+    public BigDecimal getQtaCnfOrd() {
+        return qtaCnfOrd;
+    }
+
+    public SitArtOrdDTO setQtaCnfOrd(BigDecimal qtaCnfOrd) {
+        this.qtaCnfOrd = qtaCnfOrd;
+        return this;
+    }
+
+    public BigDecimal getQtaEvasa() {
+        return qtaEvasa;
+    }
+
+    public SitArtOrdDTO setQtaEvasa(BigDecimal qtaEvasa) {
+        this.qtaEvasa = qtaEvasa;
+        return this;
+    }
+
+    public BigDecimal getQtaDaEvadere() {
+        return qtaDaEvadere;
+    }
+
+    public SitArtOrdDTO setQtaDaEvadere(BigDecimal qtaDaEvadere) {
+        this.qtaDaEvadere = qtaDaEvadere;
+        return this;
+    }
+
+    public BigDecimal getNumCnfDaEvadere() {
+        return numCnfDaEvadere;
+    }
+
+    public SitArtOrdDTO setNumCnfDaEvadere(BigDecimal numCnfDaEvadere) {
+        this.numCnfDaEvadere = numCnfDaEvadere;
+        return this;
+    }
+
+    public BigDecimal getQtaRiservata() {
+        return qtaRiservata;
+    }
+
+    public SitArtOrdDTO setQtaRiservata(BigDecimal qtaRiservata) {
+        this.qtaRiservata = qtaRiservata;
+        return this;
+    }
+
+    public String getUntOrd() {
+        return untOrd;
+    }
+
+    public SitArtOrdDTO setUntOrd(String untOrd) {
+        this.untOrd = untOrd;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public SitArtOrdDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getDataOrd() {
+        return dataOrd;
+    }
+
+    public SitArtOrdDTO setDataOrd(String dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public int getNumOrd() {
+        return numOrd;
+    }
+
+    public SitArtOrdDTO setNumOrd(int numOrd) {
+        this.numOrd = numOrd;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public GestioneEnum getGestioneEnum() {
+        return GestioneEnum.fromString(gestione);
+    }
+
+    public SitArtOrdDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public int getRigaOrd() {
+        return rigaOrd;
+    }
+
+    public SitArtOrdDTO setRigaOrd(int rigaOrd) {
+        this.rigaOrd = rigaOrd;
+        return this;
+    }
+
+    public String getCodAnagOrd() {
+        return codAnagOrd;
+    }
+
+    public SitArtOrdDTO setCodAnagOrd(String codAnagOrd) {
+        this.codAnagOrd = codAnagOrd;
+        return this;
+    }
+
+    public String getRagSocOrd() {
+        return ragSocOrd;
+    }
+
+    public SitArtOrdDTO setRagSocOrd(String ragSocOrd) {
+        this.ragSocOrd = ragSocOrd;
+        return this;
+    }
+
+    public String getCodAnagCom() {
+        return codAnagCom;
+    }
+
+    public SitArtOrdDTO setCodAnagCom(String codAnagCom) {
+        this.codAnagCom = codAnagCom;
+        return this;
+    }
+
+    public String getRagSocCom() {
+        return ragSocCom;
+    }
+
+    public SitArtOrdDTO setRagSocCom(String ragSocCom) {
+        this.ragSocCom = ragSocCom;
+        return this;
+    }
+
+    public String getRifOrd() {
+        return rifOrd;
+    }
+
+    public SitArtOrdDTO setRifOrd(String rifOrd) {
+        this.rifOrd = rifOrd;
+        return this;
+    }
+
+    public String getDescrizioneCommessa() {
+        return descrizioneCommessa;
+    }
+
+    public SitArtOrdDTO setDescrizioneCommessa(String descrizioneCommessa) {
+        this.descrizioneCommessa = descrizioneCommessa;
+        return this;
+    }
+
+    public String getTermCons() {
+        return termCons;
+    }
+
+    public SitArtOrdDTO setTermCons(String termCons) {
+        this.termCons = termCons;
+        return this;
+    }
+
+    public String getDescrizioneEstesaArt() {
+        return descrizioneEstesaArt;
+    }
+
+    public SitArtOrdDTO setDescrizioneEstesaArt(String descrizioneEstesaArt) {
+        this.descrizioneEstesaArt = descrizioneEstesaArt;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumer.java

@@ -0,0 +1,53 @@
+package it.integry.integrywmsnative.gest.accettazione.rest;
+
+import com.annimon.stream.Stream;
+
+import java.util.List;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.gest.accettazione.dto.GetPickingListAccettazioneDTO;
+import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
+import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class OrdiniAccettazioneRESTConsumer extends _BaseRESTConsumer {
+
+
+    public void retrievePickingListNew(List<OrdineAccettazioneInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        retrievePickingListNewStatic(orders, onComplete, onFailed);
+    }
+
+    public static void retrievePickingListNewStatic(List<OrdineAccettazioneInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+        List<GetPickingListAccettazioneDTO> getPickingListDTOs = Stream.of(orders)
+                .map(x -> new GetPickingListAccettazioneDTO()
+                        .setData(x.getData())
+                        .setGestione(x.getGestione())
+                        .setNumero(x.getNumero()))
+                .toList();
+
+        OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class);
+        service.getArticoliFromOrdiniAccettazione(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
+                analyzeAnswer(response, "retrieveListaArticoliFromOrdiniAccettazione", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
+                UtilityLogger.errorMe(new Exception(t));
+                onFailed.run(new Exception(t));
+            }
+        });
+
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java

@@ -3,10 +3,13 @@ package it.integry.integrywmsnative.gest.accettazione.rest;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
+import it.integry.integrywmsnative.gest.accettazione.dto.GetPickingListAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
+import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.POST;
 import retrofit2.http.Query;
 
 /**
@@ -15,13 +18,10 @@ import retrofit2.http.Query;
 
 public interface OrdiniAccettazioneRESTConsumerService {
 
-    @GET("SM2GetOrdiniAccettazioneInevasi")
-    Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> listOrdiniInevasi(@Query("codMdep") String codMdep);
-
     @GET("SM2GetOrdiniAccettazioneInevasi")
     Call<ServiceRESTResponse<List<OrdineAccettazioneInevasoDTO>>> listOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione);
 
-    @GET("WMSGetPickingListAccettazione")
-    Call<ServiceRESTResponse<List<OrdineAccettazioneDTO>>> pickingListAccettazione(@Query("codBarreBancale") String codBarreBacale);
+    @POST("wms/getArticoliFromOrdiniAccettazione")
+    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdiniAccettazione(@Body List<GetPickingListAccettazioneDTO> pickingListAccettazioneDTOS);
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java

@@ -1,138 +0,0 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso;
-
-import android.content.Intent;
-import androidx.databinding.DataBindingUtil;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.expansion.BaseActivity;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
-import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
-import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
-import it.integry.integrywmsnative.core.data_cache.DataCache;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
-import it.integry.integrywmsnative.core.report.ReportManager;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.databinding.ActivityAccettazioneOrdineInevasoBinding;
-import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel.AccettazioneOrdineAccettazioneInevasoViewModel;
-import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
-import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
-
-public class AccettazioneOrdineInevasoActivity extends BaseActivity {
-
-    public ActivityAccettazioneOrdineInevasoBinding bindings;
-    private AccettazioneOrdineAccettazioneInevasoViewModel mAccettazioneOrdineInevasoViewModel;
-    private ArticoliInColloBottomSheetViewModel mArticoliInColloBottomSheetViewModel;
-
-    private static final int PICK_UL_REQUEST = 1;  // The request code
-
-    private int barcodeScannerIstanceID = -1;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        bindings = DataBindingUtil.setContentView(this, R.layout.activity_accettazione_ordine_inevaso);
-        FragmentArticoliInColloBottomSheetBinding bindings = this.bindings.bottomSheetInclude;
-        mArticoliInColloBottomSheetViewModel = new ArticoliInColloBottomSheetViewModel(this, bindings);
-
-        List<OrdineAccettazioneDTO> orders = DataCache.retrieveItem(getIntent().getStringExtra("key"));
-        mAccettazioneOrdineInevasoViewModel = new AccettazioneOrdineAccettazioneInevasoViewModel(
-                this, mArticoliInColloBottomSheetViewModel, orders);
-
-        setSupportActionBar(this.bindings.toolbar);
-
-        setTitle(orders);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessfull(mAccettazioneOrdineInevasoViewModel.onScanSuccessfull)
-                .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
-
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        onBackPressed();
-        return true;
-    }
-
-    @Override
-    public void onBackPressed() {
-        if(mArticoliInColloBottomSheetViewModel.isExpanded()){
-            mArticoliInColloBottomSheetViewModel.collapse();
-        } else if(mAccettazioneOrdineInevasoViewModel.thereIsAnOpenedUL()) {
-            mArticoliInColloBottomSheetViewModel.closeCurrentUL();
-        } else {
-            BarcodeManager.removeCallback(barcodeScannerIstanceID);
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.activity_accettazione_ordine_inevaso, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle item selection
-        switch (item.getItemId()) {
-            case R.id.action_filter:
-                mAccettazioneOrdineInevasoViewModel.showOrderDialog();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-
-    private void setTitle(List<OrdineAccettazioneDTO> ordini){
-        if(ordini.size() > 0){
-            if(ordini.size() == 1){
-                setTitle(ordini.get(0).getRagSoc());
-            } else {
-                setTitle(R.string.accettazione_ordine_inevaso_title_multiple_order);
-            }
-        } else {
-            setTitle(R.string.accettazione_ordine_inevaso_title_empty);
-        }
-    }
-
-
-
-    public void startListaBancaliRegistratiActivity(ArrayList<MtbColt> mtbColts){
-        Intent myIntent = ListaBancaliActivity.createIntent(this, mtbColts, false, PrinterRESTConsumer.Type.SECONDARIA, ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
-        this.startActivityForResult(myIntent, PICK_UL_REQUEST);
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        // Check which request we're responding to
-        if (requestCode == PICK_UL_REQUEST) {
-            // Make sure the request was successful
-            if (resultCode == RESULT_OK) {
-
-                MtbColt recoveredMtbColt = DataCache.retrieveItem(data.getStringExtra("key"));
-
-                mAccettazioneOrdineInevasoViewModel.recoverUL(recoveredMtbColt);
-            }
-        }
-    }
-
-
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java

@@ -1,318 +0,0 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core;
-
-import android.content.Context;
-import androidx.databinding.ObservableArrayList;
-import android.view.View;
-
-import com.annimon.stream.Stream;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.model.MtbColr;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoListViewModel;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoOrderBy;
-
-/**
- * Created by GiuseppeS on 21/03/2018.
- */
-
-public class AccettazioneOrdineInevasoHelper {
-
-    private Context mContext;
-
-    private ObservableArrayList<AccettazioneOrdineInevasoListViewModel> mListViewModels = new ObservableArrayList<>();
-
-    public AccettazioneOrdineInevasoHelper(Context context){
-        mContext = context;
-    }
-
-    public MainListOrdineAccettazioneAdapter getRightListAdapter(View emptyView) {
-        return new MainListOrdineAccettazioneAdapter(mContext, mListViewModels, emptyView);
-    }
-
-    public void updateListModel(AccettazioneOrdineInevasoOrderBy.Enum orderByEnum, List<List<OrdineAccettazioneDTO.Riga>> mDataset, List<MtbColr> mtbColrs) throws Exception {
-
-        mListViewModels.clear();
-
-        switch (orderByEnum){
-            case COD_ART_FOR:
-            case DESCR_ART:
-                mListViewModels.addAll(getListViewModelPerArtForn(mDataset, mtbColrs));
-                break;
-
-            case RAG_SOC_COM:
-                mListViewModels.addAll(getListViewModelPerRagSocCommessa(mDataset, mtbColrs));
-                break;
-
-            default:
-                throw new Exception("Cannot find right list adapter: " + orderByEnum.toString());
-        }
-
-    }
-
-
-    public List<List<OrdineAccettazioneDTO.Riga>> getOrdiniRaggruppatiPerCodArtForn(List<OrdineAccettazioneDTO.Riga> mDataset, boolean forceHiddenCheck){
-        List<String> codArtForns = new ArrayList<>();
-
-        for(int i = 0; i < mDataset.size(); i++){
-            if(!codArtForns.contains(mDataset.get(i).getCodArtFor())){
-                codArtForns.add(mDataset.get(i).getCodArtFor());
-            }
-
-            if(mDataset.get(i).codJcom == null) mDataset.get(i).codJcom = CommonConst.Config.COMMESSA_MAG;
-            if(mDataset.get(i).codJcom.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)) mDataset.get(i).descrizioneCommessa = null;
-        }
-
-        boolean anyNull = codArtForns.contains(null);
-
-        codArtForns = Stream.of(codArtForns)
-                .withoutNulls()
-                .sortBy(x -> x).toList();
-
-        if(anyNull) codArtForns.add(null);
-
-
-        List<List<OrdineAccettazioneDTO.Riga>> groupedRighe = new ArrayList<>();
-        for (String codArtForn : codArtForns) {
-
-            List<OrdineAccettazioneDTO.Riga> tmpList = Stream.of(mDataset).filter(x -> (x.getCodArtFor() != null && x.getCodArtFor().equalsIgnoreCase(codArtForn)) || (x.getCodArtFor() == null && codArtForn == null)).toList();
-
-            for(int i = 0; i < tmpList.size(); i++){
-                if(tmpList.get(i).isHidden() == null || forceHiddenCheck) {
-                    if (tmpList.get(i).getQtaDaEvadere().floatValue() <= 0) {
-                        tmpList.get(i).setHidden(true);
-                        //tmpList.remove(i);
-                        //i--;
-                    } else tmpList.get(i).setHidden(false);
-
-
-                    tmpList.get(i).setTempHidden(false);
-                }
-            }
-
-            if(tmpList.size() > 0){
-                groupedRighe.add(tmpList);
-            }
-        }
-
-        return groupedRighe;
-    }
-
-
-    public List<List<OrdineAccettazioneDTO.Riga>> getOrdiniRaggruppatiPerDescrArt(List<OrdineAccettazioneDTO.Riga> mDataset, boolean forceHiddenCheck){
-        List<String> descrArtForns = new ArrayList<>();
-
-        for(int i = 0; i < mDataset.size(); i++){
-            if(!descrArtForns.contains(mDataset.get(i).descrizioneEstesa)){
-                descrArtForns.add(mDataset.get(i).descrizioneEstesa);
-            }
-
-            if(mDataset.get(i).codJcom == null) mDataset.get(i).codJcom = CommonConst.Config.COMMESSA_MAG;
-            if(mDataset.get(i).codJcom.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)) mDataset.get(i).descrizioneCommessa = null;
-        }
-
-        Collections.sort(descrArtForns, String::compareToIgnoreCase);
-
-        List<List<OrdineAccettazioneDTO.Riga>> groupedRighe = new ArrayList<>();
-        for (String descrArtForn : descrArtForns) {
-            List<OrdineAccettazioneDTO.Riga> tmpList = Stream.of(mDataset).filter(x -> x.getDescrizioneEstesa() != null && x.getDescrizioneEstesa().equalsIgnoreCase(descrArtForn)).toList();
-
-            for(int i = 0; i < tmpList.size(); i++){
-                if(tmpList.get(i).isHidden() == null || forceHiddenCheck) {
-                    if (tmpList.get(i).getQtaDaEvadere().floatValue() <= 0) {
-                        tmpList.get(i).setHidden(true);
-                    } else tmpList.get(i).setHidden(false);
-
-
-                    tmpList.get(i).setTempHidden(false);
-                }
-            }
-
-            if(tmpList.size() > 0){
-                groupedRighe.add(tmpList);
-            }
-        }
-
-        return groupedRighe;
-    }
-
-
-    private class RaggruppaPerCommessaUtilDTO {
-        public String codJcom = "";
-        public String ragSocCom = "";
-    }
-
-    public List<List<OrdineAccettazioneDTO.Riga>> getOrdiniRaggruppatiPerRagSocCommessa(List<OrdineAccettazioneDTO.Riga> mDataset, boolean forceHiddenCheck) {
-        List<RaggruppaPerCommessaUtilDTO> commessaList = new ArrayList<>();
-
-        commessaList.add(new RaggruppaPerCommessaUtilDTO());
-
-        for(int i = 0; i < mDataset.size(); i++){
-            boolean alreadyExists = false;
-
-            if(mDataset.get(i).codJcom == null) mDataset.get(i).codJcom = CommonConst.Config.COMMESSA_MAG;
-            if(mDataset.get(i).codJcom.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)) mDataset.get(i).descrizioneCommessa = mContext.getText(R.string.stock).toString().toUpperCase();
-
-
-            for(int k = 0; k < commessaList.size(); k++){
-                if(commessaList.get(k).codJcom.equalsIgnoreCase(mDataset.get(i).codJcom)){
-                    alreadyExists = true;
-                }
-            }
-
-            if(mDataset.get(i).codJcom != null && !alreadyExists){
-                RaggruppaPerCommessaUtilDTO dto = new RaggruppaPerCommessaUtilDTO();
-                dto.codJcom = mDataset.get(i).codJcom;
-                dto.ragSocCom = mDataset.get(i).descrizioneCommessa;
-                commessaList.add(dto);
-            }
-        }
-
-        Collections.sort(commessaList, (dto1, dto2) -> {
-            if(dto1.ragSocCom == null || dto2.codJcom.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)) return -1;
-            if(dto2.ragSocCom == null || dto1.codJcom.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)) return 1;
-
-            return dto1.ragSocCom.compareToIgnoreCase(dto2.ragSocCom);
-        });
-
-        List<List<OrdineAccettazioneDTO.Riga>> groupedRighe = new ArrayList<>();
-
-        for (RaggruppaPerCommessaUtilDTO dto : commessaList) {
-
-            List<OrdineAccettazioneDTO.Riga> tmpList = Stream.of(mDataset).filter(x -> x.getCodJcom().equalsIgnoreCase(dto.codJcom)).toList();
-
-            for(int i = 0; i < tmpList.size(); i++){
-                if(tmpList.get(i).isHidden() == null || forceHiddenCheck) {
-                    if (tmpList.get(i).getQtaDaEvadere().floatValue() <= 0) {
-                        tmpList.get(i).setHidden(true);
-                        //tmpList.remove(i);
-                        //i--;
-                    } else tmpList.get(i).setHidden(false);
-
-                    tmpList.get(i).setTempHidden(false);
-                }
-            }
-
-            Collections.sort(tmpList, (obj1, obj2) -> obj1.mtbAart.getDescrizioneEstesa().compareToIgnoreCase(obj2.mtbAart.getDescrizioneEstesa()));
-
-            if(tmpList.size() > 0){
-                groupedRighe.add(tmpList);
-            }
-
-        }
-
-        return groupedRighe;
-    }
-
-
-    public List<AccettazioneOrdineInevasoListViewModel> getListViewModelPerArtForn(List<List<OrdineAccettazioneDTO.Riga>> groupedRighe, List<MtbColr> mtbColrs){
-
-        List<AccettazioneOrdineInevasoListViewModel> listModel = new ArrayList<>();
-
-        for(int i = 0; i < groupedRighe.size(); i++){
-            AccettazioneOrdineInevasoListViewModel itemModel = new AccettazioneOrdineInevasoListViewModel();
-
-            itemModel.descrizioneGroup = "";
-            itemModel.descrizioneGroup += !UtilityString.isNullOrEmpty(groupedRighe.get(i).get(0).getCodArtFor()) ? (groupedRighe.get(i).get(0).getCodArtFor() + " - ") : "";
-            itemModel.descrizioneGroup += groupedRighe.get(i).get(0).descrizioneEstesa;
-
-            itemModel.rows = new ArrayList<>();
-
-            for(int k = 0; k < groupedRighe.get(i).size(); k++){
-                final OrdineAccettazioneDTO.Riga rowItem = groupedRighe.get(i).get(k);
-                final AccettazioneOrdineInevasoListViewModel.SubItem rowModel = new AccettazioneOrdineInevasoListViewModel.SubItem();
-
-                rowModel.setBadge1(rowItem.codJcom != null ? rowItem.codJcom : CommonConst.Config.COMMESSA_MAG);
-                rowModel.setBadge2(String.valueOf(rowItem.numOrd));
-
-//                rowModel.descrizione = rowItem.ragSocCom;
-                rowModel.setDescrizione(rowItem.descrizioneCommessa);
-
-                rowModel.setQtaRiservata(getRigaQuantityEvasa(rowItem, mtbColrs));
-                rowModel.setQtaOrdinata(rowItem.getQtaOrd());
-
-                rowModel.setOriginalModel(rowItem);
-
-                itemModel.rows.add(rowModel);
-            }
-            listModel.add(itemModel);
-        }
-
-        return listModel;
-    }
-
-
-    public List<AccettazioneOrdineInevasoListViewModel> getListViewModelPerRagSocCommessa(List<List<OrdineAccettazioneDTO.Riga>> groupedRighe, List<MtbColr> mtbColrs) {
-        List<AccettazioneOrdineInevasoListViewModel> listModel = new ArrayList<>();
-
-        for(int i = 0; i < groupedRighe.size(); i++){
-            AccettazioneOrdineInevasoListViewModel itemModel = new AccettazioneOrdineInevasoListViewModel();
-
-            if(groupedRighe.get(i).get(0).codJcom.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)){
-                itemModel.descrizioneGroup = mContext.getString(R.string.warehouse).toUpperCase();
-            } else {
-                itemModel.descrizioneGroup = groupedRighe.get(i).get(0).codJcom;
-            }
-
-            if(groupedRighe.get(i).get(0).ragSocCom != null && groupedRighe.get(i).get(0).ragSocCom.trim().length() > 0){
-                itemModel.descrizioneGroup += " - " + groupedRighe.get(i).get(0).descrizioneCommessa;
-            }
-
-            itemModel.rows = new ArrayList<>();
-
-            for(int k = 0; k < groupedRighe.get(i).size(); k++){
-                final OrdineAccettazioneDTO.Riga rowItem = groupedRighe.get(i).get(k);
-                final AccettazioneOrdineInevasoListViewModel.SubItem rowModel = new AccettazioneOrdineInevasoListViewModel.SubItem();
-
-                rowModel.setBadge1(rowItem.getCodArtFor());
-                rowModel.setBadge2(String.valueOf(rowItem.numOrd));
-
-                rowModel.setDescrizione(rowItem.mtbAart.getDescrizioneEstesa());
-
-                rowModel.setQtaRiservata(getRigaQuantityEvasa(rowItem, mtbColrs));
-//                rowModel.qtaRiservata = decimalFormat.format(rowItem.qtaRiservate);
-                rowModel.setQtaOrdinata(rowItem.getQtaOrd());
-
-                rowModel.setOriginalModel(rowItem);
-
-                itemModel.rows.add(rowModel);
-            }
-            listModel.add(itemModel);
-        }
-
-        return listModel;
-    }
-
-
-
-    private BigDecimal getRigaQuantityEvasa(OrdineAccettazioneDTO.Riga item, List<MtbColr> mtbColrs){
-        BigDecimal currentQtaEvasa = item.getQtaRiservate().add(item.getQtaEvasa());
-
-        if(mtbColrs != null) {
-            List<MtbColr> filteredMtbColrs = Stream.of(mtbColrs)
-                    .filter(x -> x.getNumOrd() != null)
-                    .filter(
-                       x -> x.getCodMart().equalsIgnoreCase(item.mtbAart.getCodMart()) &&
-                           (x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.codJcom)) &&
-                            x.getRigaOrd() == item.rigaOrd &&
-                            x.getNumOrd() == item.numOrd &&
-                            x.getDataOrdS().equals(UtilityDate.formatDate(item.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH))).toList();
-
-
-            for (MtbColr mtbColr : filteredMtbColrs) {
-                currentQtaEvasa = currentQtaEvasa.add(mtbColr.getQtaCol());
-            }
-        }
-
-        return currentQtaEvasa;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java

@@ -1,10 +0,0 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core;
-
-import it.integry.integrywmsnative.core.rest.model.Ean128Model;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
-
-public interface IOnOrdineAccettazioneRowDispatchCallback {
-
-    void onOrdineRowDispatch(OrdineAccettazioneDTO.Riga item, Ean128Model ean128Model);
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java

@@ -1,247 +0,0 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core;
-
-import android.content.Context;
-import androidx.databinding.ObservableArrayList;
-import androidx.databinding.ObservableList;
-import android.graphics.Color;
-import androidx.core.util.Pools;
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.annimon.stream.Stream;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.utility.UtilityNumber;
-import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoListViewModel;
-
-/**
- * Created by GiuseppeS on 21/03/2018.
- */
-
-public class MainListOrdineAccettazioneAdapter extends RecyclerView.Adapter<MainListOrdineAccettazioneAdapter.ViewHolder> {
-
-    private Context mContext;
-    private List<AccettazioneOrdineInevasoListViewModel> mDataset;
-    private View mEmptyView;
-
-    private ObservableArrayList<AccettazioneOrdineInevasoListViewModel> mObservableDataset;
-    private IOnOrdineAccettazioneRowDispatchCallback mOrdineRowDispatch;
-
-    private static final Pools.SynchronizedPool sPool = new Pools.SynchronizedPool(200);
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        // each data item is just a string in this case
-        protected View mGroupTitle;
-        protected LinearLayout mLinearLayoutGroupItemContainer;
-
-        protected List<View> pool = new ArrayList<>();
-
-        public ViewHolder(View v) {
-            super(v);
-        }
-    }
-
-
-    public MainListOrdineAccettazioneAdapter(Context context, ObservableArrayList<AccettazioneOrdineInevasoListViewModel> myDataset, View emptyView) {
-        mContext = context;
-        mObservableDataset = myDataset;
-        mEmptyView = emptyView;
-
-        mDataset = Stream.of(mObservableDataset).filter(x -> !x.isHidden()).toList();
-        mObservableDataset.addOnListChangedCallback(onListChangedCallback);
-
-        checkIfEmpty();
-    }
-
-    public void setOnOrdineRowDispatchCallback(IOnOrdineAccettazioneRowDispatchCallback ordineRowDispatch) {
-        mOrdineRowDispatch = ordineRowDispatch;
-    }
-
-    private ObservableList.OnListChangedCallback onListChangedCallback = new ObservableList.OnListChangedCallback<ObservableList<AccettazioneOrdineInevasoListViewModel>>() {
-        @Override
-        public void onChanged(ObservableList<AccettazioneOrdineInevasoListViewModel> sender) {
-            refreshNotHiddenElements();
-            notifyDataSetChanged();
-            checkIfEmpty();
-        }
-
-        @Override
-        public void onItemRangeChanged(ObservableList<AccettazioneOrdineInevasoListViewModel> sender, int positionStart, int itemCount) {
-            refreshNotHiddenElements();
-            notifyDataSetChanged();
-            checkIfEmpty();
-        }
-
-        @Override
-        public void onItemRangeInserted(ObservableList<AccettazioneOrdineInevasoListViewModel> sender, int positionStart, int itemCount) {
-            refreshNotHiddenElements();
-            notifyDataSetChanged();
-            checkIfEmpty();
-        }
-
-        @Override
-        public void onItemRangeMoved(ObservableList<AccettazioneOrdineInevasoListViewModel> sender, int fromPosition, int toPosition, int itemCount) {
-            refreshNotHiddenElements();
-            notifyDataSetChanged();
-            checkIfEmpty();
-        }
-
-        @Override
-        public void onItemRangeRemoved(ObservableList<AccettazioneOrdineInevasoListViewModel> sender, int positionStart, int itemCount) {
-            refreshNotHiddenElements();
-            notifyDataSetChanged();
-            checkIfEmpty();
-        }
-
-        private void refreshNotHiddenElements() {
-            mDataset = Stream.of(mObservableDataset).filter(x -> !x.isHidden()).toList();
-        }
-    };
-
-
-    @Override
-    public MainListOrdineAccettazioneAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        // create a new view
-        View v = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.accettazione_ordine_inevaso_main_list___cod_art_for, parent, false);
-
-        //v.setHasTransientState(true);
-
-        ViewHolder vh = new ViewHolder(v);
-
-        TextView descrizioneArtForn = v.findViewById(R.id.accettazione_ordine_inevaso_main_list_descrArtFor);
-        vh.mGroupTitle = descrizioneArtForn;
-
-        LinearLayout groupItemContainer = v.findViewById(R.id.accettazione_ordine_inevaso_main_list_group_item_container);
-        vh.mLinearLayoutGroupItemContainer = groupItemContainer;
-
-        return vh;
-    }
-
-
-    // Replace the contents of a view (invoked by the layout manager)
-    @Override
-    public void onBindViewHolder(MainListOrdineAccettazioneAdapter.ViewHolder holder, int position) {
-        // - get element from your dataset at this position
-        // - replace the contents of the view with that element
-
-        ((TextView)holder.mGroupTitle).setText(mDataset.get(position).descrizioneGroup);
-
-        List<AccettazioneOrdineInevasoListViewModel.SubItem> subset = mDataset.get(position).rows;
-
-        int visibleElementsCounter = 0;
-
-        for(int i = 0; i < subset.size(); i++) {
-
-            final AccettazioneOrdineInevasoListViewModel.SubItem rowItem = subset.get(i);
-
-            if(!rowItem.getOriginalModel().isHidden() &&
-                    (rowItem.getOriginalModel().isTempHidden() == null ||
-                            (rowItem.getOriginalModel().isTempHidden() != null && !rowItem.getOriginalModel().isTempHidden()))) {
-
-                visibleElementsCounter++;
-
-                View groupModelViewPool = (View) sPool.acquire();
-                if (groupModelViewPool == null) {
-                    groupModelViewPool = LayoutInflater.from(mContext)
-                            .inflate(R.layout.accettazione_ordine_inevaso_main_list___cod_art_for_group_model, holder.mLinearLayoutGroupItemContainer, false);
-                }
-
-
-                View groupModelView = groupModelViewPool;
-                holder.pool.add(groupModelView);
-
-                if (rowItem.getQtaRiservata().subtract(rowItem.getQtaOrdinata()).floatValue() >= 0 ) {
-                    groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.green_500_with_alpha));
-                } else if (rowItem.getQtaRiservata().floatValue() > 0) {
-                    groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
-                } else if (visibleElementsCounter % 2 == 1) {
-                    groupModelView.setBackgroundColor(Color.WHITE);
-                } else {
-                    groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
-                }
-
-
-                final TextView badge1 = groupModelView.findViewById(R.id.accettazione_ordine_inevaso_main_list_group_item_badge1);
-                badge1.setText(rowItem.getBadge1());
-                badge1.setVisibility(UtilityString.isNullOrEmpty(rowItem.getBadge1()) ? View.GONE : View.VISIBLE);
-
-                final TextView badge2 = groupModelView.findViewById(R.id.accettazione_ordine_inevaso_main_list_group_item_badge2);
-                badge2.setText(rowItem.getBadge2());
-                badge2.setVisibility(UtilityString.isNullOrEmpty(rowItem.getBadge2()) ? View.GONE : View.VISIBLE);
-
-
-                final TextView descrizione = groupModelView.findViewById(R.id.accettazione_ordine_inevaso_main_list_group_item_descrizione);
-
-                String descrizioneString = rowItem.getDescrizione();
-                int descrizioneColor = Color.BLACK;
-
-                if (UtilityString.isNullOrEmpty(descrizioneString)) {
-                    descrizioneString = mContext.getString(R.string.no_description);
-                    descrizioneColor = Color.GRAY;
-                } else if (descrizioneString.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)) {
-                    descrizioneString = mContext.getString(R.string.stock);
-                }
-
-                descrizione.setText(descrizioneString);
-                descrizione.setTextColor(descrizioneColor);
-
-                final TextView qtaEvasa = groupModelView.findViewById(R.id.accettazione_ordine_inevaso_main_list_group_item_qta_evasa);
-                qtaEvasa.setText(UtilityNumber.decimalToString(rowItem.getQtaRiservata()));
-
-                final TextView qtaTot = groupModelView.findViewById(R.id.accettazione_ordine_inevaso_main_list_group_item_qta_tot);
-                qtaTot.setText(UtilityNumber.decimalToString(rowItem.getQtaOrdinata()));
-
-
-                groupModelView.setOnClickListener(view -> {
-                    if (mOrdineRowDispatch != null) {
-                        mOrdineRowDispatch.onOrdineRowDispatch(rowItem.getOriginalModel(), null);
-                    }
-                });
-
-                holder.mLinearLayoutGroupItemContainer.addView(groupModelView);
-            }
-        }
-
-    }
-
-    @Override
-    public void onViewRecycled(MainListOrdineAccettazioneAdapter.ViewHolder holder){
-        if(holder != null){
-            for(int i = 0; i < holder.pool.size(); i++){
-                ((ViewGroup) holder.pool.get(i).getParent()).removeView(holder.pool.get(i));
-                sPool.release(holder.pool.get(i));
-            }
-
-            holder.pool.clear();
-        }
-
-        super.onViewRecycled(holder);
-    }
-
-
-
-    // Return the size of your dataset (invoked by the layout manager)
-    @Override
-    public int getItemCount() {
-        return mDataset.size();
-    }
-
-
-
-    void checkIfEmpty() {
-        if (mEmptyView != null) {
-            final boolean emptyViewVisible = getItemCount() == 0;
-            mEmptyView.setVisibility(emptyViewVisible ? View.VISIBLE : View.GONE);
-        }
-    }
-}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/dto/AccettazioneOrdineInevasoListViewModel.java

@@ -1,92 +0,0 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto;
-
-import com.annimon.stream.Stream;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
-
-/**
- * Created by GiuseppeS on 27/03/2018.
- */
-
-public class AccettazioneOrdineInevasoListViewModel {
-
-    public String descrizioneGroup;
-    public List<SubItem> rows;
-
-    public boolean isHidden(){
-        if(rows == null || rows.size() == 0) return true;
-        return Stream.of(rows).filter(
-                x -> (x.originalModel.isHidden() != null && !x.originalModel.isHidden()) &&
-                        (x.originalModel.isTempHidden() != null && !x.originalModel.isTempHidden())).count() == 0;
-    }
-
-    public static class SubItem {
-
-        private String badge1;
-        private String badge2;
-
-        private String descrizione;
-        private BigDecimal qtaRiservata;
-        private BigDecimal qtaOrdinata;
-
-        private OrdineAccettazioneDTO.Riga originalModel;
-
-        public String getBadge1() {
-            return badge1;
-        }
-
-        public SubItem setBadge1(String badge1) {
-            this.badge1 = badge1;
-            return this;
-        }
-
-        public String getBadge2() {
-            return badge2;
-        }
-
-        public SubItem setBadge2(String badge2) {
-            this.badge2 = badge2;
-            return this;
-        }
-
-        public String getDescrizione() {
-            return descrizione;
-        }
-
-        public SubItem setDescrizione(String descrizione) {
-            this.descrizione = descrizione;
-            return this;
-        }
-
-        public BigDecimal getQtaRiservata() {
-            return qtaRiservata;
-        }
-
-        public SubItem setQtaRiservata(BigDecimal qtaRiservata) {
-            this.qtaRiservata = qtaRiservata;
-            return this;
-        }
-
-        public BigDecimal getQtaOrdinata() {
-            return qtaOrdinata;
-        }
-
-        public SubItem setQtaOrdinata(BigDecimal qtaOrdinata) {
-            this.qtaOrdinata = qtaOrdinata;
-            return this;
-        }
-
-        public OrdineAccettazioneDTO.Riga getOriginalModel() {
-            return originalModel;
-        }
-
-        public SubItem setOriginalModel(OrdineAccettazioneDTO.Riga originalModel) {
-            this.originalModel = originalModel;
-            return this;
-        }
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java

@@ -1,76 +0,0 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest;
-
-import com.annimon.stream.Stream;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
-
-public class OrdineAccettazioneInevasoRESTConsumerService {
-
-    public static void getBancaliGiaRegistrati(List<OrdineAccettazioneDTO> ordiniToShow, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) throws Exception {
-
-        List<String> colliWhereCond = new ArrayList<>();
-
-
-        Stream.of(ordiniToShow).forEach(x -> {
-            try {
-                Date date = UtilityDate.recognizeDate(x.getData());
-                String dateString = UtilityDate.formatDate(date, "yyyy/MM/dd");
-
-                if (!colliWhereCond.contains(x.getGestione() + " " + dateString + " " + x.getNumero())) {
-                    String gestione = x.getGestione().equalsIgnoreCase("P") ? "L" : x.getGestione();
-                    colliWhereCond.add(gestione + " " + dateString + " " + x.getNumero());
-                }
-            } catch (Exception ex){
-                UtilityLogger.errorMe(ex);
-            }
-        });
-
-
-        String colliINCondition = "";
-
-        for(int i = 0; i < colliWhereCond.size(); i ++){
-            colliINCondition += "'" + colliWhereCond.get(i) + "'";
-
-            if(i < (colliWhereCond.size()-1)) colliINCondition += ",";
-        }
-
-
-
-        String sql = "SELECT DISTINCT mtb_colt.* " +
-                "FROM mtb_colt, mtb_colr " +
-                "WHERE mtb_colt.gestione = mtb_colr.gestione AND " +
-                "mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
-                "mtb_colt.data_collo = mtb_colr.data_collo AND " +
-                "mtb_colt.num_collo = mtb_colr.num_collo AND " +
-                "mtb_colt.gestione + ' ' + CONVERT(VARCHAR(15), mtb_colr.data_ord, 111) + ' ' + CONVERT(VARCHAR, mtb_colr.num_ord) IN (" + colliINCondition +
-                ") AND mtb_colt.data_doc IS NULL ";
-
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();
-        SystemRESTConsumer.processSqlStatic(sql, typeOfObjectsList, new ISimpleOperationCallback<List<MtbColt>>() {
-            @Override
-            public void onSuccess(List<MtbColt> value) {
-                if(onComplete != null) onComplete.run(value);
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                if(onFailed != null) onFailed.run(ex);
-            }
-        });
-
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java

@@ -1,948 +0,0 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel;
-
-import android.app.Dialog;
-import android.text.SpannableString;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.databinding.ObservableArrayList;
-import androidx.databinding.ObservableField;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import com.annimon.stream.Stream;
-import com.tfb.fbtoast.FBToast;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-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.secondary.GestioneEnum;
-import it.integry.integrywmsnative.core.report.ReportManager;
-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.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.Ean128Model;
-import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityBarcode;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
-import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.AccettazioneOrdineInevasoHelper;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.IOnOrdineAccettazioneRowDispatchCallback;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.MainListOrdineAccettazioneAdapter;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoOrderBy;
-import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest.OrdineAccettazioneInevasoRESTConsumerService;
-import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback;
-import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
-import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
-import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
-import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
-
-public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloClosedCallback, IOnOrdineAccettazioneRowDispatchCallback {
-
-    public ObservableField<Boolean> isFabVisible = new ObservableField<>();
-
-    private AccettazioneOrdineInevasoActivity mActivity;
-    private final ArticoliInColloBottomSheetViewModel mArticoliInColloBottomSheetViewModel;
-    private final List<OrdineAccettazioneDTO> mOrders;
-
-    private List<List<OrdineAccettazioneDTO.Riga>> groupedRighe;
-    private List<OrdineAccettazioneDTO.Riga> groupedOrdini;
-
-    private AccettazioneOrdineInevasoHelper helper;
-
-    private AccettazioneOrdineInevasoOrderBy.Enum currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.COD_ART_FOR;
-    private MainListOrdineAccettazioneAdapter mAdapter;
-
-    private GestioneEnum defaultGestioneOfUL = null;
-
-    public AccettazioneOrdineAccettazioneInevasoViewModel(AccettazioneOrdineInevasoActivity activity, ArticoliInColloBottomSheetViewModel articoliInColloBottomSheetViewModel, List<OrdineAccettazioneDTO> orders) {
-        this.mActivity = activity;
-        this.mArticoliInColloBottomSheetViewModel = articoliInColloBottomSheetViewModel;
-        this.mOrders = orders;
-
-        this.isFabVisible.set(true);
-
-        this.mActivity.bindings.setViewmodel(this);
-
-        this.init();
-    }
-
-    private void init() {
-
-        currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione);
-
-        mArticoliInColloBottomSheetViewModel.setOnCloseColloCallbackListener(this);
-        mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback(this::onRowDeleted);
-        mArticoliInColloBottomSheetViewModel.setOnItemEditedCallback(this::onRowEdited);
-
-        groupedOrdini = new ArrayList<>();
-        for (OrdineAccettazioneDTO ordine : mOrders) {
-            groupedOrdini.addAll(ordine.getOrdini());
-        }
-
-        helper = new AccettazioneOrdineInevasoHelper(mActivity);
-
-        groupedRighe = helper.getOrdiniRaggruppatiPerCodArtForn(groupedOrdini, true);
-
-        initRecyclerView(groupedRighe);
-
-
-        //Definizione della gestione collo di default
-        List<GestioneEnum> foundGestioni = Stream.of(groupedOrdini)
-                .map(OrdineAccettazioneDTO.Riga::getGestioneOrdEnum)
-                .withoutNulls()
-                .distinctBy(x -> x)
-                .toList();
-
-        if (foundGestioni != null) {
-
-            if (foundGestioni.size() == 1) {
-                defaultGestioneOfUL = foundGestioni.get(0) == GestioneEnum.PRODUZIONE ? GestioneEnum.LAVORAZIONE : foundGestioni.get(0);
-            } else {
-                DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString(mActivity.getString(R.string.error_multiple_gest)), null, () -> {
-                    mActivity.finish();
-                }).show();
-                return;
-            }
-        } else {
-            DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString(mActivity.getString(R.string.error_no_gest_found)), null, () -> {
-                mActivity.finish();
-            }).show();
-            return;
-        }
-    }
-
-
-    private void initRecyclerView(List<List<OrdineAccettazioneDTO.Riga>> groupedRighe) {
-        //RecyclerView setup
-        mActivity.bindings.accettazioneOrdineMainList.setHasFixedSize(true);
-
-        mActivity.bindings.accettazioneOrdineMainList.setLayoutManager(new LinearLayoutManager(mActivity));
-
-        mAdapter = helper.getRightListAdapter(mActivity.bindings.accettazioneEmptyView);
-
-        try {
-            helper.updateListModel(AccettazioneOrdineInevasoOrderBy.Enum.COD_ART_FOR, groupedRighe, null);
-        } catch (Exception e) {
-            UtilityExceptions.defaultException(mActivity, e);
-        }
-
-        mAdapter.setOnOrdineRowDispatchCallback(this);
-        mActivity.bindings.accettazioneOrdineMainList.setAdapter(mAdapter);
-    }
-
-    public void refreshOrderBy(boolean forceHiddenCheck) {
-        switch (currentOrderBy) {
-            case COD_ART_FOR:
-                groupedRighe = helper.getOrdiniRaggruppatiPerCodArtForn(groupedOrdini, forceHiddenCheck);
-                break;
-            case DESCR_ART:
-                groupedRighe = helper.getOrdiniRaggruppatiPerDescrArt(groupedOrdini, forceHiddenCheck);
-                break;
-
-            case RAG_SOC_COM:
-                groupedRighe = helper.getOrdiniRaggruppatiPerRagSocCommessa(groupedOrdini, forceHiddenCheck);
-                break;
-
-            default:
-                break;
-        }
-
-        try {
-            List<MtbColr> mtbColrs = getColloRef() != null ? getColloRef().getMtbColr() : null;
-
-            helper.updateListModel(currentOrderBy, groupedRighe, mtbColrs);
-        } catch (Exception e) {
-            UtilityExceptions.defaultException(mActivity, e);
-        }
-    }
-
-    public void applyFilter(String descriptionText) {
-
-        mActivity.bindings.filteredArtsInListExpandableLayout.expand(true);
-
-        mActivity.bindings.descriptionFilterText.setText(descriptionText);
-    }
-
-    public void removeListFilter() {
-        for (int i = 0; i < groupedOrdini.size(); i++) {
-            groupedOrdini.get(i).setTempHidden(false);
-        }
-
-        refreshOrderBy(false);
-        mActivity.bindings.filteredArtsInListExpandableLayout.collapse(true);
-    }
-
-    public void recoverUL(MtbColt recoveredMtbColt) {
-
-        for (int i = 0; i < recoveredMtbColt.getMtbColr().size(); i++) {
-
-            MtbColr currentMtbColr = recoveredMtbColt.getMtbColr().get(i);
-
-            /*
-            List<OrdineAccettazioneDTO.Riga> foundRows = Stream.of(groupedOrdini)
-                    .filter(x -> x.getNumOrd() == currentMtbColr.getNumOrd() &&
-                            x.getRigaOrd() == currentMtbColr.getRigaOrd()&&
-                            x.getDataOrdD().equals(currentMtbColr.getDataOrdD()))
-                    .toList();
-            */
-
-            List<OrdineAccettazioneDTO.Riga> foundRows = Stream.of(groupedOrdini)
-                    .filter(x -> Objects.equals(x.mtbAart.getCodMart(), currentMtbColr.getCodMart()) &&
-                            Objects.equals(x.getPartitaMag(), currentMtbColr.getPartitaMag()) &&
-                            Objects.equals(x.getCodJcom(), currentMtbColr.getCodJcom()))
-                    .toList();
-
-
-            if (foundRows != null && foundRows.size() > 0) {
-                OrdineAccettazioneDTO.Riga currentRow = foundRows.get(0);
-
-                currentRow.setHidden(false);
-                currentRow.setQtaRiservate(currentRow.getQtaRiservate().subtract(currentMtbColr.getQtaCol()));
-            }
-
-        }
-
-
-        setULToCurrentContext(recoveredMtbColt);
-        refreshOrderBy(false);
-    }
-
-
-    public RunnableArgs<BarcodeScanDTO> onScanSuccessfull = data -> {
-
-        Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mActivity);
-
-        BarcodeManager.disable();
-        if (UtilityBarcode.isEtichettaAnonima(data)) {
-            if (!thereIsAnOpenedUL()) this.executeEtichettaAnonima(data, progressDialog);
-            else {
-                DialogSimpleMessageHelper.makeErrorDialog(
-                        mActivity,
-                        new SpannableString(mActivity.getString(R.string.lu_scan_not_granted_here)),
-                        null,
-                        () -> {
-                            BarcodeManager.enable();
-                            progressDialog.dismiss();
-                        })
-                        .show();
-            }
-        } else if (UtilityBarcode.isEtichetta128(data)) {
-            this.executeEtichettaEan128(data, progressDialog);
-        } else if (UtilityBarcode.isEanPeso(data)) {
-            this.executeEtichettaEanPeso(data, progressDialog);
-        } else {
-            this.loadArticolo(data.getStringValue(), null, progressDialog);
-        }
-
-    };
-
-
-    private void executeEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) {
-        ColliMagazzinoRESTConsumer.getBySSCCStatic(barcodeScanDTO.getStringValue(), false, false, mtbColt -> {
-
-            if (mtbColt == null) {
-                if (!UtilityBarcode.isEtichettaAnonimaOfCurrentYear(barcodeScanDTO.getStringValue())) {
-                    UtilityExceptions.defaultException(mActivity, new Exception("Per continuare scansiona un'etichetta dell'anno corrente"), progressDialog, false);
-                    BarcodeManager.enable();
-                } else {
-                    this.createNewUL(UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()), CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, progressDialog, true, null);
-                    BarcodeManager.enable();
-                }
-            } else {
-                progressDialog.dismiss();
-                BarcodeManager.enable();
-                DialogSimpleMessageHelper.makeWarningDialog(mActivity,
-                        new SpannableString(mActivity.getResources().getText(R.string.already_used_anonymous_barcode)),
-                        null, null).show();
-            }
-
-        }, ex -> {
-            UtilityExceptions.defaultException(mActivity, ex, progressDialog);
-            BarcodeManager.enable();
-        });
-    }
-
-
-    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) {
-        BarcodeRESTConsumer.decodeEan128Static(barcodeScanDTO, ean128Model -> {
-
-            String barcodeProd = null;
-
-            if (ean128Model.Sscc != null) barcodeProd = ean128Model.Sscc;
-            if (ean128Model.Gtin != null) barcodeProd = ean128Model.Gtin;
-            if (ean128Model.Content != null) barcodeProd = ean128Model.Content;
-
-
-            if (!UtilityString.isNullOrEmpty(barcodeProd)) {
-                if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
-                    barcodeProd = barcodeProd.substring(1, barcodeProd.length());
-                }
-                this.loadArticolo(barcodeProd, ean128Model, progressDialog);
-            } else {
-                //EAN 128 non completo o comunque mancano i riferimenti al prodotto
-                progressDialog.dismiss();
-                BarcodeManager.enable();
-            }
-        }, ex -> {
-            UtilityExceptions.defaultException(mActivity, ex, progressDialog);
-            BarcodeManager.enable();
-        });
-    }
-
-    private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) {
-
-        try {
-            Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
-
-            this.loadArticolo(ean13PesoModel.getPrecode(), ean13PesoModel.toEan128(), progressDialog);
-        } catch (Exception ex) {
-            UtilityExceptions.defaultException(mActivity, ex, progressDialog);
-            BarcodeManager.enable();
-        }
-    }
-
-
-    private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) {
-        if (barcodeProd.length() == 14) {
-//            barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd);
-            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
-        }
-
-        ArticoloRESTConsumer.getByBarcodeProdStatic(barcodeProd, mtbAartList -> {
-
-            if (mtbAartList != null && mtbAartList.size() > 0) {
-
-                if (!thereIsAnOpenedUL()) {
-
-                    if (SettingsManager.iDB().isFlagCanAutoOpenNewULAccettazione()) {
-                        this.createNewUL(null, null, progressDialog, false, () -> {
-                            BarcodeManager.enable();
-                            this.searchArtInList(mtbAartList.get(0), ean128Model);
-                        });
-                    } else {
-                        BarcodeManager.enable();
-                        progressDialog.dismiss();
-
-                        showPleaseOpenULDialog();
-                    }
-
-                } else {
-                    this.searchArtInList(mtbAartList.get(0), ean128Model);
-
-                    BarcodeManager.enable();
-                    progressDialog.dismiss();
-                }
-
-            } else {
-                BarcodeManager.enable();
-                progressDialog.dismiss();
-
-                DialogSimpleMessageHelper.makeWarningDialog(mActivity,
-                        new SpannableString(mActivity.getResources().getText(R.string.no_result_from_barcode)),
-                        null, null)
-                        .show();
-            }
-
-        }, ex -> {
-            BarcodeManager.enable();
-            UtilityExceptions.defaultException(mActivity, ex, progressDialog);
-        });
-    }
-
-    private void searchArtInList(MtbAart mtbAart, Ean128Model ean128Model) {
-        removeListFilter();
-
-        List<OrdineAccettazioneDTO.Riga> foundRowsList = Stream.of(groupedOrdini)
-                .filter(x -> x.getMtbAart().getCodMart().equalsIgnoreCase(mtbAart.getCodMart()) &&
-                        (x.isHidden() != null && !x.isHidden()) && (x.isTempHidden() != null && !x.isTempHidden()))
-                .toList();
-
-        if (foundRowsList.size() == 0) {
-            showNoArtFoundDialog();
-        } else if (foundRowsList.size() == 1) {
-            onOrdineRowDispatch(foundRowsList.get(0), ean128Model);
-        } else {
-            for (int i = 0; i < groupedOrdini.size(); i++) {
-                if (!foundRowsList.contains(groupedOrdini.get(i))) {
-                    groupedOrdini.get(i).setTempHidden(true);
-                }
-            }
-
-            applyFilter("COD: " + mtbAart.getCodMart());
-            refreshOrderBy(false);
-        }
-    }
-
-
-    private void showNoArtFoundDialog() {
-        DialogSimpleMessageHelper.makeWarningDialog(mActivity,
-                new SpannableString(mActivity.getResources().getText(R.string.no_result_from_barcode)),
-                null, null).show();
-    }
-
-    private void showPleaseOpenULDialog() {
-        DialogSimpleMessageHelper.makeWarningDialog(mActivity,
-                new SpannableString(mActivity.getResources().getText(R.string.please_open_lu)),
-                null, null).show();
-    }
-
-    public void showOrderDialog() {
-
-        AlertDialog dialog = new AlertDialog.Builder(mActivity)
-                .setTitle(mActivity.getText(R.string.action_orderBy))
-                .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, currentOrderBy.getVal(), (dialog12, which) -> {
-                    currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
-                    SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione = which;
-                })
-                .setPositiveButton("Ok", (dialog1, which) -> refreshOrderBy(false))
-                .create();
-        dialog.show();
-    }
-
-
-    public void createNewUL() {
-        this.createNewUL(null, null, null, false, null);
-    }
-
-    public void createNewUL(Integer customNumCollo, String customSerCollo, Dialog progress, boolean disablePrint, Runnable onComplete) {
-
-        mActivity.bindings.accettazioneOrdineInevasoFab.close(true);
-
-        if (progress == null) {
-            progress = UtilityProgress.createDefaultProgressDialog(mActivity);
-        }
-
-        Dialog finalProgress = progress;
-        NoteAggiuntiveLUDialog.make(mActivity, noteString -> {
-            //Add loading dialog here
-            finalProgress.show();
-
-            GestSetupRESTConsumer.getValue("PICKING", "SETUP", "DEFAULT_POSIZIONE_COLLI_ACCETTAZIONE", defaultPosAccettazioneDTO -> {
-
-                String defaultPosAccettazione = "";
-                if (defaultPosAccettazioneDTO != null && !UtilityString.isNullOrEmpty(defaultPosAccettazioneDTO.value))
-                    defaultPosAccettazione = defaultPosAccettazioneDTO.value;
-
-                MtbColt mtbColt = new MtbColt();
-                mtbColt
-                        .initDefaultFields()
-                        .setGestione(defaultGestioneOfUL)
-                        .setAnnotazioni(noteString)
-                        .setPosizione(defaultPosAccettazione)
-                        .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
-
-                if (customNumCollo != null) {
-                    mtbColt.setNumCollo(customNumCollo);
-                }
-
-                if (!UtilityString.isNullOrEmpty(customSerCollo)) {
-                    mtbColt.setSerCollo(customSerCollo);
-                }
-
-                List<String> codAnags =
-                        Stream.of(mOrders)
-                                .map(OrdineAccettazioneDTO::getCodAnag)
-                                .distinct()
-                                .toList();
-
-                if (codAnags != null && codAnags.size() == 1) {
-                    mtbColt.setCodAnag(codAnags.get(0));
-                }
-
-                List<String> rifOrds =
-                        Stream.of(mOrders)
-                                .map(OrdineAccettazioneDTO::getRifOrd)
-                                .distinct()
-                                .toList();
-
-                if (rifOrds != null && rifOrds.size() == 1) {
-                    mtbColt.setRifOrd(rifOrds.get(0));
-                }
-
-                List<String> numDataOrds =
-                        Stream.of(mOrders)
-                                .map(value -> value.getNumero() + value.getData())
-                                .distinct()
-                                .toList();
-
-                if (numDataOrds != null && numDataOrds.size() == 1) {
-                    mtbColt.setNumOrd(mOrders.get(0).getNumero());
-                    mtbColt.setDataOrd(mOrders.get(0).getData());
-
-                    try {
-                        mtbColt.generaFiltroOrdine();
-                    } catch (Exception ex) {
-                        DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString(ex.getMessage()), null, null).show();
-                        return;
-                    }
-                }
-
-
-                ColliMagazzinoRESTConsumer.saveColloStatic(mtbColt, new ISimpleOperationCallback<MtbColt>() {
-                    @Override
-                    public void onSuccess(MtbColt value) {
-
-                        value
-                                .setDisablePrint(disablePrint)
-                                .setMtbColr(new ObservableArrayList<>());
-
-                        value.setMtbCols(null);
-
-                        setULToCurrentContext(value);
-
-                        finalProgress.dismiss();
-
-                        FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
-
-                        if (onComplete != null) onComplete.run();
-
-                    }
-
-                    @Override
-                    public void onFailed(Exception ex) {
-                        UtilityExceptions.defaultException(mActivity, ex, finalProgress);
-                    }
-                });
-            }, ex -> UtilityExceptions.defaultException(mActivity, ex, finalProgress));
-
-        }, finalProgress::dismiss).show();
-
-
-    }
-
-
-    private void setULToCurrentContext(MtbColt mtbColt) {
-        isFabVisible.set(false);
-        mArticoliInColloBottomSheetViewModel.mtbColt.set(mtbColt);
-    }
-
-    //Al click di "Mostra UL già create"
-    public void showCreatedUL() {
-
-        final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
-
-
-        mActivity.bindings.accettazioneOrdineInevasoFab.close(false);
-
-        try {
-            OrdineAccettazioneInevasoRESTConsumerService.getBancaliGiaRegistrati(mOrders, mtbColts -> {
-
-                progress.dismiss();
-
-                mActivity.startListaBancaliRegistratiActivity((ArrayList<MtbColt>) mtbColts);
-
-            }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress));
-        } catch (Exception ex) {
-            UtilityExceptions.defaultException(mActivity, ex, progress);
-        }
-
-    }
-
-    @Override
-    public void onColloClosed(Runnable onComplete, boolean shouldPrint) {
-        if (thereIsAnOpenedUL()) {
-
-            final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
-            progress.show();
-
-            if (thereIsAnyRowInUL()) {
-                ColliMagazzinoRESTConsumer.updateDataFineStatic(getColloRef(), () -> {
-                    if (shouldPrint) printCollo(progress, onComplete);
-                    else {
-                        postCloseOperations(onComplete);
-                        progress.dismiss();
-                    }
-                }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress));
-            } else {
-                deleteCollo(progress, onComplete);
-            }
-
-        } else {
-            if (onComplete != null) onComplete.run();
-        }
-
-    }
-
-    private void printCollo(Dialog progress, Runnable onComplete) {
-        MtbColt currentMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get();
-
-        if (currentMtbColt.getDisablePrint()) {
-            postCloseOperations(onComplete);
-            progress.dismiss();
-            return;
-        }
-
-        PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, value -> {
-
-            if (value.size() > 0) {
-                try {
-
-
-                    ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO, reportName -> {
-
-                                PrinterRESTConsumer.printColloStatic(
-                                        value.get(0),
-                                        currentMtbColt,
-                                        1, reportName, () -> {
-
-                                            postCloseOperations(onComplete);
-                                            progress.dismiss();
-
-                                        }, ex -> {
-
-                                            progress.dismiss();
-                                            String errorMessage = ex.getMessage();
-                                            DialogSimpleMessageHelper.makeErrorDialog(
-                                                    mActivity,
-                                                    new SpannableString(errorMessage),
-                                                    null,
-                                                    null,
-                                                    R.string.button_ignore_print,
-                                                    () -> postCloseOperations(onComplete)).show();
-                                        });
-
-                            }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress)
-                    );
-                } catch (Exception ex) {
-                    UtilityExceptions.defaultException(mActivity, ex, progress);
-                }
-            } else {
-                resetUL();
-                isFabVisible.set(true);
-
-                progress.dismiss();
-                String errorMessage = "Nessuna stampante configurata";
-                DialogSimpleMessageHelper.makeWarningDialog(mActivity, new SpannableString(errorMessage), null, null).show();
-            }
-        }, ex -> {
-            UtilityExceptions.defaultException(mActivity, ex, progress);
-        });
-    }
-
-
-    private void deleteCollo(Dialog progress, Runnable onComplete) {
-
-        ColliMagazzinoRESTConsumer.deleteColloStatic(getColloRef(), () -> {
-            mArticoliInColloBottomSheetViewModel.mtbColt.set(null);
-
-            isFabVisible.set(true);
-
-            progress.dismiss();
-            if (onComplete != null) onComplete.run();
-        }, ex -> UtilityExceptions.defaultException(mActivity, ex, progress));
-    }
-
-
-    public boolean thereIsAnOpenedUL() {
-        return getColloRef() != null;
-    }
-
-    public boolean thereIsAnyRowInUL() {
-        return getColloRef() != null &&
-                getColloRef().getMtbColr() != null &&
-                getColloRef().getMtbColr().size() > 0;
-    }
-
-
-    private void postCloseOperations(Runnable onComplete) {
-
-        MtbColt mtbColt = (MtbColt) getColloRef().clone();
-
-        resetUL();
-
-        isFabVisible.set(true);
-
-        if (mtbColt != null && mtbColt.getMtbColr() != null) {
-            for (int i = 0; i < mtbColt.getMtbColr().size(); i++) {
-
-                MtbColr currentRow = mtbColt.getMtbColr().get(i);
-
-                if (currentRow.getRigaOrd() != null) {
-
-                    for (int k = 0; k < this.groupedOrdini.size(); k++) {
-
-                        OrdineAccettazioneDTO.Riga x = this.groupedOrdini.get(k);
-
-                        if (x.getQtaDaEvadere().floatValue() > 0 &&
-                                x.getMtbAart().getCodMart().equalsIgnoreCase(currentRow.getCodMart()) &&
-                                x.getCodJcom().equalsIgnoreCase(currentRow.getCodJcom()) &&
-                                x.getRigaOrd() == currentRow.getRigaOrd() &&
-                                x.getDataOrdD().equals(currentRow.getDataOrdD()) &&
-                                x.getNumOrd() == currentRow.getNumOrd()) {
-
-                            x.setQtaRiservate(x.getQtaRiservate().add(currentRow.getQtaCol()));
-                        }
-
-
-                    }
-
-//                    Stream.of(this.groupedOrdini)
-//                            .filter(x ->
-//                                    x.getQtaDaEvadere().floatValue() > 0 &&
-//                                            x.getMtbAart().getCodMart().equalsIgnoreCase(currentRow.getCodMart()) &&
-//                                            x.getCodJcom().equalsIgnoreCase(currentRow.getCodJcom()) &&
-//                                            x.getRigaOrd() == currentRow.getRigaOrd() &&
-//                                            x.getDataOrdD().equals(currentRow.getDataOrdD()) &&
-//                                            x.getNumOrd() == currentRow.getNumOrd()
-//                            )
-//                            .forEach(x -> {
-//                                x.setQtaRiservate(x.getQtaRiservate().add(currentRow.getQtaCol()));
-//                            });
-
-                }
-
-            }
-        }
-
-        removeListFilter();
-        refreshOrderBy(true);
-
-        if (onComplete != null) onComplete.run();
-
-    }
-
-    @Override
-    public void onOrdineRowDispatch(final OrdineAccettazioneDTO.Riga item, Ean128Model ean128Model) {
-        if (getColloRef() != null) {
-
-            List<MtbColr> currentMtbColrs = getColloRef().getMtbColr();
-
-            List<MtbColr> filteredMtbColrs = Stream.of(currentMtbColrs).filter(
-                    x -> x.getCodMart().equalsIgnoreCase(item.mtbAart.getCodMart()) &&
-                            x.getNumOrd() == item.numOrd &&
-                            (x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.codJcom)) &&
-                            x.getRigaOrd() == item.rigaOrd).toList();
-
-            float qtaEvasaInMtbColr = 0;
-            for (MtbColr mtbColr : filteredMtbColrs) {
-                qtaEvasaInMtbColr += mtbColr.getQtaCol().floatValue();
-            }
-
-            float qtaEvasa = item.qtaRiservate + qtaEvasaInMtbColr;
-
-
-            BigDecimal qtaDaEvadere;
-
-            BigDecimal totalQtaDaEvadere = item.getQtaOrd().subtract(new BigDecimal(qtaEvasa)).subtract(item.getQtaEvasa());
-
-            BigDecimal qtaColliPedana = item.mtbAart.getColliPedana().multiply(item.mtbAart.getQtaCnf());
-
-            if (qtaColliPedana.floatValue() > 0 && qtaColliPedana.compareTo(totalQtaDaEvadere) <= 0) {
-                qtaDaEvadere = qtaColliPedana;
-            } else {
-                qtaDaEvadere = totalQtaDaEvadere;
-            }
-
-            DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO()
-                    .setBatchLot(item.getPartitaMag())
-                    .setCodArtFor(item.getCodArtFor())
-                    .setMtbAart(item.getMtbAart())
-                    .setQtaOrd(item.getQtaOrd())
-                    .setQtaDaEvadere(qtaDaEvadere)
-                    .setQtaEvasa(new BigDecimal(qtaEvasa))
-                    .setCanPartitaMagBeChanged(true);
-
-            if (ean128Model != null) {
-                if (!UtilityString.isNullOrEmpty(ean128Model.BatchLot)) {
-                    dto.setBatchLot(ean128Model.BatchLot);
-                }
-
-                try {
-                    if (!UtilityString.isNullOrEmpty(ean128Model.BestBefore)) {
-                        dto.setDataScad(UtilityDate.recognizeDate(ean128Model.BestBefore));
-                    } else if (!UtilityString.isNullOrEmpty(ean128Model.Expiry)) {
-                        dto.setDataScad(UtilityDate.recognizeDate(ean128Model.Expiry));
-                    }
-
-                } catch (Exception e) {
-                    UtilityLogger.errorMe(e);
-                }
-
-
-                if (ean128Model.Count != null && ean128Model.Count > 0) {
-                    //if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
-                    dto.setQtaTot(new BigDecimal(ean128Model.Count));
-
-                    if (!item.getMtbAart().isFlagQtaCnfFissaBoolean()) {
-                        dto.setQtaCnf(new BigDecimal(ean128Model.Count));
-                    }
-                    //} else {
-                    //    dto.setQtaTot(new BigDecimal(ean128Model.Count));
-                    //}
-                }
-
-                if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0) {
-                    dto.setQtaTot(new BigDecimal(ean128Model.NetWeightKg));
-                }
-
-                if (dto.getQtaTot() != null && dto.getQtaTot().floatValue() > 0 && dto.getNumCnf() != null && dto.getNumCnf() > 0) {
-                    dto.setQtaCnf(dto.getQtaTot().divide(new BigDecimal(dto.getNumCnf())));
-                }
-
-                dto.setCanPartitaMagBeChanged(false);
-                dto.setCanDataScadBeChanged(false);
-                dto.setShouldAskDataScad(true);
-            }
-
-            DialogInputQuantity.makeBase(mActivity, dto, true, (quantityDTO, closeLU) -> onOrdineRowDispatched(item, quantityDTO, closeLU), null).show();
-        }
-    }
-
-    private void onOrdineRowDispatched(OrdineAccettazioneDTO.Riga item, QuantityDTO quantityDTO, boolean closeLU) {
-        final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
-
-        String gestioneRif = item.getGestioneOrdEnum() == GestioneEnum.PRODUZIONE ? "L" : item.getGestioneOrd();
-
-
-        final MtbColr mtbColr = new MtbColr()
-                .setCodMart(item.getMtbAart().getCodMart())
-                .setPartitaMag(quantityDTO.batchLot.get())
-                .setDataScadPartita(quantityDTO.expireDate)
-                .setQtaCol(quantityDTO.qtaTot.getBigDecimal())
-                .setDescrizione(item.getDescrizioneEstesa())
-                .setNumOrd(item.getNumOrd())
-                .setDataOrd(item.getDataOrdD())
-                .setGestioneRif(gestioneRif)
-                .setCodJcom(item.getCodJcom())
-                .setRigaOrd(item.getRigaOrd());
-
-        if (!item.getMtbAart().isFlagQtaCnfFissaBoolean()) {
-            mtbColr.setQtaCnf(quantityDTO.qtaCnf.getBigDecimal());
-        }
-
-        mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
-
-        MtbColt cloneMtbColt = (MtbColt) getColloRef().clone();
-        cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
-
-        cloneMtbColt.setMtbColr(new ObservableArrayList<>());
-        cloneMtbColt.getMtbColr().add(mtbColr);
-
-        ColliMagazzinoRESTConsumer.saveColloStatic(cloneMtbColt, new ISimpleOperationCallback<MtbColt>() {
-            @Override
-            public void onSuccess(MtbColt value) {
-
-                mtbColr
-                        .setDataCollo(value.getDataColloS())
-                        .setNumCollo(value.getNumCollo())
-                        .setGestione(value.getGestione())
-                        .setSerCollo(value.getSerCollo())
-                        .setRiga(value.getMtbColr().get(0).getRiga())
-                        .setUntMis(item.getMtbAart().getUntMis())
-                        .setMtbAart(item.getMtbAart());
-
-                //item.setQtaRiservate(item.getQtaRiservate().add(mtbColr.getQtaCol()));
-
-                getColloRef().getMtbColr().add(mtbColr);
-                refreshOrderBy(false);
-
-                FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
-                progress.dismiss();
-
-                if (closeLU) onColloClosed(null, true);
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                UtilityExceptions.defaultException(mActivity, ex, progress);
-            }
-        });
-
-    }
-
-
-    private MtbColt getColloRef() {
-        return mArticoliInColloBottomSheetViewModel.mtbColt.get();
-    }
-
-    private void resetUL() {
-        mArticoliInColloBottomSheetViewModel.mtbColt.set(null);
-    }
-
-    private void onRowEdited(MtbColr oldValue, MtbColr newValue) {
-
-//        if (getColloRef() != null) {
-//
-//            Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
-//
-//            Optional<MtbColr> optionalMtbColrToEditOfAccettazione = Stream.of(getColloRef().getMtbColr())
-//                    .filter(x -> UtilityBigDecimal.equalsTo(x.getQtaCol(), oldValue.getQtaCol()) &&
-//                            UtilityString.equalsIgnoreCase(x.getCodMart(), oldValue.getCodMart()) &&
-//                            UtilityString.equalsIgnoreCase(x.getPartitaMag(), oldValue.getPartitaMag()) &&
-//                            UtilityString.equalsIgnoreCase(x.getCodJcom(), oldValue.getCodJcom()))
-//                    .findFirst();
-//
-//            if(optionalMtbColrToEditOfAccettazione.isPresent()) {
-//                MtbColr mtbColrToEditOfAccettazione  = optionalMtbColrToEditOfAccettazione.get();
-//
-//                mtbColrToEditOfAccettazione
-//                        .setQtaCol(newValue.getQtaCol());
-//
-//                ColliMagazzinoRESTConsumer.updateRiga(mtbColrToEditOfAccettazione, () -> {
-//                    progress.dismiss();
-//                    this.refreshOrderBy(false);
-//                }, ex -> {
-//                    UtilityExceptions.defaultException(mActivity, ex, progress);
-//                    this.refreshOrderBy(false);
-//                });
-//
-//            }
-//
-//        } else {
-//
-        this.refreshOrderBy(false);
-//        }
-
-    }
-
-    private void onRowDeleted(MtbColr deletedValue) {
-
-//        if(getColloRef() != null) {
-
-//            Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
-
-//            MtbColr mtbColrToDeleteOfAccettazione = Stream.of(getColloRef().getMtbColr())
-//                    .filter(x -> x.getQtaCol().compareTo(deletedValue.getQtaCol()) == 0 &&
-//                            x.getCodMart().equalsIgnoreCase(deletedValue.getCodMart()) &&
-//                            x.getPartitaMag().equalsIgnoreCase(deletedValue.getPartitaMag()) &&
-//                            x.getCodJcom().equalsIgnoreCase(deletedValue.getCodJcom()))
-//                    .findFirst()
-//                    .get();
-
-//            ColliMagazzinoRESTConsumer.deleteRiga(mtbColrToDeleteOfAccettazione, () -> {
-//                getColloRef().getMtbColr().remove(mtbColrToDeleteOfAccettazione);
-//
-//                progress.dismiss();
-//                this.refreshOrderBy(false);
-//            }, ex -> {
-//                UtilityExceptions.defaultException(mActivity, ex, progress);
-//                this.refreshOrderBy(false);
-//            });
-
-//        } else {
-
-        this.refreshOrderBy(false);
-//        }
-    }
-
-}

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

@@ -0,0 +1,629 @@
+package it.integry.integrywmsnative.gest.accettazione_picking;
+
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.annimon.stream.Stream;
+import com.tfb.fbtoast.FBToast;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.CommonConst;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.data_cache.DataCache;
+import it.integry.integrywmsnative.core.di.BindableBoolean;
+import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.report.ReportManager;
+import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.core.utility.UtilityToast;
+import it.integry.integrywmsnative.databinding.ActivityAccettazioneOrdineInevasoBinding;
+import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
+import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
+import it.integry.integrywmsnative.gest.accettazione_picking.core.AccettazioneListAdapter;
+import it.integry.integrywmsnative.gest.accettazione_picking.core.AccettazioneListModel;
+import it.integry.integrywmsnative.gest.accettazione_picking.dto.AccettazioneOrdineInevasoOrderBy;
+import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.accettazione_picking.rest.RecoverMtbColt;
+import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
+import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
+import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
+import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
+
+public class AccettazionePickingActivity extends BaseActivity implements AccettazionePickingViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
+
+    private ActivityAccettazioneOrdineInevasoBinding mBindings;
+
+    @Inject
+    AccettazionePickingViewModel mViewModel;
+
+    private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
+
+    private ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
+
+
+    public BindableBoolean noItemsToPick = new BindableBoolean(false);
+    public BindableBoolean noLUPresent = new BindableBoolean(true);
+    public BindableBoolean bottomSheetEnabled = new BindableBoolean(false);
+
+    private int barcodeScannerIstanceID = -1;
+
+    private List<OrdineAccettazioneInevasoDTO> mOrders;
+    private List<SitArtOrdDTO> mSitArts;
+
+    private boolean mShouldCloseActivity;
+    private AccettazioneOrdineInevasoOrderBy.Enum mCurrentOrderBy;
+
+    private final int PICK_UL_REQUEST = 1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mOrders = DataCache.retrieveItem(getIntent().getStringExtra("keyOrders"));
+        mSitArts = DataCache.retrieveItem(getIntent().getStringExtra("keySitArts"));
+
+        mBindings = DataBindingUtil.setContentView(this, R.layout.activity_accettazione_ordine_inevaso);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setAccettazioneView(this);
+
+        MainApplication.appComponent
+                .accettazionePickingComponent()
+                .create()
+                .inject(this);
+
+        setSupportActionBar(mBindings.toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        mBindings.bottomSheetLuContent.init(mBindings.bottomSheetLuContent, null);
+        mBottomSheetFragmentLUContentViewModel = mBindings.bottomSheetLuContent.getViewModelInstance();
+        mBindings.bottomSheetLuContent.setListener(this);
+        mBottomSheetFragmentLUContentViewModel.setListener(this);
+
+        setSupportActionBar(this.mBindings.toolbar);
+
+        this.initVars();
+        this.initBarcodeReader();
+        this.initRecyclerView();
+
+
+        String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+
+        mViewModel.setListeners(this);
+        mViewModel.init(mOrders, mSitArts, codMdep);
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (this.mBindings.bottomSheetLuContent.isExpanded()) {
+            this.mBindings.bottomSheetLuContent.collapse();
+        } else if (!noLUPresent.get()) {
+            this.mShouldCloseActivity = true;
+            BarcodeManager.removeCallback(barcodeScannerIstanceID);
+            this.mViewModel.closeLU();
+        } else {
+            BarcodeManager.removeCallback(barcodeScannerIstanceID);
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.activity_accettazione_ordine_inevaso, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle item selection
+        switch (item.getItemId()) {
+            case R.id.action_filter:
+                showOrderDialog();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void initVars() {
+        this.noLUPresent.addOnPropertyChangedCallback(() -> {
+            this.bottomSheetEnabled.set(!this.noLUPresent.get());
+        });
+
+        mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(SettingsManager.i().getUserSession().getDefaultOrdinamentoPickingAccettazione());
+    }
+
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessfull(onScanSuccessful)
+                .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
+    }
+
+    private void initRecyclerView() {
+        this.mViewModel.getPickingList().observe(this, updatedData -> {
+            refreshList();
+        });
+
+        AccettazioneListAdapter accettazioneListAdapter = new AccettazioneListAdapter(this, mAccettazioneMutableData);
+        this.mBindings.accettazionePickingList.setAdapter(accettazioneListAdapter);
+        this.mBindings.accettazionePickingList.setLayoutManager(new LinearLayoutManager(this));
+
+        accettazioneListAdapter.setOnItemClicked(clickedItem -> {
+            this.mViewModel.dispatchOrdineRow(clickedItem);
+        });
+    }
+
+    private void refreshList() {
+        this.mAccettazioneMutableData.clear();
+        this.mAccettazioneMutableData.addAll(convertDataModelToListModel(this.mViewModel.getPickingList().getValue()));
+        this.noItemsToPick.set(!isThereAnyItemToPick(this.mViewModel.getPickingList().getValue()));
+    }
+
+    private List<AccettazioneListModel> convertDataModelToListModel(List<PickingObjectDTO> dataList) {
+        List<PickingObjectDTO> tmpList = Stream.of(dataList)
+                .filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO))
+                .toList();
+
+        List<AccettazioneListModel> sortedList = null;
+
+        switch (mCurrentOrderBy) {
+            case COD_ART_FOR:
+                sortedList = convertDataModelToListModel__CodArtForn(tmpList);
+                break;
+            case DESCR_ART:
+                sortedList = convertDataModelToListModel__DescrArt(tmpList);
+                break;
+            case RAG_SOC_COM:
+                sortedList = convertDataModelToListModel__RagSocCom(tmpList);
+                break;
+        }
+
+        return sortedList;
+    }
+
+    private List<AccettazioneListModel> convertDataModelToListModel__CodArtForn(List<PickingObjectDTO> dataList) {
+        ArrayList<AccettazioneListModel> list = new ArrayList<>();
+        Stream.of(dataList)
+                .sortBy(x -> x.getSitArtOrdDTO().getCodArtFor() + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()))
+                .forEach(x -> {
+                    AccettazioneListModel accettazioneListModel = new AccettazioneListModel();
+                    accettazioneListModel.setActive(true);
+
+                    accettazioneListModel.setGroupTitle(x.getSitArtOrdDTO().getCodArtFor() + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
+
+                    accettazioneListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+                    accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+
+                    accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                        if(x.getWithdrawMtbColrs().size() > 0) {
+                            numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                    .map(MtbColr::getNumCnf)
+                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        }
+
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                    } else {
+                        BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                        if(x.getWithdrawMtbColrs().size() > 0) {
+                            qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                    .map(MtbColr::getQtaCol)
+                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        }
+
+                        accettazioneListModel.setQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+                    }
+
+                    accettazioneListModel.setOriginalModel(x);
+
+                    list.add(accettazioneListModel);
+                });
+
+        return list;
+    }
+
+    private List<AccettazioneListModel> convertDataModelToListModel__DescrArt(List<PickingObjectDTO> dataList) {
+        ArrayList<AccettazioneListModel> list = new ArrayList<>();
+        Stream.of(dataList)
+                .sortBy(x -> x.getMtbAart().getDescrizioneEstesa())
+                .forEach(x -> {
+                    AccettazioneListModel accettazioneListModel = new AccettazioneListModel();
+                    accettazioneListModel.setActive(true);
+
+                    accettazioneListModel.setGroupTitle(x.getSitArtOrdDTO().getCodArtFor() + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
+
+                    accettazioneListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+                    accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+
+                    accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                        if(x.getWithdrawMtbColrs().size() > 0) {
+                            numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                    .map(MtbColr::getNumCnf)
+                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        }
+
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfOrd());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                    } else {
+                        BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                        if(x.getWithdrawMtbColrs().size() > 0) {
+                            qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                    .map(MtbColr::getQtaCol)
+                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        }
+
+                        accettazioneListModel.setQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+                    }
+
+                    if (x.getMtbAart() != null)
+                        accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+
+                    accettazioneListModel.setOriginalModel(x);
+
+                    list.add(accettazioneListModel);
+                });
+
+        return list;
+    }
+
+    private List<AccettazioneListModel> convertDataModelToListModel__RagSocCom(List<PickingObjectDTO> dataList) {
+        ArrayList<AccettazioneListModel> list = new ArrayList<>();
+
+        Stream.of(dataList)
+                .filter(x -> !UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) && !x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG))
+                .sortBy(x -> x.getSitArtOrdDTO().getDescrizioneCommessa())
+                .forEach(x -> {
+                    AccettazioneListModel accettazioneListModel = new AccettazioneListModel();
+                    accettazioneListModel.setActive(true);
+
+                    accettazioneListModel.setGroupTitle(x.getSitArtOrdDTO().getCodJcom() + (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) ? " - " + x.getSitArtOrdDTO().getDescrizioneCommessa() : ""));
+
+                    accettazioneListModel.setBadge1(x.getSitArtOrdDTO().getCodArtFor());
+                    accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+
+
+                    if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+                        BigDecimal numCnfEvasa = BigDecimal.ZERO;
+
+                        if(x.getWithdrawMtbColrs().size() > 0) {
+                            numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                    .map(MtbColr::getNumCnf)
+                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        }
+
+                        accettazioneListModel.setQtaEvasa(numCnfEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfOrd());
+                        accettazioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+                    } else {
+                        BigDecimal qtaEvasa = BigDecimal.ZERO;
+
+                        if(x.getWithdrawMtbColrs().size() > 0) {
+                            qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                    .map(MtbColr::getQtaCol)
+                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        }
+
+                        accettazioneListModel.setQtaEvasa(qtaEvasa);
+                        accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+                        if (x.getMtbAart() != null)
+                            accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+                    }
+
+                    if (x.getMtbAart() != null) {
+                        accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
+                    }
+
+                    accettazioneListModel.setOriginalModel(x);
+
+                    list.add(accettazioneListModel);
+                });
+
+        Stream.of(dataList)
+                .filter(x -> UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) || x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG))
+                .forEach(x -> {
+                    AccettazioneListModel accettazioneListModel = new AccettazioneListModel();
+                    accettazioneListModel.setActive(true);
+
+                    accettazioneListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+
+                    accettazioneListModel.setBadge1(x.getSitArtOrdDTO().getCodArtFor());
+                    accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+
+
+                    accettazioneListModel.setQtaEvasa(BigDecimal.ZERO);
+                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
+
+                    if (x.getMtbAart() != null) {
+                        accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
+                        accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
+                    }
+
+                    accettazioneListModel.setOriginalModel(x);
+
+                    list.add(accettazioneListModel);
+                });
+
+        return list;
+    }
+
+    private boolean isThereAnyItemToPick(List<PickingObjectDTO> dataList) {
+        return Stream.of(dataList)
+                .anyMatch(x -> !x.isHidden());
+    }
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        BarcodeManager.disable();
+
+        this.openProgress();
+
+        this.mViewModel.processBarcodeDTO(data, () -> {
+            BarcodeManager.enable();
+            this.closeProgress();
+        });
+    };
+
+    public void removeListFilter() {
+        this.mViewModel.resetMatchedRows();
+    }
+
+
+    public void createNewLU() {
+        this.mBindings.accettazioneOrdineInevasoFab.close(true);
+
+        this.openProgress();
+
+        this.mViewModel.createNewLU(null, null, false, () -> {
+            this.closeProgress();
+        });
+    }
+
+    public void showCreatedUL() {
+        this.mBindings.accettazioneOrdineInevasoFab.close(true);
+
+        this.mViewModel.retrieveExistentLU(this::startListaBancaliRegistratiActivity);
+    }
+
+    private void showOrderDialog() {
+
+        AlertDialog dialog = new AlertDialog.Builder(this)
+                .setTitle(this.getText(R.string.action_orderBy))
+                .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(), (dialog12, which) -> {
+                    mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
+                    SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which);
+                })
+                .setPositiveButton(getText(R.string.ok), (dialog1, which) -> this.refreshList())
+                .create();
+        dialog.show();
+    }
+
+
+    public void startListaBancaliRegistratiActivity(ArrayList<RecoverMtbColt> mtbColts) {
+
+        Intent myIntent = ListaBancaliActivity.createIntent(this,
+                Stream.of(mtbColts).map(x -> (MtbColt)x).toList(),
+                input -> ((RecoverMtbColt) input).isFlagCanBeRecovered(),
+                PrinterRESTConsumer.Type.SECONDARIA,
+                ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
+        this.startActivityForResult(myIntent, PICK_UL_REQUEST);
+    }
+
+    @Override
+    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();
+    }
+
+    @Override
+    public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
+    }
+
+    @Override
+    public void onLUPrintError(Exception ex, Runnable onComplete) {
+        this.closeProgress();
+        DialogSimpleMessageHelper.makeErrorDialog(
+                this,
+                new SpannableString(ex.getMessage()),
+                null,
+                null,
+                R.string.button_ignore_print,
+                onComplete).show();
+    }
+
+    @Override
+    public void onLoadingStarted() {
+        this.openProgress();
+    }
+
+    @Override
+    public void onLoadingEnded() {
+        this.closeProgress();
+    }
+
+    @Override
+    public void onMtbColrEdit(MtbColr mtbColr) {
+        this.mViewModel.dispatchRowEdit(mtbColr);
+    }
+
+    @Override
+    public void onMtbColrDelete(MtbColr mtbColr) {
+        this.mViewModel.deleteRow(mtbColr);
+    }
+
+    @Override
+    public void onBottomSheetLUClose() {
+        this.mViewModel.closeLU();
+    }
+
+    @Override
+    public void onNoteAggiuntiveRequest(RunnableArgs<String> onComplete) {
+        NoteAggiuntiveLUDialog.make(this, onComplete::run, () -> onComplete.run(null)).show();
+    }
+
+    @Override
+    public void onError(Exception ex) {
+        this.closeProgress();
+
+        if(ex instanceof InvalidPesoKGException) {
+            UtilityToast.showToast(ex.getMessage());
+        } else {
+            UtilityExceptions.defaultException(this, ex, mCurrentProgress);
+        }
+
+        BarcodeManager.enable();
+    }
+
+    @Override
+    public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, Date dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+        DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
+                .setMtbAart(mtbAart)
+                .setInitialNumCnf(initialNumCnf)
+                .setInitialQtaCnf(initialQtaCnf)
+                .setInitialQtaTot(initialQtaTot)
+                .setTotalQtaOrd(totalQtaOrd)
+                .setTotalNumCnfOrd(totalNumCnfOrd)
+                .setQtaCnfOrd(qtaCnfOrd)
+                .setTotalQtaToBeTaken(totalQtaToBeTaken)
+                .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken)
+                .setQtaCnfToBeTaken(qtaCnfToBeTaken)
+                .setTotalQtaAvailable(totalQtaAvailable)
+                .setTotalNumCnfAvailable(totalNumCnfAvailable)
+                .setQtaCnfAvailable(qtaCnfAvailable)
+                .setPartitaMag(partitaMag)
+                .setDataScad(dataScad)
+                .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
+                .setCanLUBeClosed(true)
+                .setCanOverflowOrderQuantity(canOverflowQuantity);
+
+        DialogInputQuantityV2
+                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                    PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+                            .setNumCnf(resultDTO.getNumCnf())
+                            .setQtaCnf(resultDTO.getQtaCnf())
+                            .setQtaTot(resultDTO.getQtaTot())
+                            .setPartitaMag(resultDTO.getPartitaMag())
+                            .setDataScad(resultDTO.getDataScad());
+                    onComplete.run(pickedQuantityDTO, shouldCloseLU);
+                }, () -> {
+                    this.mViewModel.resetMatchedRows();
+                })
+                .show(getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onRowSaved() {
+        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+    }
+
+    @Override
+    public void onFilterApplied(String newValue) {
+        this.mBindings.filteredArtsInListExpandableLayout.expand(true);
+        this.mBindings.descriptionFilterText.setText(!UtilityString.isNullOrEmpty(newValue) ? newValue : "");
+    }
+
+    @Override
+    public void onFilterRemoved() {
+        mBindings.filteredArtsInListExpandableLayout.collapse(true);
+    }
+
+    @Override
+    public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
+        String text = getResources().getString(R.string.alert_delete_mtb_colr);
+        DialogSimpleMessageHelper.makeWarningDialog(this,
+                new SpannableString(text),
+                null,
+                () -> onComplete.run(true),
+                () -> onComplete.run(false)
+        ).show();
+    }
+
+    @Override
+    public void onLUOpened(MtbColt mtbColt) {
+        noLUPresent.set(false);
+        FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+
+        this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt);
+    }
+
+    @Override
+    public void onLUClosed() {
+        noLUPresent.set(true);
+        this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
+
+        if (this.mShouldCloseActivity) super.onBackPressed();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        // Check which request we're responding to
+        if (requestCode == PICK_UL_REQUEST) {
+
+            // Make sure the request was successful
+            if (resultCode == RESULT_OK) {
+                MtbColt recoveredMtbColt = DataCache.retrieveItem(data.getStringExtra("key"));
+                this.mViewModel.recoverLU(recoveredMtbColt);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.gest.accettazione_picking;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface AccettazionePickingComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        AccettazionePickingComponent create();
+    }
+
+    void inject(AccettazionePickingActivity accettazionePickingActivity);
+
+}

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

@@ -0,0 +1,32 @@
+package it.integry.integrywmsnative.gest.accettazione_picking;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.gest.accettazione_picking.rest.AccettazionePickingRESTConsumer;
+import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
+
+@Module(subcomponents = AccettazionePickingComponent.class)
+public class AccettazionePickingModule {
+
+    @Provides
+    AccettazionePickingRESTConsumer providesAccettazionePickingRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new AccettazionePickingRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    BottomSheetFragmentLUContentViewModel providesBottomSheetFragmentLUContentViewModel() {
+        return new BottomSheetFragmentLUContentViewModel();
+    }
+
+    @Provides
+    AccettazionePickingViewModel providesAccettazioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, AccettazionePickingRESTConsumer accettazionePickingRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
+        return new AccettazionePickingViewModel(articoloRESTConsumer, barcodeRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, accettazionePickingRESTConsumer, gestSetupRESTConsumer);
+    }
+
+}

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

@@ -0,0 +1,985 @@
+package it.integry.integrywmsnative.gest.accettazione_picking;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.ObservableArrayList;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+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.exception.AlreadyUsedAnonymousLabelException;
+import it.integry.integrywmsnative.core.exception.InvalidLUMultiGestioneException;
+import it.integry.integrywmsnative.core.exception.InvalidOrderTypeException;
+import it.integry.integrywmsnative.core.exception.LUScanNotGrantedException;
+import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
+import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
+import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
+import it.integry.integrywmsnative.core.expansion.AtomicBigDecimal;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUBaseOperationsListener;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUPrintListener;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+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.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.report.ReportManager;
+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.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
+import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
+import it.integry.integrywmsnative.gest.accettazione_picking.dto.HistoryMtbAartDTO;
+import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.accettazione_picking.rest.AccettazionePickingRESTConsumer;
+import it.integry.integrywmsnative.gest.accettazione_picking.rest.RecoverMtbColt;
+import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
+import it.integry.integrywmsnative.gest.spedizione.exceptions.NotCurrentYearLUException;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+
+public class AccettazionePickingViewModel {
+
+    private final ArticoloRESTConsumer mArticoloRESTConsumer;
+    private final BarcodeRESTConsumer mBarcodeRESTConsumer;
+    private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
+    private final PrinterRESTConsumer mPrinterRESTConsumer;
+    private final AccettazionePickingRESTConsumer mAccettazionePickingRESTConsumer;
+    private final GestSetupRESTConsumer mGestSetupRESTConsumer;
+
+    private AccettazionePickingViewModel.Listener mListener;
+
+    private List<OrdineAccettazioneInevasoDTO> mOrders;
+    private List<SitArtOrdDTO> mSitArts;
+    private final MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
+
+    private MtbColt mCurrentMtbColt = null;
+    private GestioneEnum defaultGestioneOfUL = null;
+    private String mDefaultCodMdep = null;
+
+    private final List<HistoryMtbAartDTO> mHistoryUsedAarts = new ArrayList<>();
+
+    @Inject
+    public AccettazionePickingViewModel(ArticoloRESTConsumer articoloRESTConsumer,
+                                        BarcodeRESTConsumer barcodeRESTConsumer,
+                                        ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                        PrinterRESTConsumer printerRESTConsumer,
+                                        AccettazionePickingRESTConsumer accettazionePickingRESTConsumer,
+                                        GestSetupRESTConsumer gestSetupRESTConsumer) {
+        this.mArticoloRESTConsumer = articoloRESTConsumer;
+        this.mBarcodeRESTConsumer = barcodeRESTConsumer;
+        this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
+        this.mPrinterRESTConsumer = printerRESTConsumer;
+        this.mAccettazionePickingRESTConsumer = accettazionePickingRESTConsumer;
+        this.mGestSetupRESTConsumer = gestSetupRESTConsumer;
+    }
+
+
+    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep) {
+        this.mOrders = orders;
+        this.mSitArts = sitArts;
+        this.mDefaultCodMdep = codMdep;
+
+        getEmptyPickingList(sitArts, pickingObjectList -> {
+            this.mPickingList.postValue(pickingObjectList);
+        });
+
+        //Definizione della gestione collo di default
+        Boolean isOrdTrasf = Stream.of(mOrders)
+                .map(OrdineAccettazioneInevasoDTO::isOrdTrasf)
+                .withoutNulls()
+                .distinctBy(x -> x)
+                .findFirst()
+                .get();
+
+        //Definizione della gestione collo di default
+        List<GestioneEnum> foundGestioni = Stream.of(mOrders)
+                .map(OrdineAccettazioneInevasoDTO::getGestioneEnum)
+                .withoutNulls()
+                .distinctBy(x -> x)
+                .toList();
+
+        if (foundGestioni != null) {
+
+            if (foundGestioni.size() == 1) {
+                if (isOrdTrasf && (foundGestioni.get(0) == GestioneEnum.PRODUZIONE || foundGestioni.get(0) == GestioneEnum.LAVORAZIONE)) {
+                    defaultGestioneOfUL = GestioneEnum.ACQUISTO;
+                } else
+                    defaultGestioneOfUL = foundGestioni.get(0) == GestioneEnum.PRODUZIONE ? GestioneEnum.LAVORAZIONE : foundGestioni.get(0);
+            } else {
+                this.sendError(new InvalidLUMultiGestioneException());
+            }
+        } else {
+            this.sendError(new InvalidOrderTypeException());
+        }
+    }
+
+    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 -> {
+            List<PickingObjectDTO> pickingList = Stream.of(sitArtOrdList)
+                    .map(sitArtOrdDTO -> {
+                        MtbAart mtbAart = null;
+
+                        for (MtbAart mtbAartItem : listMtbAarts) {
+                            if (mtbAartItem.getCodMart().equalsIgnoreCase(sitArtOrdDTO.getCodMart())) {
+                                mtbAart = mtbAartItem;
+                                break;
+                            }
+                        }
+
+                        return new PickingObjectDTO()
+                                .setSitArtOrdDTO(sitArtOrdDTO)
+                                .setMtbAart(mtbAart);
+                    })
+                    .toList();
+
+            onComplete.run(pickingList);
+        }, this::sendError);
+    }
+
+    public MutableLiveData<List<PickingObjectDTO>> getPickingList() {
+        return mPickingList;
+    }
+
+    public void retrieveExistentLU(RunnableArgs<ArrayList<RecoverMtbColt>> onComplete) {
+        this.sendOnLoadingStarted();
+
+        this.mAccettazionePickingRESTConsumer.getBancaliGiaRegistrati(this.mSitArts, mtbColtList -> {
+            this.sendOnLoadingEnded();
+            onComplete.run(mtbColtList);
+        }, this::sendError);
+    }
+
+
+    public void recoverLU(MtbColt recoveredMtbColt) {
+        this.mCurrentMtbColt = recoveredMtbColt;
+
+        this.resetMatchedRows();
+        this.sendLUOpened(this.mCurrentMtbColt);
+    }
+
+
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        //Se non c'è una UL aperta
+        if (mCurrentMtbColt == null) {
+
+            //Se è un'etichetta anonima
+            if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
+                //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);
+            } else {
+                this.processBarcodeNotOpenedLU(barcodeScanDTO, onComplete);
+            }
+
+        } else {
+            if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
+                this.sendError(new LUScanNotGrantedException());
+            } else {
+                this.processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete);
+            }
+        }
+    }
+
+    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, true, onComplete);
+                }
+            } else {
+                this.sendError(new AlreadyUsedAnonymousLabelException());
+            }
+
+        }, this::sendError);
+    }
+
+    private void processBarcodeNotOpenedLU(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        this.createNewLU(
+                null,
+                null,
+                false,
+                () -> processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete));
+    }
+
+    private void processBarcodeAlreadyOpenedLU(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+
+        if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
+            //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
+            this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
+
+
+        } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
+            //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
+            this.executeEtichettaEan128(barcodeScanDTO, onComplete);
+
+
+        } else {
+            this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
+        }
+    }
+
+    private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        try {
+            Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
+
+            this.loadArticolo(ean13PesoModel.getPrecode(), PickDataDTO.fromEan128(ean13PesoModel.toEan128()), onComplete);
+        } catch (Exception ex) {
+            this.sendError(ex);
+        }
+    }
+
+    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.sendError(new LUScanNotGrantedException());
+                } else {
+                    if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
+                        barcodeProd = barcodeProd.substring(1);
+                    }
+
+                    PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
+                    this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
+                }
+            } else {
+                //EAN 128 non completo o comunque mancano i riferimenti al prodotto
+                onComplete.run();
+            }
+        }, this::sendError);
+    }
+
+
+    private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
+        if (barcodeProd.length() == 14) {
+            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
+        }
+
+        this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
+
+            if (mtbAartList != null && mtbAartList.size() > 0) {
+                this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
+            } else {
+                this.sendError(new NoResultFromBarcodeException());
+            }
+
+        }, this::sendError);
+    }
+
+
+    private void searchArtFromAnag(MtbAart mtbAart, PickDataDTO pickData, Runnable onComplete) {
+        final List<PickingObjectDTO> pickingList = mPickingList.getValue();
+
+        List<PickingObjectDTO> matchPickingObject = Stream.of(pickingList)
+                .filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitArtOrdDTO().getCodMart()))
+                .toList();
+
+        for (PickingObjectDTO pickingObjectDTO : matchPickingObject) {
+            pickingObjectDTO.setTempPickData(pickData);
+        }
+
+        this.loadMatchedRows(matchPickingObject);
+        onComplete.run();
+    }
+
+    private void loadMatchedRows(List<PickingObjectDTO> matchedRows) {
+        if (matchedRows == null || matchedRows.size() == 0) {
+            this.sendError(new NoArtsFoundException());
+        } else if (matchedRows.size() == 1) {
+            this.dispatchOrdineRow(matchedRows.get(0));
+        } else {
+            List<PickingObjectDTO> 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 createNewLU(Integer customNumCollo, String customSerCollo, boolean disablePrint, Runnable onComplete) {
+        this.sendOnNoteAggiuntiveRequest(additionalNotes -> {
+
+            this.mGestSetupRESTConsumer.getValue("PICKING", "SETUP", "DEFAULT_POSIZIONE_COLLI_ACCETTAZIONE", defaultPosAccettazioneDTO -> {
+
+                String defaultPosAccettazione = null;
+                if (defaultPosAccettazioneDTO != null && !UtilityString.isNullOrEmpty(defaultPosAccettazioneDTO.value))
+                    defaultPosAccettazione = defaultPosAccettazioneDTO.value;
+
+                MtbColt mtbColt = new MtbColt();
+                mtbColt
+                        .initDefaultFields()
+                        .setGestione(defaultGestioneOfUL)
+                        .setAnnotazioni(additionalNotes)
+                        .setPosizione(defaultPosAccettazione)
+                        .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+
+                if (customNumCollo != null) {
+                    mtbColt.setNumCollo(customNumCollo);
+                }
+
+                if (!UtilityString.isNullOrEmpty(customSerCollo)) {
+                    mtbColt.setSerCollo(customSerCollo);
+                }
+
+                List<String> codAnags =
+                        Stream.of(mOrders)
+                                .map(OrdineAccettazioneInevasoDTO::getCodAnagOrd)
+                                .distinct()
+                                .toList();
+
+                if (codAnags != null && codAnags.size() == 1) {
+                    mtbColt.setCodAnag(codAnags.get(0));
+                }
+
+                List<String> rifOrds =
+                        Stream.of(mOrders)
+                                .map(OrdineAccettazioneInevasoDTO::getRifOrd)
+                                .distinct()
+                                .toList();
+
+                if (rifOrds != null && rifOrds.size() == 1) {
+                    mtbColt.setRifOrd(rifOrds.get(0));
+                }
+
+                List<String> numDataOrds =
+                        Stream.of(mOrders)
+                                .map(value -> value.getNumero() + value.getData())
+                                .distinct()
+                                .toList();
+
+                if (numDataOrds != null && numDataOrds.size() == 1) {
+                    mtbColt.setNumOrd(mOrders.get(0).getNumero());
+                    mtbColt.setDataOrd(mOrders.get(0).getData());
+
+                    try {
+                        mtbColt.generaFiltroOrdine();
+                    } catch (Exception ex) {
+                        this.sendError(ex);
+                        return;
+                    }
+                }
+
+                this.mColliMagazzinoRESTConsumer.saveCollo(mtbColt, savedMtbColt -> {
+                    mtbColt
+                            .setNumCollo(savedMtbColt.getNumCollo())
+                            .setDataCollo(savedMtbColt.getDataColloS())
+                            .setMtbColr(new ObservableArrayList<>())
+                            .setDisablePrint(disablePrint);
+
+                    this.mCurrentMtbColt = mtbColt;
+
+                    if (onComplete != null) onComplete.run();
+                    this.sendLUOpened(mtbColt);
+                }, this::sendError);
+
+            }, this::sendError);
+
+        });
+    }
+
+
+    public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO) {
+        if (this.mCurrentMtbColt == null) return;
+
+        BigDecimal totalQtaOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaOrd();
+        BigDecimal totalNumCnfOrd = pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd();
+        BigDecimal qtaCnfOrd = pickingObjectDTO.getSitArtOrdDTO().getQtaCnfOrd();
+
+        AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
+        AtomicBigDecimal qtaColWithdrawRows = new AtomicBigDecimal();
+
+        Stream.of(pickingObjectDTO.getWithdrawMtbColrs())
+                .forEach(row -> {
+                    numCnfWithdrawRows.addAndGet(row.getNumCnf());
+                    qtaColWithdrawRows.addAndGet(row.getQtaCol());
+                });
+
+        BigDecimal numCnfDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getNumCnfDaEvadere().subtract(numCnfWithdrawRows.getBigDecimalValue());
+        BigDecimal qtaDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getQtaDaEvadere().subtract(qtaColWithdrawRows.getBigDecimalValue());
+        BigDecimal qtaCnfDaEvadere = qtaCnfOrd;
+
+        numCnfDaEvadere = UtilityBigDecimal.getGreaterBetween(numCnfDaEvadere, BigDecimal.ZERO);
+        qtaDaEvadere = UtilityBigDecimal.getGreaterBetween(qtaDaEvadere, BigDecimal.ZERO);
+
+        BigDecimal numCnfDaPrelevare = null;
+        BigDecimal qtaColDaPrelevare = null;
+        BigDecimal qtaCnfDaPrelevare = null;
+
+        String partitaMag = null;
+        Date dataScad = null;
+
+        if (pickingObjectDTO.getTempPickData() != null && pickingObjectDTO.getTempPickData().getManualPickDTO() != null) {
+            //Oppure le info del barcode scansionato
+            PickDataDTO.ManualPickDTO manualPickDTO = pickingObjectDTO.getTempPickData().getManualPickDTO();
+            MtbAart mtbAart = pickingObjectDTO.getMtbAart();
+
+
+            qtaColDaPrelevare = manualPickDTO.getQtaTot();
+            numCnfDaPrelevare = manualPickDTO.getNumCnf();
+
+            if (mtbAart.isFlagQtaCnfFissaBoolean()) {
+                qtaCnfDaPrelevare = mtbAart.getQtaCnf();
+
+                if (manualPickDTO.isEanPeso()) {
+                    if (mtbAart.getUntMisRifPeso() == MtbAart.UntMisRifPesoEnum.M) {
+                        if (UtilityBigDecimal.equalsTo(mtbAart.getPesoKg(), BigDecimal.ZERO)) {
+                            this.sendError(new InvalidPesoKGException());
+                        } else {
+                            qtaColDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, mtbAart.getPesoKg());
+                        }
+                    }
+                }
+            } else if (qtaColDaPrelevare != null && numCnfDaPrelevare != null) {
+                qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
+            }
+
+
+            if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
+                numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
+
+                if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
+                    if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
+                        numCnfDaPrelevare = BigDecimal.ONE;
+                    qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
+                }
+            } else if (numCnfDaPrelevare != null && qtaColDaPrelevare == null) {
+                qtaCnfDaPrelevare = mtbAart.getQtaCnf();
+                qtaColDaPrelevare = UtilityBigDecimal.multiply(numCnfDaPrelevare, qtaCnfDaPrelevare);
+            }
+
+            if (manualPickDTO.getMtbPartitaMag() != null) {
+                partitaMag = manualPickDTO.getMtbPartitaMag().getPartitaMag();
+                dataScad = manualPickDTO.getMtbPartitaMag().getDataScadD();
+            }
+        }
+
+        BigDecimal initialNumCnf;
+        BigDecimal initialQtaCnf;
+        BigDecimal initialQtaTot;
+
+        if (qtaColDaPrelevare != null) {
+            initialNumCnf = numCnfDaPrelevare;
+            initialQtaCnf = qtaCnfDaPrelevare;
+            initialQtaTot = qtaColDaPrelevare;
+
+        } else {
+            initialNumCnf = totalNumCnfOrd;
+            initialQtaCnf = qtaCnfOrd;
+            initialQtaTot = totalQtaOrd;
+        }
+
+        if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
+            initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
+            initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
+        }
+
+        if (dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) {
+            dataScad = UtilityDate.getDateInstance();
+            Calendar c = new GregorianCalendar();
+            c.setTime(dataScad);
+            c.add(Calendar.DATE, pickingObjectDTO.getMtbAart().getGgScadPartita());
+            dataScad = c.getTime();
+        }
+
+        if(partitaMag == null && dataScad == null) {
+            HistoryMtbAartDTO historyMtbAartDTO = this.getHistoryItemIfExists(pickingObjectDTO.getMtbAart().getCodMart());
+
+            if(historyMtbAartDTO != null) {
+                partitaMag = historyMtbAartDTO.getPartitaMag();
+                dataScad = historyMtbAartDTO.getDataScad();
+            }
+        }
+
+        this.sendOnItemDispatched(
+                pickingObjectDTO,
+                pickingObjectDTO.getMtbAart(),
+                initialNumCnf, initialQtaCnf, initialQtaTot,
+                qtaDaEvadere,
+                numCnfDaEvadere,
+                qtaCnfDaEvadere,
+                qtaColDaPrelevare,
+                numCnfDaPrelevare,
+                qtaCnfDaPrelevare,
+                null,
+                null,
+                null,
+                partitaMag,
+                dataScad,
+                true,
+                (pickedQuantityDTO, shouldCloseLU) -> {
+                    this.saveNewRow(pickingObjectDTO,
+                            pickedQuantityDTO.getNumCnf(),
+                            pickedQuantityDTO.getQtaCnf(),
+                            pickedQuantityDTO.getQtaTot(),
+                            pickedQuantityDTO.getPartitaMag(),
+                            pickedQuantityDTO.getDataScad(),
+                            shouldCloseLU);
+                });
+
+    }
+
+
+    public void saveNewRow(PickingObjectDTO pickingObjectDTO, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
+        this.sendOnLoadingStarted();
+
+        String gestioneRif = pickingObjectDTO.getSitArtOrdDTO().getGestioneEnum() == GestioneEnum.PRODUZIONE ? "L" : pickingObjectDTO.getSitArtOrdDTO().getGestione();
+
+        final MtbColr mtbColr = new MtbColr()
+                .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
+                .setPartitaMag(partitaMag)
+                .setDataScadPartita(dataScad)
+                .setQtaCol(qtaTot)
+                .setQtaCnf(qtaCnf)
+                .setNumCnf(numCnf)
+                .setGestioneRif(gestioneRif)
+                .setCodJcom(pickingObjectDTO.getSitArtOrdDTO().getCodJcom())
+                .setDescrizione(pickingObjectDTO.getMtbAart().getDescrizioneEstesa())
+                .setDatetimeRow(UtilityDate.getDateInstance())
+                .setDataOrd(pickingObjectDTO.getSitArtOrdDTO().getDataOrd())
+                .setNumOrd(pickingObjectDTO.getSitArtOrdDTO().getNumOrd())
+                .setRigaOrd(pickingObjectDTO.getSitArtOrdDTO().getRigaOrd());
+
+
+        this.addHistoryItem(mtbColr);
+
+        mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+
+        MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
+        cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE);
+
+        cloneMtbColt.setMtbColr(new ObservableArrayList<>());
+        cloneMtbColt.getMtbColr().add((MtbColr) mtbColr.clone());
+
+        if (UtilityBigDecimal.equalsTo(numCnf, BigDecimal.ZERO) && UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO)) {
+            resetMatchedRows();
+            this.sendOnLoadingEnded();
+
+            if (shouldCloseLU) closeLU();
+            return;
+        }
+
+        mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> {
+
+            mtbColr
+                    .setDataCollo(value.getDataColloS())
+                    .setNumCollo(value.getNumCollo())
+                    .setGestione(value.getGestione())
+                    .setSerCollo(value.getSerCollo())
+                    .setRiga(value.getMtbColr().get(0).getRiga())
+                    .setUntMis(pickingObjectDTO.getMtbAart().getUntMis())
+                    .setMtbAart(pickingObjectDTO.getMtbAart());
+
+            pickingObjectDTO.getWithdrawMtbColrs().add(mtbColr);
+            mCurrentMtbColt.getMtbColr().add(mtbColr);
+
+            //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
+            resetMatchedRows();
+
+            this.sendOnRowSaved();
+            this.sendOnLoadingEnded();
+
+            if (shouldCloseLU) closeLU();
+        }, this::sendError);
+    }
+
+
+    public void dispatchRowEdit(MtbColr mtbColrToEdit) {
+        final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
+                .setMtbAart(mtbColrToEdit.getMtbAart());
+
+        this.sendOnItemDispatched(
+                pickingObjectDTO,
+                pickingObjectDTO.getMtbAart(),
+                mtbColrToEdit.getNumCnf(),
+                mtbColrToEdit.getQtaCnf(),
+                mtbColrToEdit.getQtaCol(),
+                null,
+                null,
+                null,
+                null, null, null,
+                null, null, null,
+                mtbColrToEdit.getPartitaMag(),
+                mtbColrToEdit.getDataScadPartitaD(),
+                true,
+                (pickedQuantityDTO, shouldCloseLU) -> {
+
+                    this.saveEditedRow(mtbColrToEdit,
+                            pickedQuantityDTO.getNumCnf(),
+                            pickedQuantityDTO.getQtaCnf(),
+                            pickedQuantityDTO.getQtaTot(),
+                            pickedQuantityDTO.getPartitaMag(),
+                            pickedQuantityDTO.getDataScad(),
+                            shouldCloseLU);
+                });
+    }
+
+    private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
+        this.sendOnLoadingStarted();
+
+        MtbColt mtbColt = new MtbColt()
+                .setNumCollo(mtbColrToUpdate.getNumCollo())
+                .setDataCollo(mtbColrToUpdate.getDataColloS())
+                .setSerCollo(mtbColrToUpdate.getSerCollo())
+                .setGestione(mtbColrToUpdate.getGestione())
+                .setMtbColr(new ObservableArrayList<>());
+        mtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
+
+        final MtbColr mtbColr = (MtbColr) mtbColrToUpdate.clone();
+        mtbColr.setOperation(CommonModelConsts.OPERATION.UPDATE);
+        mtbColr
+                .setNumCnf(numCnf)
+                .setQtaCnf(qtaCnf)
+                .setQtaCol(qtaTot)
+                .setPartitaMag(partitaMag)
+                .setDataScadPartita(dataScad)
+                .setUtente(SettingsManager.i().getUser().getFullname())
+                .setDatetimeRow(UtilityDate.getDateInstance());
+
+        mtbColt.getMtbColr().add(mtbColr);
+
+        this.addHistoryItem(mtbColr);
+
+        this.mColliMagazzinoRESTConsumer.saveCollo(mtbColt, (value) -> {
+
+            mtbColr.setNumCnf(numCnf)
+                    .setQtaCnf(qtaCnf)
+                    .setQtaCol(qtaTot);
+
+            Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue())
+                    .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToUpdate))
+                    .findSingle();
+
+            if (pickingObjectDTO.isPresent()) {
+                pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToUpdate);
+                pickingObjectDTO.get().getWithdrawMtbColrs().add(mtbColr);
+            }
+
+            this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate);
+            this.mCurrentMtbColt.getMtbColr().add(mtbColr);
+
+            //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei
+            resetMatchedRows();
+
+            this.sendOnRowSaved();
+            this.sendOnLoadingEnded();
+
+            if (shouldCloseLU) closeLU();
+        }, this::sendError);
+    }
+
+    public void deleteRow(MtbColr mtbColrToDelete) {
+        this.sendMtbColrDeleteRequest(shouldDelete -> {
+
+            if (shouldDelete) {
+                this.sendOnLoadingStarted();
+                MtbColt mtbColt = new MtbColt()
+                        .setNumCollo(mtbColrToDelete.getNumCollo())
+                        .setDataCollo(mtbColrToDelete.getDataColloS())
+                        .setSerCollo(mtbColrToDelete.getSerCollo())
+                        .setGestione(mtbColrToDelete.getGestione())
+                        .setMtbColr(new ObservableArrayList<>());
+                mtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
+
+                MtbColr mtbColr = (MtbColr) mtbColrToDelete.clone();
+                mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT);
+                mtbColr.setQtaCol(mtbColr.getQtaCol().multiply(new BigDecimal(-1)))
+                        .setNumCnf(mtbColr.getNumCnf().multiply(new BigDecimal(-1)))
+                        .setRiga(null);
+
+                mtbColt.getMtbColr().add(mtbColr);
+
+                this.mColliMagazzinoRESTConsumer.saveCollo(mtbColt, (value) -> {
+
+                    Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue())
+                            .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToDelete))
+                            .findSingle();
+
+                    if (pickingObjectDTO.isPresent()) {
+                        pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete);
+                    }
+
+                    this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
+
+                    this.resetMatchedRows();
+                    this.sendOnRowSaved();
+                    this.sendOnLoadingEnded();
+
+                }, this::sendError);
+            }
+        });
+    }
+
+    public void closeLU() {
+        if (mCurrentMtbColt == null) return;
+
+        this.sendOnLoadingStarted();
+
+        mColliMagazzinoRESTConsumer.canLUBeDeleted(mCurrentMtbColt, canBeDeleted -> {
+            if (canBeDeleted) {
+                deleteLU(() -> {
+                    this.sendLUClosed();
+                    this.sendOnLoadingEnded();
+                });
+            } else {
+                mColliMagazzinoRESTConsumer.updateDataFine(mCurrentMtbColt, () -> {
+
+                    if (!mCurrentMtbColt.getDisablePrint()) {
+                        printCollo(this::postCloseOperations);
+                    } else {
+                        postCloseOperations();
+                    }
+
+                    this.sendLUClosed();
+                    this.sendOnLoadingEnded();
+                }, this::sendError);
+            }
+        }, this::sendError);
+    }
+
+    private void printCollo(Runnable onComplete) {
+        this.mPrinterRESTConsumer.getAvailablePrinters(mDefaultCodMdep, PrinterRESTConsumer.Type.SECONDARIA, printerList -> {
+
+            if (printerList == null || printerList.size() == 0) {
+                this.sendError(new NoPrintersFoundException());
+                onComplete.run();
+                return;
+            }
+
+            String reportName = ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO);
+
+            this.mPrinterRESTConsumer.printCollo(
+                    printerList.get(0),
+                    mCurrentMtbColt,
+                    1,
+                    reportName, () -> {
+                        this.sendLUSuccessfullyPrinted();
+                        onComplete.run();
+                    }, ex -> this.sendLUPrintError(ex, onComplete));
+        }, this::sendError);
+
+    }
+
+    private void postCloseOperations() {
+        this.mCurrentMtbColt = null;
+        this.sendLUClosed();
+        this.sendOnLoadingEnded();
+    }
+
+    private void deleteLU(Runnable onComplete) {
+        mColliMagazzinoRESTConsumer.deleteCollo(mCurrentMtbColt, () -> {
+            this.mCurrentMtbColt = null;
+
+            if (onComplete != null) onComplete.run();
+        }, this::sendError);
+    }
+
+    public void resetMatchedRows() {
+        for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
+            pickingObjectDTO
+                    .setTempPickData(null)
+                    .setHidden(false);
+        }
+
+        this.mPickingList.postValue(this.mPickingList.getValue());
+        this.sendFilterRemoved();
+    }
+
+    private void addHistoryItem(@NonNull MtbColr mtbColr) {
+        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
+                .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart()))
+                .findFirst();
+
+        if (optional.isPresent()) {
+            optional.get()
+                    .setPartitaMag(mtbColr.getPartitaMag())
+                    .setDataScad(mtbColr.getDataScadPartitaD());
+        } else {
+            this.mHistoryUsedAarts.add(new HistoryMtbAartDTO()
+                    .setCodMart(mtbColr.getCodMart())
+                    .setPartitaMag(mtbColr.getPartitaMag())
+                    .setDataScad(mtbColr.getDataScadPartitaD()));
+        }
+    }
+
+    private HistoryMtbAartDTO getHistoryItemIfExists(@NonNull String codMart) {
+        Optional<HistoryMtbAartDTO> optional = Stream.of(this.mHistoryUsedAarts)
+                .filter(x -> x.getCodMart().equalsIgnoreCase(codMart))
+                .findFirst();
+
+        return optional.isPresent() ? optional.get() : null;
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    private void sendOnNoteAggiuntiveRequest(RunnableArgs<String> onComplete) {
+        if (this.mListener != null) this.mListener.onNoteAggiuntiveRequest(onComplete);
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    private void sendLUOpened(MtbColt mtbColt) {
+        if (this.mListener != null) mListener.onLUOpened(mtbColt);
+    }
+
+    private void sendLUClosed() {
+        if (this.mListener != null) mListener.onLUClosed();
+    }
+
+    private void sendLUSuccessfullyPrinted() {
+        if (this.mListener != null) mListener.onLUSuccessullyPrinted();
+    }
+
+    private void sendLUPrintError(Exception ex, Runnable onComplete) {
+        if (this.mListener != null) mListener.onLUPrintError(ex, onComplete);
+    }
+
+    private void sendOnItemDispatched(PickingObjectDTO pickingObjectDTO,
+                                      MtbAart mtbAart,
+                                      BigDecimal initialNumCnf,
+                                      BigDecimal initialQtaCnf,
+                                      BigDecimal initialQtaTot,
+                                      BigDecimal totalQtaOrd,
+                                      BigDecimal totalNumCnfOrd,
+                                      BigDecimal qtaCnfOrd,
+                                      BigDecimal totalQtaToBeTaken,
+                                      BigDecimal totalNumCnfToBeTaken,
+                                      BigDecimal qtaCnfToBeTaken,
+                                      BigDecimal totalQtaAvailable,
+                                      BigDecimal totalNumCnfAvailable,
+                                      BigDecimal qtaCnfAvailable,
+                                      String partitaMag,
+                                      Date dataScad,
+                                      boolean canPartitaMagBeChanged,
+                                      RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+        if (this.mListener != null) mListener.onItemDispatched(pickingObjectDTO,
+                mtbAart,
+                initialNumCnf,
+                initialQtaCnf,
+                initialQtaTot,
+                totalQtaOrd,
+                totalNumCnfOrd,
+                qtaCnfOrd,
+                totalQtaToBeTaken,
+                totalNumCnfToBeTaken,
+                qtaCnfToBeTaken,
+                totalQtaAvailable,
+                totalNumCnfAvailable,
+                qtaCnfAvailable,
+                partitaMag,
+                dataScad,
+                canPartitaMagBeChanged,
+                true,
+                onComplete);
+    }
+
+
+    private void sendOnRowSaved() {
+        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();
+    }
+
+    private void sendMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
+        if (this.mListener != null) mListener.onMtbColrDeleteRequest(onComplete);
+    }
+
+    public AccettazionePickingViewModel setListeners(AccettazionePickingViewModel.Listener
+                                                             listener) {
+        this.mListener = listener;
+        return this;
+    }
+
+    public interface Listener extends ILoadingListener, ILUPrintListener, ILUBaseOperationsListener {
+
+        void onNoteAggiuntiveRequest(RunnableArgs<String> onComplete);
+
+        void onError(Exception ex);
+
+        void onItemDispatched(PickingObjectDTO pickingObjectDTO,
+                              MtbAart mtbAart,
+                              BigDecimal initialNumCnf,
+                              BigDecimal initialQtaCnf,
+                              BigDecimal initialQtaTot,
+                              BigDecimal totalQtaOrd,
+                              BigDecimal totalNumCnfOrd,
+                              BigDecimal qtaCnfOrd,
+                              BigDecimal totalQtaToBeTaken,
+                              BigDecimal totalNumCnfToBeTaken,
+                              BigDecimal qtaCnfToBeTaken,
+                              BigDecimal totalQtaAvailable,
+                              BigDecimal totalNumCnfAvailable,
+                              BigDecimal qtaCnfAvailable,
+                              String partitaMag,
+                              Date dataScad,
+                              boolean canPartitaMagBeChanged,
+                              boolean canOverflowQuantity,
+                              RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
+
+        void onFilterApplied(String newValue);
+
+        void onFilterRemoved();
+
+    }
+
+}

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

@@ -0,0 +1,159 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.core;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.app.AppCompatActivity;
+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.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.AccettazioneOrdineInevasoMainListGroupHeaderBinding;
+import it.integry.integrywmsnative.databinding.AccettazioneOrdineInevasoMainListGroupItemBinding;
+import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDTO;
+
+public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<AccettazioneListAdapter.SubheaderHolder, AccettazioneListAdapter.SingleItemViewHolder> {
+
+    private Context mContext;
+    private List<AccettazioneListModel> mDataset = new ArrayList<>();
+
+    private RunnableArgs<PickingObjectDTO> mOnItemClicked;
+
+    static class SubheaderHolder extends RecyclerView.ViewHolder {
+
+        AccettazioneOrdineInevasoMainListGroupHeaderBinding mBinding;
+
+        SubheaderHolder(AccettazioneOrdineInevasoMainListGroupHeaderBinding binding) {
+            super(binding.getRoot());
+            this.mBinding = binding;
+        }
+
+    }
+
+    static class SingleItemViewHolder extends RecyclerView.ViewHolder {
+
+        AccettazioneOrdineInevasoMainListGroupItemBinding mBinding;
+
+        SingleItemViewHolder(AccettazioneOrdineInevasoMainListGroupItemBinding binding) {
+            super(binding.getRoot());
+            this.mBinding = binding;
+        }
+    }
+
+
+    public AccettazioneListAdapter(AppCompatActivity context, ObservableArrayList<AccettazioneListModel> mutableDataSet) {
+        this.mContext = context;
+
+        mutableDataSet.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+            @Override
+            public void onChanged(ObservableList sender) {
+                mDataset.clear();
+                mDataset.addAll(sender);
+                notifyDataSetChanged();
+                notifyDataChanged();
+            }
+        });
+    }
+
+    public void setOnItemClicked(RunnableArgs<PickingObjectDTO> onItemClicked) {
+        this.mOnItemClicked = onItemClicked;
+    }
+
+
+    @Override
+    public SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
+        AccettazioneOrdineInevasoMainListGroupHeaderBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.accettazione_ordine_inevaso_main_list__group_header, parent, false);
+        return new SubheaderHolder(binding);
+    }
+
+    @Override
+    public SingleItemViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+        AccettazioneOrdineInevasoMainListGroupItemBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.accettazione_ordine_inevaso_main_list__group_item, parent, false);
+        return new SingleItemViewHolder(binding);
+    }
+
+
+    @Override
+    public void onBindSubheaderViewHolder(SubheaderHolder subheaderHolder, int nextItemPosition) {
+        AccettazioneListModel pickingObjectDTO = this.mDataset.get(nextItemPosition);
+
+        subheaderHolder.mBinding.spedizioneGroupTitle.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getGroupTitle()) ? View.GONE : View.VISIBLE);
+        subheaderHolder.mBinding.spedizioneGroupTitle.setText(pickingObjectDTO.getGroupTitle());
+    }
+
+    @Override
+    public void onBindItemViewHolder(final SingleItemViewHolder holder, final int position) {
+        AccettazioneListModel pickingObjectDTO = this.mDataset.get(position);
+
+        if (pickingObjectDTO.getQtaEvasa().subtract(pickingObjectDTO.getQtaTot()).floatValue() >= 0) {
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.green_500_with_alpha));
+        } else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
+        } else if (position % 2 == 1) {
+            holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
+        } else {
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+        }
+
+        holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
+        holder.mBinding.getRoot().setAlpha(!pickingObjectDTO.isActive() ? 0.8f : 1);
+        holder.mBinding.badge1.setBackground(mContext.getResources().getDrawable(!pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
+        holder.mBinding.qtaEvasa.setTextColor(mContext.getResources().getColor(!pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700));
+
+        holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
+        holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
+
+
+        holder.mBinding.badge1.setText(pickingObjectDTO.getBadge1());
+        holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());
+        holder.mBinding.badge2.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getBadge2()) ? View.GONE : View.VISIBLE);
+
+
+        holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa()));
+        holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot()));
+
+        holder.mBinding.untMis.setText(pickingObjectDTO.getUntMis());
+        holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE);
+
+        holder.mBinding.getRoot().setOnClickListener(v -> {
+            if (this.mOnItemClicked != null)
+                this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());
+        });
+    }
+
+    @Override
+    public boolean onPlaceSubheaderBetweenItems(int position) {
+
+        if (getItemSize() == 1) return true;
+        else if (getItemSize() > 1) {
+            AccettazioneListModel compare1 = this.mDataset.get(position);
+            AccettazioneListModel 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/accettazione_picking/core/AccettazioneListModel.java

@@ -0,0 +1,144 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.core;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.math.BigDecimal;
+
+import it.integry.integrywmsnative.gest.accettazione_picking.dto.PickingObjectDTO;
+
+public class AccettazioneListModel implements Cloneable {
+    private String groupTitle;
+
+    private String badge1;
+    private String badge2;
+
+    private String descrizione;
+    private boolean descrizionePresente;
+    private String subDescrizione1;
+    private String subDescrizione2;
+    private BigDecimal qtaEvasa;
+    private BigDecimal qtaTot;
+    private String untMis;
+
+    private boolean active;
+
+    private PickingObjectDTO mOriginalModel;
+
+    @NotNull
+    @Override
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    public String getGroupTitle() {
+        return groupTitle;
+    }
+
+    public AccettazioneListModel setGroupTitle(String groupTitle) {
+        this.groupTitle = groupTitle;
+        return this;
+    }
+
+    public String getBadge1() {
+        return badge1;
+    }
+
+    public AccettazioneListModel setBadge1(String badge1) {
+        this.badge1 = badge1;
+        return this;
+    }
+
+    public String getBadge2() {
+        return badge2;
+    }
+
+    public AccettazioneListModel setBadge2(String badge2) {
+        this.badge2 = badge2;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public AccettazioneListModel setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public boolean isDescrizionePresente() {
+        return descrizionePresente;
+    }
+
+    public AccettazioneListModel setDescrizionePresente(boolean descrizionePresente) {
+        this.descrizionePresente = descrizionePresente;
+        return this;
+    }
+
+    public String getSubDescrizione1() {
+        return subDescrizione1;
+    }
+
+    public AccettazioneListModel setSubDescrizione1(String subDescrizione1) {
+        this.subDescrizione1 = subDescrizione1;
+        return this;
+    }
+
+    public String getSubDescrizione2() {
+        return subDescrizione2;
+    }
+
+    public AccettazioneListModel setSubDescrizione2(String subDescrizione2) {
+        this.subDescrizione2 = subDescrizione2;
+        return this;
+    }
+
+    public BigDecimal getQtaEvasa() {
+        return qtaEvasa;
+    }
+
+    public AccettazioneListModel setQtaEvasa(BigDecimal qtaEvasa) {
+        this.qtaEvasa = qtaEvasa;
+        return this;
+    }
+
+    public BigDecimal getQtaTot() {
+        return qtaTot;
+    }
+
+    public AccettazioneListModel setQtaTot(BigDecimal qtaTot) {
+        this.qtaTot = qtaTot;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public AccettazioneListModel setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public AccettazioneListModel setActive(boolean active) {
+        this.active = active;
+        return this;
+    }
+
+    public PickingObjectDTO getOriginalModel() {
+        return mOriginalModel;
+    }
+
+    public AccettazioneListModel setOriginalModel(PickingObjectDTO mOriginalModel) {
+        this.mOriginalModel = mOriginalModel;
+        return this;
+    }
+}

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

@@ -0,0 +1,133 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.dto;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.math.BigDecimal;
+
+public class AccettazioneListModel implements Cloneable {
+
+
+    private String groupTitle;
+
+    private String badge1;
+    private String badge2;
+
+    private String descrizione;
+    private boolean descrizionePresente;
+    private String subDescrizione1;
+    private String subDescrizione2;
+    private BigDecimal qtaEvasa;
+    private BigDecimal qtaTot;
+    private String untMis;
+
+    private boolean active;
+
+    @NotNull
+    @Override
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    public String getGroupTitle() {
+        return groupTitle;
+    }
+
+    public AccettazioneListModel setGroupTitle(String groupTitle) {
+        this.groupTitle = groupTitle;
+        return this;
+    }
+
+    public String getBadge1() {
+        return badge1;
+    }
+
+    public AccettazioneListModel setBadge1(String badge1) {
+        this.badge1 = badge1;
+        return this;
+    }
+
+    public String getBadge2() {
+        return badge2;
+    }
+
+    public AccettazioneListModel setBadge2(String badge2) {
+        this.badge2 = badge2;
+        return this;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public AccettazioneListModel setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+        return this;
+    }
+
+    public boolean isDescrizionePresente() {
+        return descrizionePresente;
+    }
+
+    public AccettazioneListModel setDescrizionePresente(boolean descrizionePresente) {
+        this.descrizionePresente = descrizionePresente;
+        return this;
+    }
+
+    public String getSubDescrizione1() {
+        return subDescrizione1;
+    }
+
+    public AccettazioneListModel setSubDescrizione1(String subDescrizione1) {
+        this.subDescrizione1 = subDescrizione1;
+        return this;
+    }
+
+    public String getSubDescrizione2() {
+        return subDescrizione2;
+    }
+
+    public AccettazioneListModel setSubDescrizione2(String subDescrizione2) {
+        this.subDescrizione2 = subDescrizione2;
+        return this;
+    }
+
+    public BigDecimal getQtaEvasa() {
+        return qtaEvasa;
+    }
+
+    public AccettazioneListModel setQtaEvasa(BigDecimal qtaEvasa) {
+        this.qtaEvasa = qtaEvasa;
+        return this;
+    }
+
+    public BigDecimal getQtaTot() {
+        return qtaTot;
+    }
+
+    public AccettazioneListModel setQtaTot(BigDecimal qtaTot) {
+        this.qtaTot = qtaTot;
+        return this;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public AccettazioneListModel setUntMis(String untMis) {
+        this.untMis = untMis;
+        return this;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public AccettazioneListModel setActive(boolean active) {
+        this.active = active;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/dto/AccettazioneOrdineInevasoOrderBy.java

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto;
+package it.integry.integrywmsnative.gest.accettazione_picking.dto;
 
 /**
  * Created by GiuseppeS on 21/03/2018.

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/dto/HistoryMtbAartDTO.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.dto;
+
+import java.util.Date;
+
+public class HistoryMtbAartDTO {
+
+    private String codMart;
+    private String partitaMag;
+    private Date dataScad;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public HistoryMtbAartDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public HistoryMtbAartDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public Date getDataScad() {
+        return dataScad;
+    }
+
+    public HistoryMtbAartDTO setDataScad(Date dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/dto/PickingObjectDTO.java

@@ -0,0 +1,64 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbColr;
+import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+
+public class PickingObjectDTO {
+    private SitArtOrdDTO sitArtOrdDTO;
+    private MtbAart mtbAart;
+
+    private PickDataDTO tempPickData;
+    private List<MtbColr> withdrawMtbColrs = new ArrayList<>();
+
+    private boolean hidden = false;
+
+    public SitArtOrdDTO getSitArtOrdDTO() {
+        return sitArtOrdDTO;
+    }
+
+    public PickingObjectDTO setSitArtOrdDTO(SitArtOrdDTO sitArtOrdDTO) {
+        this.sitArtOrdDTO = sitArtOrdDTO;
+        return this;
+    }
+
+    public MtbAart getMtbAart() {
+        return mtbAart;
+    }
+
+    public PickingObjectDTO setMtbAart(MtbAart mtbAart) {
+        this.mtbAart = mtbAart;
+        return this;
+    }
+
+    public PickDataDTO getTempPickData() {
+        return tempPickData;
+    }
+
+    public PickingObjectDTO setTempPickData(PickDataDTO tempPickData) {
+        this.tempPickData = tempPickData;
+        return this;
+    }
+
+    public List<MtbColr> getWithdrawMtbColrs() {
+        return withdrawMtbColrs;
+    }
+
+    public PickingObjectDTO setWithdrawMtbColrs(List<MtbColr> withdrawMtbColrs) {
+        this.withdrawMtbColrs = withdrawMtbColrs;
+        return this;
+    }
+
+    public boolean isHidden() {
+        return hidden;
+    }
+
+    public PickingObjectDTO setHidden(boolean hidden) {
+        this.hidden = hidden;
+        return this;
+    }
+}

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

@@ -0,0 +1,152 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.rest;
+
+import com.annimon.stream.Stream;
+import com.google.gson.reflect.TypeToken;
+
+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.rest.consumers.ISimpleOperationCallback;
+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;
+
+@Singleton
+public class AccettazionePickingRESTConsumer {
+
+    private final SystemRESTConsumer mSystemRestConsumer;
+
+    @Inject
+    public AccettazionePickingRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        this.mSystemRestConsumer = systemRESTConsumer;
+    }
+
+    public void getBancaliGiaRegistrati(List<SitArtOrdDTO> 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())
+                .forEach(x -> {
+                    try {
+                        HashMap<String, Object> whereCondMap = new HashMap<>();
+                        whereCondMap.put("mtb_colr.data_ord", UtilityDate.recognizeDate(x.getDataOrd()));
+                        whereCondMap.put("mtb_colr.gestione", x.getGestione().equalsIgnoreCase("P") ? "L" : x.getGestione());
+                        whereCondMap.put("mtb_colr.num_ord", x.getNumOrd());
+
+                        whereCondListMap.add(whereCondMap);
+                    } catch (Exception ex) {
+                        UtilityLogger.errorMe(ex);
+                    }
+                });
+
+
+        String sql = "SELECT DISTINCT CAST(CASE WHEN MAX(ISNULL(mtb_colr_scar.num_collo, 0)) = 0 THEN 1 ELSE 0 END AS BIT) AS flagCanBeRecovered, " +
+                "                mtb_colt.gestione," +
+                "                mtb_colt.data_collo," +
+                "                mtb_colt.num_collo," +
+                "                segno," +
+                "                peso_kg," +
+                "                lunghezza_cm," +
+                "                larghezza_cm," +
+                "                altezza_cm," +
+                "                cod_anag," +
+                "                cod_dtip," +
+                "                mtb_colt.data_doc," +
+                "                mtb_colt.ser_doc," +
+                "                mtb_colt.num_doc," +
+                "                rif_ord," +
+                "                mtb_colt.ser_collo," +
+                "                cod_tcol," +
+                "                mtb_colt.data_ord," +
+                "                mtb_colt.num_ord," +
+                "                cod_vdes," +
+                "                cod_mdep," +
+                "                cod_vlis," +
+                "                preparato_da," +
+                "                ora_iniz_prep," +
+                "                ora_fine_prep," +
+                "                filtro_ordini," +
+                "                annotazioni," +
+                "                posizione," +
+                "                cod_dtip_provv," +
+                "                data_doc_provv," +
+                "                ser_doc_provv," +
+                "                num_doc_provv," +
+                "                cod_jfas," +
+                "                data_vers," +
+                "                mtb_colt.peso_netto_kg " +
+                "FROM mtb_colt" +
+                "   INNER JOIN  mtb_colr ON " +
+                " mtb_colt.gestione = mtb_colr.gestione AND " +
+                " mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
+                " mtb_colt.data_collo = mtb_colr.data_collo AND " +
+                " mtb_colt.num_collo = mtb_colr.num_collo " +
+                " LEFT OUTER JOIN mtb_colr mtb_colr_scar ON mtb_colr_scar.num_collo_rif = mtb_colr.num_collo AND " +
+                "                                             mtb_colr_scar.gestione_rif = mtb_colr.gestione AND " +
+                "                                             mtb_colr_scar.ser_collo_rif = mtb_colr.ser_collo AND " +
+                "                                             mtb_colr_scar.data_collo_rif = mtb_colr.data_collo " +
+                " WHERE (" + UtilityQuery.concatFieldListInWhereCond(whereCondListMap) + ") " +
+                " AND mtb_colt.data_doc IS NULL " +
+                " GROUP BY mtb_colt.gestione," +
+                "                mtb_colt.data_collo," +
+                "                mtb_colt.num_collo," +
+                "                segno," +
+                "                peso_kg," +
+                "                lunghezza_cm," +
+                "                larghezza_cm," +
+                "                altezza_cm," +
+                "                cod_anag," +
+                "                cod_dtip," +
+                "                mtb_colt.data_doc," +
+                "                mtb_colt.ser_doc," +
+                "                mtb_colt.num_doc," +
+                "                rif_ord," +
+                "                mtb_colt.ser_collo," +
+                "                cod_tcol," +
+                "                mtb_colt.data_ord," +
+                "                mtb_colt.num_ord," +
+                "                cod_vdes," +
+                "                cod_mdep," +
+                "                cod_vlis," +
+                "                preparato_da," +
+                "                ora_iniz_prep," +
+                "                ora_fine_prep," +
+                "                filtro_ordini," +
+                "                annotazioni," +
+                "                posizione," +
+                "                cod_dtip_provv," +
+                "                data_doc_provv," +
+                "                ser_doc_provv," +
+                "                num_doc_provv," +
+                "                cod_jfas," +
+                "                data_vers," +
+                "                mtb_colt.peso_netto_kg";
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<RecoverMtbColt>>() {
+        }.getType();
+        mSystemRestConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback<ArrayList<RecoverMtbColt>>() {
+            @Override
+            public void onSuccess(ArrayList<RecoverMtbColt> value) {
+                if (onComplete != null) onComplete.run(value);
+            }
+
+            @Override
+            public void onFailed(Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+
+    }
+
+
+}

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

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.gest.accettazione_picking.rest;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class RecoverMtbColt extends MtbColt {
+
+    private boolean flagCanBeRecovered;
+
+    public boolean isFlagCanBeRecovered() {
+        return flagCanBeRecovered;
+    }
+
+    public RecoverMtbColt setFlagCanBeRecovered(boolean flagCanBeRecovered) {
+        this.flagCanBeRecovered = flagCanBeRecovered;
+        return this;
+    }
+}