diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java index bdd51609..e7f137fa 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java @@ -23,8 +23,8 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call> call, Throwable t) { - Log.e("PrintCollo", t.toString()); - UtilityLogger.errorMe(new Exception(t)); + Log.e("GestSetup", t.toString()); + // UtilityLogger.errorMe(new Exception(t)); if(onFailed != null) onFailed.run(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java index ac90af2c..a5f6560e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java @@ -43,8 +43,14 @@ public class VenditaOrdineInevasoHelper { public List> getPickingListRaggruppataPerPosizione(List mPickingList, boolean forceHiddenCheck){ + for(int i = 0; i < mPickingList.size(); i++) { + mPickingList.get(i).setDeactivated(mPickingList.get(i).getQtaCollo().floatValue() == 0); + mPickingList.get(i).setHidden(false); + mPickingList.get(i).setTempHidden(false); + } List listOfKnownPositions = Stream.of(mPickingList) + .filter(x -> !x.isDeactivated()) .map(PickingObjectDTO::getPosizione) .distinctBy(x -> x) .withoutNulls() @@ -54,18 +60,12 @@ public class VenditaOrdineInevasoHelper { listOfKnownPositions.add(null); - String posizione = "Non disponibili al PICKING"; - for(int i = 0; i < mPickingList.size(); i++) { - mPickingList.get(i).setDeactivated(mPickingList.get(i).getQtaCollo().floatValue() == 0); - if(mPickingList.get(i).isDeactivated()) mPickingList.get(i).setPosizione(posizione); - } - listOfKnownPositions.add(posizione); List> groupedRighe = new ArrayList<>(); for (String position : listOfKnownPositions) { List tmpList = Stream.of(mPickingList) - .filter(x -> (x.getPosizione() == null && position == null) || + .filter(x -> !x.isDeactivated() && (x.getPosizione() == null && position == null) || (x.getPosizione() != null && x.getPosizione().equalsIgnoreCase(position))).toList(); for(int i = 0; i < tmpList.size(); i++){ @@ -83,6 +83,12 @@ public class VenditaOrdineInevasoHelper { } + List deactivatedItems = Stream.of(mPickingList) + .filter(PickingObjectDTO::isDeactivated) + .toList(); + + groupedRighe.add(deactivatedItems); + return groupedRighe; } @@ -99,8 +105,15 @@ public class VenditaOrdineInevasoHelper { VenditaOrdineInevasoListViewModel itemModel = new VenditaOrdineInevasoListViewModel(); - String posizione = UtilityString.isNullOrEmpty(currentGroup.get(0).getPosizione()) ? "N.A." : currentGroup.get(0).getPosizione(); - itemModel.descrizioneGroup = mContext.getResources().getText(R.string.position_text) + ": " + posizione; + String posizioneString = ""; + if(currentGroup.get(0).isDeactivated()) { + posizioneString = mContext.getResources().getText(R.string.picking_not_available).toString(); + } else { + posizioneString = mContext.getResources().getText(R.string.position_text) + ": " + (UtilityString.isNullOrEmpty(currentGroup.get(0).getPosizione()) ? "N.A." : currentGroup.get(0).getPosizione()); + } + + + itemModel.descrizioneGroup = posizioneString; itemModel.rows = new ArrayList<>(); for(int k = 0; k < currentGroup.size(); k++) { diff --git a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml index 802283f2..574fd228 100644 --- a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml +++ b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml @@ -27,6 +27,7 @@ android:layout_height="wrap_content" android:background="@android:color/white" android:orientation="vertical" - android:id="@+id/vendita_ordine_inevaso_main_list__group_item_container"> + android:id="@+id/vendita_ordine_inevaso_main_list__group_item_container"> + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 47beecda..c9cfd541 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -28,6 +28,7 @@ Evasi Questi permessi sono necessari al funzionamento dell\'app + Picking non disponibile Impostazioni diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae3af675..120cf76f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -83,6 +83,7 @@ Date Position Prepared by + Picking not available between 3 and 30 alphanumeric characters