From e46cbca2a9800c76ddfd3c6f45a0b92b0b5c7fa5 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Thu, 20 Nov 2025 09:29:38 +0100
Subject: [PATCH] =?UTF-8?q?Durante=20il=20fast=20picking=20aggiunto=20bloc?=
 =?UTF-8?q?co=20se=20la=20quantit=C3=A0=20"da=20prelevare"=20risulti=20inf?=
 =?UTF-8?q?eriore=20al=20"totale=20disponibile"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DialogInputQuantityV2View.java            | 24 +++++++++++++------
 .../DialogInputQuantityV2ViewModel.java       | 15 ++++++++++--
 app/src/main/res/values-it/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
index 61144572..08b0e277 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
@@ -564,14 +564,24 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     }
 
     @Override
-    public void onWarning(String text, RunnableArgs<Boolean> result) {
+    public void onWarning(String text, Boolean showNegativeClick, RunnableArgs<Boolean> result) {
         handler.post(() -> {
-
-            DialogSimpleMessageView.makeWarningDialog(context, new SpannableString(Html.fromHtml(text)),
-                    null,
-                    () -> result.run(true),
-                    () -> result.run(false)
-            ).show();
+            if (showNegativeClick) {
+                DialogSimpleMessageView.makeWarningDialog(
+                        context,
+                        new SpannableString(Html.fromHtml(text)),
+                        null,
+                        () -> result.run(true),
+                        () -> result.run(false)
+                ).show();
+            } else {
+                DialogSimpleMessageView.makeWarningDialog(
+                        context,
+                        new SpannableString(Html.fromHtml(text)),
+                        null,
+                        () -> result.run(true)
+                ).show();
+            }
         });
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
index fe276b85..02ac4967 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
@@ -215,6 +215,12 @@ public class DialogInputQuantityV2ViewModel {
             } else if (ean128Model.Sscc != null) {
                 //Close current UDS and open another one with new SSCC
                 if (enableSSCCRead) {
+
+                    if (UtilityBigDecimal.lowerThan(totalNumCnfToBeTaken, totalNumCnfAvailable)){
+                        this.sendWarning(UtilityResources.getString(R.string.qta_to_be_taken_lower_then_qta_available), false);
+                        return;
+                    }
+
                     this.internalNextUlBarcode = barcodeScanDTO;
                     this.sendOnULCloseRequested();
                 }
@@ -674,7 +680,7 @@ public class DialogInputQuantityV2ViewModel {
             final FutureTask<Object> ft = new FutureTask<>(() -> {
             }, new Object());
             AtomicBoolean returnResult = new AtomicBoolean();
-            mListener.onWarning(text, result -> {
+            mListener.onWarning(text, true, result -> {
                 returnResult.set(result);
                 ft.run();
             });
@@ -745,12 +751,17 @@ public class DialogInputQuantityV2ViewModel {
         if (this.mListener != null) mListener.onULCloseRequested();
     }
 
+    private void sendWarning(String text, Boolean showNegativeClick) {
+        if (this.mListener != null) mListener.onWarning(text, showNegativeClick, result -> {
+        });
+    }
+
     public interface Listener extends ILoadingListener {
         void onDataChanged();
 
         void onError(Exception ex);
 
-        void onWarning(String text, RunnableArgs<Boolean> result);
+        void onWarning(String text, Boolean showNegativeClick, RunnableArgs<Boolean> result);
 
         void onULCloseRequested();
     }
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 41e94742..be489e7d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -225,6 +225,7 @@
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>
     <string name="confirm_anomalie"><![CDATA[Sono state riscontrate <b>%d</b> anomalie. Continuare?]]></string>
+    <string name="qta_to_be_taken_lower_then_qta_available"><![CDATA[La <b>quantità</b> da prelevare risulta inferiore alla <b>quantità</b> totale disponibile. <br> Chiudere manualmente la UL.]]></string>
 
     <string name="alert_delete_UL">Stai per eliminare una UL. Confermi?</string>
     <string name="alert_delete_mtb_colr">Stai per eliminare una riga. Confermi?</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 857c5e77..239f8d5d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -224,6 +224,7 @@
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>
     <string name="confirm_anomalie"><![CDATA[<b>%d</b> anomalies were found. To continue?]]></string>
+    <string name="qta_to_be_taken_lower_then_qta_available"><![CDATA[The <b>quantity</b> to be withdrawn is less than the total <b>quantity</b> available. Close the UL manually.]]></string>
 
     <string name="alert_delete_UL">Are you sure you want to delete this UL? Please confirm</string>
     <string name="alert_delete_mtb_colr">Are you sure to delete? Please confirm</string>