From 768f60d57c31078d16aa6664764a2986c6d9736e Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 26 Jun 2019 16:06:36 +0200
Subject: [PATCH 1/3] Aggiunta empty view per segnalare gli ordini in parte
 evasi

---
 .../layout/vendita_main_list_group_model.xml  | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/vendita_main_list_group_model.xml b/app/src/main/res/layout/vendita_main_list_group_model.xml
index 9045830b..885ba383 100644
--- a/app/src/main/res/layout/vendita_main_list_group_model.xml
+++ b/app/src/main/res/layout/vendita_main_list_group_model.xml
@@ -5,15 +5,22 @@
     android:layout_height="wrap_content">
 
 
+    <View
+        android:id="@+id/empty_view"
+        android:layout_width="6dp"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"/>
+
     <RelativeLayout
-        android:id="@+id/content"
+        android:id="@+id/vendita_main_list_group_item_container_root"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="8dp"
+        android:paddingStart="2dp"
+        android:paddingEnd="8dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingEnd="4dp"
-        android:layout_toStartOf="@id/exist_collo">
+        android:layout_toEndOf="@id/empty_view">
+
 
         <CheckBox
             android:id="@+id/vendita_main_list_group_item_container_checkBox"
@@ -43,28 +50,19 @@
                 android:maxLines="1"
                 android:textColor="#000"
                 android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
+                android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
 
 
             <LinearLayout
                 android:id="@+id/vendita_main_list_group_item_container_clienti_ord"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
                 android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord"
                 android:orientation="vertical">
             </LinearLayout>
         </RelativeLayout>
     </RelativeLayout>
 
-    <View
-        android:id="@+id/exist_collo"
-        android:layout_width="6dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignBottom="@id/content"
-        android:background="@color/red_400"/>
 
 
 </RelativeLayout>
\ No newline at end of file

From 6ce64c071f6dc7d008754d4255d529a572638546 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 27 Jun 2019 16:03:20 +0200
Subject: [PATCH 2/3] [BUGFIX] Risolto bug riguardo il picking corretto dei
 lotti dalle UL di Spedizione

---
 .../vendita/core/MainListVenditaAdapter.java  |  4 -
 .../VenditaOrdineInevasoViewModel.java        | 30 ++++---
 .../layout/vendita_main_list_group_model.xml  | 80 ++++++++-----------
 3 files changed, 50 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
index 9cbb5e1a..8c181855 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
@@ -145,10 +145,6 @@ public class MainListVenditaAdapter extends RecyclerView.Adapter<MainListVendita
                 //mOnGroupSelected.run(mDataset.get(finalPosition));
             });
 
