From c99c3a3b119bc72b30ee6c66bc4e9caf04513bc7 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 21 Nov 2025 13:30:40 +0100
Subject: [PATCH 1/2] Fix caricamento processBarcode spedizione

---
 .idea/runConfigurations/app.xml               |  2 +-
 .../gest/spedizione/SpedizioneActivity.java   |  3 +-
 .../gest/spedizione/SpedizioneViewModel.java  | 36 ++++++++++---------
 .../dialog_info_situazione_articolo.xml       | 32 ++++++++---------
 .../res/layout/fragment_picking_libero.xml    |  8 ++---
 .../lista_picking_libero_list_model.xml       |  1 -
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index c4d733c3..2b0ac32e 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS_Native.app" />
+    <module name="WMS.app" />
     <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index 3b1a5b0a..dbeb773e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -764,12 +764,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         executorService.execute(() -> {
             try {
                 this.mViewmodel.processBarcodeDTO(data);
+                this.onLoadingEnded();
             } catch (Exception e) {
                 onError(e);
             }
         });
-
-        this.onLoadingEnded();
     };
 
     public void addExtraItem() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index 30b21892..08d9d2e1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -860,7 +860,7 @@ public class SpedizioneViewModel {
         if (mEnableGiacenza) {
 
             pickingList
-                    .forEach(pickingObjectDTO -> {
+                    .parallelStream().forEach(pickingObjectDTO -> {
                         if (pickingObjectDTO.getMtbColts().stream()
                                 .anyMatch(x ->
                                         Objects.equals(x.getNumCollo(), scannedUL.getNumCollo()) &&
@@ -874,19 +874,22 @@ public class SpedizioneViewModel {
         }
 
         //Controllo se nel collo ho degli articoli che corrispondono per codice / taglia / colore / lotto
-        scannedUL.getMtbColr().stream().filter(x -> !UtilityString.isNullOrEmpty(x.getCodMart())).forEach(x -> {
+        scannedUL.getMtbColr()
+                .parallelStream()
+                .filter(x -> !UtilityString.isNullOrEmpty(x.getCodMart()))
+                .forEach(x -> {
 
-            for (PickingObjectDTO pickingObject : pickingList) {
-                //Da verificare se il controllo per partita deve essere sempre effettuato
-                if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) && UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) && (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) {
+                    for (PickingObjectDTO pickingObject : pickingList) {
+                        //Da verificare se il controllo per partita deve essere sempre effettuato
+                        if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) && UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) && (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) {
 
-                    if (!matchPickingObject.contains(pickingObject)) {
-                        matchPickingObject.add(pickingObject);
+                            if (!matchPickingObject.contains(pickingObject)) {
+                                matchPickingObject.add(pickingObject);
+                            }
+
+                        }
                     }
-
-                }
-            }
-        });
+                });
 
         for (PickingObjectDTO matchedObject : matchPickingObject) {
             MtbColt cloneMtbColt = (MtbColt) scannedUL.clone();
@@ -1004,7 +1007,8 @@ public class SpedizioneViewModel {
                             (x.getPartitaMag() == null || x.getMtbPartitaMag().getDataScad() == null ||
                                     UtilityDate.getNow().isBefore(x.getMtbPartitaMag().getDataScad())))
 
-                    .map(x -> new PartitaCommessaDTO() {{
+                    .map(x -> new PartitaCommessaDTO() {
+                        {
                             setCodJcom(x.getCodJcom());
                             setPartitaMag(x.getPartitaMag());
                             setDataScad(x.getMtbPartitaMag() != null ? x.getMtbPartitaMag().getDataScad() : null);
@@ -1057,11 +1061,11 @@ public class SpedizioneViewModel {
                             .filter(x ->
                                     x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
 
-                                    ((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag()))
-                                            || (x.getPartitaMag() == null && selected.getPartitaMag() == null)) &&
+                                            ((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag()))
+                                                    || (x.getPartitaMag() == null && selected.getPartitaMag() == null)) &&
 
-                                    ((x.getCodJcom() != null && selected.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(selected.getCodJcom()))
-                                            || (x.getCodJcom() == null && selected.getCodJcom() == null)))
+                                            ((x.getCodJcom() != null && selected.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(selected.getCodJcom()))
+                                                    || (x.getCodJcom() == null && selected.getCodJcom() == null)))
 
                             .findFirst()
                             .orElse(null);
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo.xml b/app/src/main/res/layout/dialog_info_situazione_articolo.xml
index 91045a0a..ca1b3783 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo.xml
@@ -35,18 +35,18 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-                    <TextView
+                    <com.google.android.material.chip.Chip
                         android:id="@+id/incoming_label"
-                        style="@style/TextAppearance.Material3.TitleMedium"
-                        android:background="@drawable/badge_round_corner"
-                        android:backgroundTint="@color/gray_200"
-                        android:textAllCaps="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
                         android:layout_gravity="center_horizontal"
-                        android:paddingHorizontal="12dp"
-                        android:text="In arrivo" />
+                        style="@style/TextAppearance.Material3.TitleMedium"
+                        android:text="In arrivo"
+                        android:textAllCaps="true"
+                        android:clickable="false"
+                        android:focusable="false"
+                        app:chipStrokeWidth="0dp"
+                        android:paddingHorizontal="12dp" />
 
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -59,19 +59,19 @@
                         tools:itemCount="1"
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-
-                    <TextView
+                    <com.google.android.material.chip.Chip
                         android:id="@+id/available_label"
-                        style="@style/TextAppearance.Material3.TitleMedium"
-                        android:textAllCaps="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/badge_round_corner"
-                        android:backgroundTint="@color/gray_200"
                         android:layout_gravity="center_horizontal"
+                        style="@style/TextAppearance.Material3.TitleMedium"
+                        android:text="In giacenza"
+                        android:textAllCaps="true"
+                        android:clickable="false"
+                        android:focusable="false"
+                        app:chipStrokeWidth="0dp"
                         android:layout_marginTop="8dp"
-                        android:paddingHorizontal="12dp"
-                        android:text="In giacenza" />
+                        android:paddingHorizontal="12dp" />
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/available_list"
diff --git a/app/src/main/res/layout/fragment_picking_libero.xml b/app/src/main/res/layout/fragment_picking_libero.xml
index 98c31219..0fb1eb0a 100644
--- a/app/src/main/res/layout/fragment_picking_libero.xml
+++ b/app/src/main/res/layout/fragment_picking_libero.xml
@@ -73,8 +73,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
-                    android:text="@string/free_picking_suggestion_1"
-                    android:textColor="@android:color/black" />
+                    android:text="@string/free_picking_suggestion_1" />
             </LinearLayout>
 
             <LinearLayout
@@ -87,14 +86,13 @@
                 app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
                 app:visibility="@{view.thereIsAnOpenULWithoutRows}">
 
-                <androidx.appcompat.widget.AppCompatTextView
+                <TextView
                     style="@style/TextAppearance.Material3.HeadlineSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
-                    android:text="@string/free_picking_suggestion_2"
-                    android:textColor="@android:color/black"/>
+                    android:text="@string/free_picking_suggestion_2"/>
             </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml
index 3220d6ce..5bd3c141 100644
--- a/app/src/main/res/layout/lista_picking_libero_list_model.xml
+++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml
@@ -47,7 +47,6 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{mtbColr.getDescrizione()}"
-            android:textColor="@android:color/black"
             android:textSize="16sp"
             app:layout_constraintEnd_toStartOf="@id/qta_guideline"
             app:layout_constraintStart_toStartOf="parent"

From 5ad4fd7821f800c188972d8fecef900d727d4f01 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 21 Nov 2025 13:32:10 +0100
Subject: [PATCH 2/2] -> v1.48.03 (543)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6a742bb6..7ec0fa90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 542
-    def appVersionName = '1.48.02'
+    def appVersionCode = 543
+    def appVersionName = '1.48.03'
 
     signingConfigs {
         release {