From 664f92b26c4b2e25c6572d508b960a72c362d60e Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 13 Oct 2020 18:21:56 +0200
Subject: [PATCH] Fix vari

---
 .idea/runConfigurations/app_base.xml          |  2 +-
 .idea/runConfigurations/app_frudis.xml        |  2 +-
 .idea/runConfigurations/app_saporiveri.xml    |  2 +-
 .idea/runConfigurations/app_saporiveri_pv.xml |  2 +-
 .idea/runConfigurations/app_vglimenti.xml     |  2 +-
 .../integrywmsnative/core/model/MtbColt.java  |  4 +++
 .../AccettazionePickingActivity.java          |  8 ++---
 .../RettificaGiacenzeViewModel.java           | 30 +++++++++----------
 8 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.idea/runConfigurations/app_base.xml b/.idea/runConfigurations/app_base.xml
index b19e6ce1..17deda4c 100644
--- a/.idea/runConfigurations/app_base.xml
+++ b/.idea/runConfigurations/app_base.xml
@@ -6,7 +6,7 @@
     <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="DYNAMIC_FEATURES_DISABLED_LIST" value="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" />
diff --git a/.idea/runConfigurations/app_frudis.xml b/.idea/runConfigurations/app_frudis.xml
index 163ef97d..c68645f7 100644
--- a/.idea/runConfigurations/app_frudis.xml
+++ b/.idea/runConfigurations/app_frudis.xml
@@ -6,7 +6,7 @@
     <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="DYNAMIC_FEATURES_DISABLED_LIST" value="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" />
diff --git a/.idea/runConfigurations/app_saporiveri.xml b/.idea/runConfigurations/app_saporiveri.xml
index 45838a8e..6008ec76 100644
--- a/.idea/runConfigurations/app_saporiveri.xml
+++ b/.idea/runConfigurations/app_saporiveri.xml
@@ -6,7 +6,7 @@
     <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="DYNAMIC_FEATURES_DISABLED_LIST" value="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" />
diff --git a/.idea/runConfigurations/app_saporiveri_pv.xml b/.idea/runConfigurations/app_saporiveri_pv.xml
index bbd5d951..2f89b5f4 100644
--- a/.idea/runConfigurations/app_saporiveri_pv.xml
+++ b/.idea/runConfigurations/app_saporiveri_pv.xml
@@ -6,7 +6,7 @@
     <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="DYNAMIC_FEATURES_DISABLED_LIST" value="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" />
diff --git a/.idea/runConfigurations/app_vglimenti.xml b/.idea/runConfigurations/app_vglimenti.xml
index fa020eef..5593b71d 100644
--- a/.idea/runConfigurations/app_vglimenti.xml
+++ b/.idea/runConfigurations/app_vglimenti.xml
@@ -6,7 +6,7 @@
     <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="DYNAMIC_FEATURES_DISABLED_LIST" value="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" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
index de86c225..35d25e9b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
@@ -537,6 +537,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;
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
index b7278a46..f8ccfce9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
@@ -199,7 +199,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private List<AccettazioneListModel> convertDataModelToListModel(List<PickingObjectDTO> dataList) {
         List<PickingObjectDTO> tmpList = Stream.of(dataList)
-                .filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaOrd(), BigDecimal.ZERO))
+                .filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO))
                 .toList();
 
         List<AccettazioneListModel> sortedList = null;
@@ -243,7 +243,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     }
 
                     accettazioneListModel.setQtaEvasa(qtaEvasa);
-                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
+                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
 
                     if (x.getMtbAart() != null)
                         accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
@@ -280,7 +280,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     }
 
                     accettazioneListModel.setQtaEvasa(qtaEvasa);
-                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
+                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
 
                     if (x.getMtbAart() != null)
                         accettazioneListModel.setUntMis(x.getMtbAart().getUntMis());
@@ -318,7 +318,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     }
 
                     accettazioneListModel.setQtaEvasa(qtaEvasa);
-                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaOrd());
+                    accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
 
                     if (x.getMtbAart() != null) {
                         accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
index be2af4fe..cac53a97 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
@@ -317,7 +317,7 @@ public class RettificaGiacenzeViewModel {
 
         mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
-        if (!mIsCreatedLU) {
+        if (!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
             mtbColr
                     .setQtaCol(BigDecimal.ZERO)
                     .setNumCnf(BigDecimal.ZERO)
@@ -538,7 +538,7 @@ public class RettificaGiacenzeViewModel {
     private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
         this.sendOnLoadingStarted();
 
-        if(!mIsCreatedLU) {
+        if(!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
 
             this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
                     mtbColrToUpdate,
@@ -604,7 +604,19 @@ public class RettificaGiacenzeViewModel {
             if (shouldDelete) {
                 this.sendOnLoadingStarted();
 
-                if(mIsCreatedLU) {
+                if(!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) {
+                    this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
+                            mtbColrToDelete,
+                            BigDecimal.ZERO,
+                            BigDecimal.ZERO,
+                            savedMtbColr -> {
+                                this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
+                                this.sendOnLoadingEnded();
+                                this.sendOnRowSaved();
+                            },
+                            this::sendError
+                    );
+                } else {
                     MtbColt mtbColt = new MtbColt()
                             .setNumCollo(mtbColrToDelete.getNumCollo())
                             .setDataCollo(mtbColrToDelete.getDataColloS())
@@ -625,18 +637,6 @@ public class RettificaGiacenzeViewModel {
                         this.sendOnLoadingEnded();
 
                     }, this::sendError);
-                } else {
-                    this.mColliMagazzinoRESTConsumer.creaRettificaCollo(
-                            mtbColrToDelete,
-                            BigDecimal.ZERO,
-                            BigDecimal.ZERO,
-                            savedMtbColr -> {
-                                this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
-                                this.sendOnLoadingEnded();
-                                this.sendOnRowSaved();
-                            },
-                            this::sendError
-                    );
                 }
             }
         });