-            final View existColloView = ordineView.findViewById(R.id.exist_collo);
-
-            // existColloView.setAlpha(ordine.isExistCollo() ? 1 : 0);
-
 
             TextView testataOrdTextView = ordineView.findViewById(R.id.vendita_main_list_group_item_container_testata_ord);
             String testataOrdString = String.format(mContext.getString(R.string.ord_ven_testata), String.valueOf(ordine.getNumero()), UtilityDate.formatDate(ordine.getData(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
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 789bfbcf..0c6e1606 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
@@ -655,18 +655,23 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     if(!anyMatch) {
                         matchPickingObjectByArt.remove(i);
                         i--;
-                    } else if(matchWithPartitaMag.size() == 1){
-                        MtbColr matchRow = matchWithPartitaMag.get(0);
+                    } else {
 
-                        PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
-                                .setBatchLot(matchRow.getPartitaMag())
-                                .setDataScad(matchRow.getDataScadPartitaD())
-                                .setNumCnf(matchRow.getNumCnf())
-                                .setQtaCnf(matchRow.getQtaCnf())
-                                .setQtaTot(matchRow.getQtaCol())
-                                .setSourceMtbColt(scannedUL);
+                        for(int k = 0; k < matchWithPartitaMag.size(); k++) {
 
-                        tmpPickObj.setTempPickData(pickData);
+
+                            MtbColr matchRow = matchWithPartitaMag.get(k);
+
+                            PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
+                                    .setBatchLot(matchRow.getPartitaMag())
+                                    .setDataScad(matchRow.getDataScadPartitaD())
+                                    .setNumCnf(matchRow.getNumCnf())
+                                    .setQtaCnf(matchRow.getQtaCnf())
+                                    .setQtaTot(matchRow.getQtaCol())
+                                    .setSourceMtbColt(scannedUL);
+
+                            tmpPickObj.setTempPickData(pickData);
+                        }
                     }
                 }
 
@@ -677,9 +682,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr())
                             .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
 
-                    if(matchWithColloRow.size() == 1){
-                        MtbColr matchRow = matchWithColloRow.get(0);
+                    for(int k = 0; k < matchWithColloRow.size(); k++) {
 
+
+                        MtbColr matchRow = matchWithColloRow.get(k);
                         PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
                                 .setBatchLot(matchRow.getPartitaMag())
                                 .setDataScad(matchRow.getDataScadPartitaD())
diff --git a/app/src/main/res/layout/vendita_main_list_group_model.xml b/app/src/main/res/layout/vendita_main_list_group_model.xml
index 885ba383..677ad4ce 100644
--- a/app/src/main/res/layout/vendita_main_list_group_model.xml
+++ b/app/src/main/res/layout/vendita_main_list_group_model.xml
@@ -2,67 +2,51 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:padding="8dp">
 
 
-    <View
-        android:id="@+id/empty_view"
-        android:layout_width="6dp"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"/>
+    <CheckBox
+        android:id="@+id/vendita_main_list_group_item_container_checkBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
     <RelativeLayout
-        android:id="@+id/vendita_main_list_group_item_container_root"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="2dp"
-        android:paddingEnd="8dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:layout_toEndOf="@id/empty_view">
+        android:layout_toRightOf="@id/vendita_main_list_group_item_container_checkBox"
+        android:layout_alignParentEnd="true">
 
-
-        <CheckBox
-            android:id="@+id/vendita_main_list_group_item_container_checkBox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <RelativeLayout
+        <TextView
+            android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox"
-            android:layout_alignParentEnd="true">
+            android:text="Cons 07 nov 2018"
+            android:layout_alignParentEnd="true"
+            android:textColor="#000" />
 
-            <TextView
-                android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Cons 07 nov 2018"
-                android:layout_alignParentEnd="true"
-                android:textColor="#000" />
-
-            <TextView
-                android:id="@+id/vendita_main_list_group_item_container_testata_ord"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Ord. Ven. 39 del 27 ott 2017"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="#000"
-                android:layout_alignParentStart="true"
-                android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
+        <TextView
+            android:id="@+id/vendita_main_list_group_item_container_testata_ord"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Ord. Ven. 39 del 27 ott 2017"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="#000"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
 
 
-            <LinearLayout
-                android:id="@+id/vendita_main_list_group_item_container_clienti_ord"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord"
-                android:orientation="vertical">
-            </LinearLayout>
-        </RelativeLayout>
+        <LinearLayout
+            android:id="@+id/vendita_main_list_group_item_container_clienti_ord"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord"
+            android:orientation="vertical">
+        </LinearLayout>
     </RelativeLayout>
 
 
 
+
 </RelativeLayout>
\ No newline at end of file

From bcd654efdc61ee877751fd9fc6f1b85e61608dc1 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 27 Jun 2019 21:31:38 +0200
Subject: [PATCH 3/3] -> v1.6.4(65)

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

diff --git a/app/build.gradle b/app/build.gradle
index c903b290..15cbb0ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 64
-    def appVersionName = '1.6.3'
+    def appVersionCode = 65
+    def appVersionName = '1.6.4'
 
     signingConfigs {
         release {