Sistemata logica di articolo non disponibili al picking di Spedizione

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<ServiceRESTResponse<GestSetupDTO>> call, Throwable t) {
-                Log.e("PrintCollo", t.toString());
+                Log.e("GestSetup", t.toString());
-                UtilityLogger.errorMe(new Exception(t));
+                // UtilityLogger.errorMe(new Exception(t));
                 if(onFailed != null) onFailed.run(new Exception(t));
             }
         });

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java

@@ -43,8 +43,14 @@ public class VenditaOrdineInevasoHelper {
     public List<List<PickingObjectDTO>> getPickingListRaggruppataPerPosizione(List<PickingObjectDTO> 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<String> 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<List<PickingObjectDTO>> groupedRighe = new ArrayList<>();
         for (String position : listOfKnownPositions) {
 
             List<PickingObjectDTO> 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<PickingObjectDTO> 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();
+            String posizioneString = "";
-            itemModel.descrizioneGroup = mContext.getResources().getText(R.string.position_text) + ": " + posizione;
+            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++) {

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"> </LinearLayout>
+            android:id="@+id/vendita_ordine_inevaso_main_list__group_item_container">
+        </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/values-it/strings.xml

@@ -28,6 +28,7 @@
     <string name="dispatched_abbr">Evasi</string>
 
     <string name="permission_request_message">Questi permessi sono necessari al funzionamento dell\'app</string>
+    <string name="picking_not_available">Picking non disponibile</string>
 
 
     <string name="action_settings">Impostazioni</string>

app/src/main/res/values/strings.xml

@@ -83,6 +83,7 @@
     <string name="date_text">Date</string>
     <string name="position_text">Position</string>
     <string name="prepared_by_text">Prepared by</string>
+    <string name="picking_not_available">Picking not available</string>
 
 
     <string name="password_error_length">between 3 and 30 alphanumeric characters</string>