diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java index f84225e9..7216625c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java @@ -47,7 +47,7 @@ public class PickingObjectDTO implements Parcelable { private Boolean tempHidden = null; private PickData tempPickData = null; - private List withdrawRows = new ArrayList<>(); + private ArrayList withdrawRows = new ArrayList<>(); protected PickingObjectDTO(Parcel in) { if (in.readByte() == 0) { @@ -423,11 +423,12 @@ public class PickingObjectDTO implements Parcelable { return this; } - public List getWithdrawRows() { + public ArrayList getWithdrawRows() { + if(withdrawRows == null) withdrawRows = new ArrayList<>(); return withdrawRows; } - public PickingObjectDTO setWithdrawRows(List withdrawRows) { + public PickingObjectDTO setWithdrawRows(ArrayList withdrawRows) { this.withdrawRows = withdrawRows; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java index 91e32670..6eb0277c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java @@ -45,9 +45,9 @@ public class VenditaOrdineInevasoActivity extends AppCompatActivity { FragmentArticoliInColloBottomSheetBinding bindings = this.bindings.bottomSheetInclude; mArticoliInColloBottomSheetViewModel = new ArticoliInColloBottomSheetViewModel(this, bindings); - List pickingList = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList")); - List testateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini")); - List colliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati")); + ArrayList pickingList = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList")); + ArrayList testateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini")); + ArrayList colliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati")); mVenditaOrdineInevasoViewModel = new VenditaOrdineInevasoViewModel( this, mArticoliInColloBottomSheetViewModel, pickingList, testateOrdini, colliRegistrati); diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml index b057bd18..601d25f3 100644 --- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml +++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml @@ -37,6 +37,18 @@ tools:text="COD MART" /> + + +