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 { 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 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 9045830b..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,69 +2,51 @@ + android:layout_height="wrap_content" + android:padding="8dp"> + + + android:layout_toRightOf="@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" /> - - - + - - - + + - + \ No newline at end of file