Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BUGFIX] Risolto bug riguardo il picking corretto dei lotti dalle UL di Spedizione

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-06-27 16:03:20 +02:00
parent 768f60d57c
commit 6ce64c071f
3 changed files with 50 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
View File

@ -145,10 +145,6 @@ public class MainListVenditaAdapter extends RecyclerView.Adapter<MainListVendita
//mOnGroupSelected.run(mDataset.get(finalPosition)); //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); 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)); 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));

14
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@ -655,8 +655,12 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
if(!anyMatch) { if(!anyMatch) {
matchPickingObjectByArt.remove(i); matchPickingObjectByArt.remove(i);
i--; i--;
} else if(matchWithPartitaMag.size() == 1){ } else {
MtbColr matchRow = matchWithPartitaMag.get(0);
for(int k = 0; k < matchWithPartitaMag.size(); k++) {
MtbColr matchRow = matchWithPartitaMag.get(k);
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
.setBatchLot(matchRow.getPartitaMag()) .setBatchLot(matchRow.getPartitaMag())
@ -669,6 +673,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
tmpPickObj.setTempPickData(pickData); tmpPickObj.setTempPickData(pickData);
} }
} }
}
} else { } else {
for (int i = 0; i < matchPickingObjectByArt.size(); i++) { for (int i = 0; i < matchPickingObjectByArt.size(); i++) {
@ -677,9 +682,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr()) List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList(); .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
if(matchWithColloRow.size() == 1){ for(int k = 0; k < matchWithColloRow.size(); k++) {
MtbColr matchRow = matchWithColloRow.get(0);
MtbColr matchRow = matchWithColloRow.get(k);
PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
.setBatchLot(matchRow.getPartitaMag()) .setBatchLot(matchRow.getPartitaMag())
.setDataScad(matchRow.getDataScadPartitaD()) .setDataScad(matchRow.getDataScadPartitaD())

26
app/src/main/res/layout/vendita_main_list_group_model.xml
View File

@ -2,24 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
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/vendita_main_list_group_item_container_root"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="2dp" android:padding="8dp">
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_toEndOf="@id/empty_view">
<CheckBox <CheckBox
@ -30,7 +14,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox" android:layout_toRightOf="@id/vendita_main_list_group_item_container_checkBox"
android:layout_alignParentEnd="true"> android:layout_alignParentEnd="true">
<TextView <TextView
@ -49,8 +33,8 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="#000" android:textColor="#000"
android:layout_alignParentStart="true" android:layout_alignParentLeft="true"
android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"/> android:layout_toLeftOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
<LinearLayout <LinearLayout
@ -61,7 +45,7 @@
android:orientation="vertical"> android:orientation="vertical">
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout>