[BUG] Sistemati error message in alcuni servizi REST.

[FEAT] Nuove implementazione in UltimeConsegne.

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java

@@ -185,96 +185,6 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         }
     };
 
-//    private void groupOrdiniAndMakeRecycler(List<OrdineAccettazioneInevasoDTO> ordini){
-//
-//        for(OrdineAccettazioneInevasoDTO ordine : ordini){
-//            if(UtilityString.isNullOrEmpty(ordine.getCodJcom()) || ordine.getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)){
-//                ordine.setCodJcom(CommonConst.Config.COMMESSA_MAG);
-//                ordine.setDescrizioneCom("MAGAZZINO");
-//            }
-//        }
-//
-//        groupedOrdiniInevasi = new ArrayList<>();
-//
-//        //Splitto gli ordini per codAnagClie
-//        List<OrdineAccettazioneGroupedInevasoDTO> groupedOrdini = Stream.of(ordini)
-//                .map(x -> {
-//                    OrdineAccettazioneGroupedInevasoDTO groupedOrdine = new OrdineAccettazioneGroupedInevasoDTO();
-//
-//                    groupedOrdine.codAnagForn = x.getCodAnagOrd();
-//                    groupedOrdine.nomeFornitore = x.getRagSocOrd();
-//                    groupedOrdine.ordini = new ArrayList<>();
-//
-//                    return groupedOrdine;
-//                })
-//                .distinctBy(x -> x.codAnagForn + "_" + x.nomeFornitore)
-//                .sortBy(x -> x.nomeFornitore)
-//        .toList();
-//
-//
-//         Stream.of(groupedOrdini).forEach(groupedOrdine -> {
-//
-//
-//            //Splitto gli ordini di ogni fornitore per data e numero
-//            List<OrdineAccettazioneGroupedInevasoDTO.Ordine> tmpOrd = Stream.of(ordini)
-//                    .filter(x -> x.getCodAnagOrd().equals(groupedOrdine.codAnagForn))
-//
-//                    .sortBy(x -> x.getDataConsD() != null ? x.getDataConsD() : new Date(2000, 01, 01))
-//                    .map(x -> {
-//
-//                        OrdineAccettazioneGroupedInevasoDTO.Ordine rigaOrdine = new OrdineAccettazioneGroupedInevasoDTO.Ordine();
-//
-//                        rigaOrdine.data = x.getData();
-//                        rigaOrdine.numero = x.getNumero();
-//                        rigaOrdine.gestione = x.getGestione();
-//                        rigaOrdine.codAnagOrd = x.getCodAnagOrd();
-//                        rigaOrdine.ragSocOrd = x.getRagSocOrd();
-//                        rigaOrdine.pesoTotale = x.getPesoTotale();
-//                        rigaOrdine.barcode = x.getBarcode();
-//                        rigaOrdine.termCons = x.getTermCons();
-//                        rigaOrdine.dataCons = x.getDataConsS();
-//                        rigaOrdine.rifOrd = x.getRifOrd();
-//                        rigaOrdine.clienti = new ArrayList<>();
-//
-//                        return rigaOrdine;
-//                    })
-//                    .distinctBy(x -> x.barcode)
-//                    .toList();
-//
-//
-//                    Stream.of(tmpOrd)
-//                            .forEach(rigaOrdine -> {
-//
-//                                Stream.of(ordini)
-//                                        .filter(x ->
-//                                                    x.getCodAnagOrd().equals(rigaOrdine.codAnagOrd) &&
-//                                                    x.getNumero() == rigaOrdine.numero &&
-//                                                    x.getData().equals(rigaOrdine.data))
-//                                        .forEach(x -> {
-//                                            OrdineAccettazioneGroupedInevasoDTO.Cliente cliente = new OrdineAccettazioneGroupedInevasoDTO.Cliente();
-//
-//                                            cliente.codJcom = x.getCodJcom();
-//                                            cliente.ragSocCom = x.getRagSocCom();
-//                                            cliente.descrCom = x.getDescrizioneCom();
-//                                            cliente.dataCons = x.getDataConsS();
-//                                            cliente.numCnf = x.getNumCnf();
-//                                            cliente.rifOrd = x.getRifOrd();
-//
-//                                            rigaOrdine.clienti.add(cliente);
-//                                        });
-//
-//
-//                        groupedOrdine.ordini.add(rigaOrdine);
-//
-//                    });
-//
-//            groupedOrdiniInevasi.add(groupedOrdine);
-//        });
-//
-//        mAdapter = new MainListAccettazioneAdapter(getActivity(), groupedOrdiniInevasi, onGroupSelectionChanged);
-//        mBinding.accettazioneMainList.setAdapter(mAdapter);
-//    }
-
     private void onAccettazioneMainFabClick() {
 
         List<OrdineAccettazioneInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
@@ -332,23 +242,6 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
     }
 
-//    private RunnableArgs<OrdineAccettazioneGroupedInevasoDTO> onGroupSelectionChanged = dto -> {
-//        List<OrdineAccettazioneGroupedInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
-//
-//        if(selectedOrders != null && selectedOrders.size() > 1){
-//            for (OrdineAccettazioneGroupedInevasoDTO selectedOrder : selectedOrders) {
-//                if(!dto.codAnagForn.equalsIgnoreCase(selectedOrder.codAnagForn)) {
-//                    Stream.of(selectedOrder.ordini).forEach(x -> x.setCheckbox(false));
-//                }
-//            }
-//        }
-//
-//        if(selectedOrders.size() > 0) mBinding.accettazioneMainFab.show();
-//        else mBinding.accettazioneMainFab.hide();
-//    };
-
-
-
 
     @Override
     public void onSearchEnabled() {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java

@@ -50,7 +50,7 @@ public class AccettazioneHelper {
                             callback.onLoadSuccess(response.body().getDto());
                         } else {
                             Log.e("Accettazione", response.body().getErrorMessage());
-                            callback.onLoadFail(new Exception(response.message()));
+                            callback.onLoadFail(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Accettazione", response.message());
@@ -97,7 +97,7 @@ public class AccettazioneHelper {
                             onComplete.run(dto);
                         } else {
                             Log.e("Accettazione", response.body().getErrorMessage());
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Accettazione", response.message());

app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java

@@ -120,7 +120,7 @@ public class ProdOrdineLavorazioneHelper {
                         } else {
                             Log.e("Ord Lavorazione", response.body().getErrorMessage());
                             UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Ord Lavorazione", response.message());

app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java

@@ -43,7 +43,7 @@ public class OrdineProduzioneHelper {
                             onComplete.run(response.body().getDto());
                         } else {
                             Log.e("Accettazione", response.body().getErrorMessage());
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Accettazione", response.message());
@@ -91,7 +91,7 @@ public class OrdineProduzioneHelper {
                             onComplete.run(dto);
                         } else {
                             Log.e("Produzione", response.body().getErrorMessage());
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Produzione", response.message());

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java

@@ -105,7 +105,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
         holder.binding.codMart.setText(ul.getCodMart());
         holder.binding.descrizione.setText(ul.getDescrizioneArt());
         holder.binding.numCollo.setText(String.valueOf(ul.getNumCollo()));
-        holder.binding.partitaMag.setText(ul.getPartitaMag());
+        holder.binding.partitaMag.setText("(" + ul.getPartitaMag() + ")");
 
         holder.binding.qtaVersata.setText(String.valueOf(ul.getQtaCol()));
         holder.binding.untMisQtaVersata.setText(ul.getUntMis());

app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java

@@ -110,7 +110,7 @@ public class VenditaHelper {
                         } else {
                             Log.e("Vendita", response.body().getErrorMessage());
                             UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                            callback.onLoadFail(new Exception(response.message()));
+                            callback.onLoadFail(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Vendita", response.message());

app/src/main/res/layout/prod_recupero_materiale_list_header.xml

@@ -20,7 +20,7 @@
             android:textSize="16sp"
             android:textStyle="bold"
             android:textAllCaps="true"
-            android:textColor="@color/gray_600"
+            android:textColor="@color/colorPrimary"
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"/>

app/src/main/res/layout/prod_recupero_materiale_list_item.xml

@@ -6,38 +6,50 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/white"
-        android:paddingTop="4dp"
+        android:paddingTop="8dp"
-        android:paddingBottom="4dp">
+        android:paddingBottom="8dp">
 
         <LinearLayout
             android:id="@+id/left_content"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_alignParentStart="true"
-            android:layout_toStartOf="@id/right_content"
             android:paddingEnd="8dp">
 
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="-8dp"
+                    android:text="@string/logistic_unit"/>
+
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/num_collo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     tools:text="22"
                     android:textColor="@android:color/black"
+                    android:textStyle="bold"
                     android:textSize="22sp"
-                android:layout_gravity="center_vertical"
+                    android:layout_gravity="center_vertical"/>
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"/>
 
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="wrap_content">
-                    android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/cod_mart"
@@ -55,29 +67,20 @@
                         android:textColor="@color/gray_700"
                         tools:text="Lotto articolo"
                         android:layout_marginStart="4dp"
+                        android:layout_toEndOf="@id/cod_mart"
+                        android:layout_toStartOf="@id/right_content"
+                        android:layout_alignBottom="@id/cod_mart"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        android:layout_marginEnd="6dp"
                         />
 
-                </LinearLayout>
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/descrizione"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/gray_700"
-                    tools:text="Descrizione estesa articolo"
-                    />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
                     <RelativeLayout
                         android:id="@+id/right_content"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-            android:layout_alignTop="@id/left_content"
+                        android:layout_alignBottom="@id/cod_mart"
-            android:layout_alignBottom="@id/left_content"
                         android:paddingEnd="8dp">
 
                         <androidx.appcompat.widget.LinearLayoutCompat
@@ -105,4 +108,22 @@
 
                 </RelativeLayout>
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/descrizione"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/gray_700"
+                    tools:text="Descrizione estesa articolo"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+
+    </RelativeLayout>
+
 </layout>

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

@@ -26,6 +26,7 @@
     <string name="abort">Annulla</string>
     <string name="reset">Resetta</string>
     <string name="dispatched_abbr">Evasi</string>
+    <string name="logistic_unit">UL</string>
 
     <string name="permission_request_message">Questi permessi sono necessari al funzionamento dell\'app</string>
     <string name="picking_not_available">Picking non disponibile</string>
@@ -51,6 +52,8 @@
     <string name="confirm">Conferma</string>
     <string name="hint_additional_notes">Note Aggiuntive</string>
     <string name="dialog_message_additional_notes">Inserisci eventuali note aggiuntive della tua UL</string>
+    <string name="lu_scan_not_granted_here">Non è possibile scansionare il barcode di una UL adesso</string>
+    <string name="lu_already_attache_to_doc">L\'UL selezionata è già agganciata ad un documento per cui non può essere utilizzata</string>
 
     <string name="warehouse">Magazzino</string>
 

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

@@ -49,6 +49,7 @@
     <string name="confirm">Confirm</string>
     <string name="hint_additional_notes">Additional notes</string>
     <string name="dialog_message_additional_notes">Enter any additional notes in your logistics unit</string>
+    <string name="logistic_unit">LU</string>
 
 
     <!-- SETTINGS -->
@@ -204,6 +205,8 @@
     <string name="error_no_gest_found">Can\'t load current order type</string>
     <string name="error_multiple_cod_mdep_ordv">Can\'t load orders of different deposits</string>
     <string name="error_multiple_cod_jfas_ordp">The <b>production line</b> will not be saved because you are selecting orders for different productions</string>
+    <string name="lu_scan_not_granted_here">Logistics Unit\'s barcode is not accepted at this moment</string>
+    <string name="lu_already_attache_to_doc">Selected LU is already attached to a document hence can\'t be opened</string>
 
     <string name="recovering_data">Recovering data</string>
     <string name="wait_a_moment">Wait a moment</string>