From cc7c41d177e4ea2f7b7bfc29c241323ef0168efd Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 17 Dec 2019 12:59:31 +0100
Subject: [PATCH] Creato flag per abilitare / disabilitare la richiesta del
 peso in fase di chiusura UL

---
 .../core/settings/DBSettingsModel.java        | 10 +++++
 .../core/settings/SettingsManager.java        |  5 +++
 .../VenditaOrdineInevasoViewModel.java        | 43 +++++++++++--------
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index ad60d10f..77dbcc5b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -26,6 +26,7 @@ public class DBSettingsModel {
     private boolean flagCanAutoOpenNewULAccettazione;
     private boolean flagCanAddExtraQuantitySpedizione;
     private boolean flagEnableCheckDepositoSpedizione;
+    private boolean flagAskPesoColloSpedizione;
     private boolean flagForceAllToColli;
 
     public List<String> getAvailableProfiles() {
@@ -152,6 +153,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagAskPesoColloSpedizione() {
+        return flagAskPesoColloSpedizione;
+    }
+
+    public DBSettingsModel setFlagAskPesoColloSpedizione(boolean flagAskPesoColloSpedizione) {
+        this.flagAskPesoColloSpedizione = flagAskPesoColloSpedizione;
+        return this;
+    }
+
     public boolean isFlagForceAllToColli() {
         return flagForceAllToColli;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index bf64b2a7..746cfbfb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -222,6 +222,10 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SETUP")
                 .setKeySection("FLAG_FORCE_ALL_TO_COLLI"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("FLAG_ASK_PESO_COLLO"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@@ -236,6 +240,7 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class));
             dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list, "ENABLE_CHECK_DEPOSITO", Boolean.class));
             dbSettingsModelIstance.setFlagForceAllToColli(getValueFromList(list, "FLAG_FORCE_ALL_TO_COLLI", Boolean.class));
+            dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "FLAG_ASK_PESO_COLLO", Boolean.class));
 
             if(onComplete != null) onComplete.run();
         }, onFailed);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
index 31d0c050..90ea0cdb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
@@ -868,24 +868,33 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             ColliMagazzinoRESTConsumer.doesColloContainsAnyRow(currentMtbColt, containRows -> {
 
                 if(containRows) {
-                    DialogInputPeso.make(mActivity, currentMtbColt.getCodTcol(), currentMtbColt.getPesoNettoKg(), currentMtbColt.getPesoKg(), (newCodTcol, newNetWeight, newGrossWeight) -> {
-
-                        currentMtbColt.setCodTcol(newCodTcol);
-                        currentMtbColt.setPesoNettoKg(newNetWeight);
-                        currentMtbColt.setPesoKg(newGrossWeight);
-
+                    Runnable saveAction = () -> {
                         ColliMagazzinoRESTConsumer.updateDataFine(
-                            mActivity,
-                            progress,
-                            currentMtbColt,
-                            () -> distribuisciCollo(progress, (generatedMtbColts) -> {
-                                if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete);
-                                else {
-                                    postCloseOperations(generatedMtbColts, onComplete);
-                                    progress.dismiss();
-                                }
-                            }));
-                    }).show();
+                                mActivity,
+                                progress,
+                                currentMtbColt,
+                                () -> distribuisciCollo(progress, (generatedMtbColts) -> {
+                                    if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete);
+                                    else {
+                                        postCloseOperations(generatedMtbColts, onComplete);
+                                        progress.dismiss();
+                                    }
+                                }));
+                    };
+
+                    if(SettingsManager.iDB().isFlagAskPesoColloSpedizione()) {
+
+                        DialogInputPeso.make(mActivity, currentMtbColt.getCodTcol(), currentMtbColt.getPesoNettoKg(), currentMtbColt.getPesoKg(), (newCodTcol, newNetWeight, newGrossWeight) -> {
+
+                            currentMtbColt.setCodTcol(newCodTcol);
+                            currentMtbColt.setPesoNettoKg(newNetWeight);
+                            currentMtbColt.setPesoKg(newGrossWeight);
+
+                            saveAction.run();
+                        }).show();
+                    } else {
+                        saveAction.run();
+                    }
                 } else {
                     if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
                     deleteCollo(progress, onComplete);