From 2c98297ee7075f23238f4b9a48035c2f6385c54a Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 17 Sep 2019 19:09:17 +0200
Subject: [PATCH] [BUG] Implementato controllo in vendita che la partita non
 sia nulla.

---
 .idea/caches/build_file_checksums.ser         | Bin 1020 -> 1020 bytes
 .idea/runConfigurations/app.xml               |   2 +-
 app/build.gradle                              |   4 ++--
 .../VenditaOrdineInevasoViewModel.java        |  21 ++++++++++--------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 894b25ac9a8095f34126ff04022f731859a6f6d7..2d8d9e21b117b845f0a1bfa200633d9a3c0c0a83 100644
GIT binary patch
delta 54
zcmV-60LlOS2mA++m;^vGc}20DZUK`^0zH!o0zm{2VQ_GhUji2pE-hCys%6mS2)L)J
MH-_a+v$Fz80Ts6s=>Px#

delta 65
zcmV-H0KWhH2mA++m;@$a^Zc=#ZUK`=0zn2KdSzmAVUtk;C6hG*5(E%oaB!1f0v8Zo
XOX^vT9$Zz6&E^-z&w!4zvjRy0I|dmA

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index fc9d4646..bf2ef1a7 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.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_vgalimenti" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_frudis,dynamic_ime,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
diff --git a/app/build.gradle b/app/build.gradle
index a2592cd6..14ab6024 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 81
-    def appVersionName = '1.7.4'
+    def appVersionCode = 82
+    def appVersionName = '1.7.5'
 
     signingConfigs {
         release {
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 6764563d..1277c9a5 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
@@ -751,7 +751,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         if(SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
             List<PickingObjectDTO> matchWithPartitaMag = Stream.of(matchPickingObject)
                     .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()) &&
-                            (pickData != null && Objects.equals(x.getPartitaMag(), pickData.getMtbPartitaMag().getPartitaMag()))).toList();
+                            (pickData != null && pickData.getMtbPartitaMag() != null && Objects.equals(x.getPartitaMag(), pickData.getMtbPartitaMag().getPartitaMag()))).toList();
 
             matchPickingObject = matchWithPartitaMag;
 
@@ -1125,16 +1125,19 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             if(item.getTempPickData() != null) {
                 PickingObjectDTO.PickData tmpPickData = item.getTempPickData();
 
-                if(!UtilityString.isNullOrEmpty(tmpPickData.getMtbPartitaMag().getPartitaMag())) {
-                    dto.setBatchLot(tmpPickData.getMtbPartitaMag().getPartitaMag());
-                }
+                if(tmpPickData.getMtbPartitaMag() != null) {
 
-                if(tmpPickData.getMtbPartitaMag().getDataScadD() != null){
-                    dto.setDataScad(tmpPickData.getMtbPartitaMag().getDataScadD());
-                    dto.setShouldAskDataScad(true);
-                }
+                    if (!UtilityString.isNullOrEmpty(tmpPickData.getMtbPartitaMag().getPartitaMag())) {
+                        dto.setBatchLot(tmpPickData.getMtbPartitaMag().getPartitaMag());
+                    }
 
-                batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A");
+                    if (tmpPickData.getMtbPartitaMag().getDataScadD() != null) {
+                        dto.setDataScad(tmpPickData.getMtbPartitaMag().getDataScadD());
+                        dto.setShouldAskDataScad(true);
+                    }
+
+                    batchLotEnabled = tmpPickData.getMtbPartitaMag().getFlagStato().equalsIgnoreCase("A");
+                }
 
                 boolean useQtaDaEvadere;