Finish v1.30.13(331)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 328
-    def appVersionName = '1.30.10'
+    def appVersionCode = 331
+    def appVersionName = '1.30.13'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest;
 
+import android.os.Build;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -59,20 +61,14 @@ public class RESTBuilder {
 
         String endpoint = "http://" + host + ":" + port + "/" + (addEmsApi ? "ems-api/" : "");
 
-        Gson gson = new GsonBuilder()
-                .setDateFormat("dd/MM/yyyy HH:mm:ss")
-                .registerTypeAdapter(LocalDate.class, new LocalDateDeserializer())
-                .registerTypeAdapter(LocalDate.class, new LocalDateSerializer())
-                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeDeserializer())
-                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
-                .excludeFieldsWithModifiers(Modifier.TRANSIENT)
-                .create();
 
-        Retrofit retrofit = new Retrofit.Builder()
-                .addConverterFactory(GsonConverterFactory.create(gson))
-                .baseUrl(endpoint)
-                .client(client)
-                .build();
+        GsonBuilder builder = new GsonBuilder().setDateFormat("dd/MM/yyyy HH:mm:ss").excludeFieldsWithModifiers(Modifier.TRANSIENT);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder.registerTypeAdapter(LocalDate.class, new LocalDateDeserializer()).registerTypeAdapter(LocalDate.class, new LocalDateSerializer()).registerTypeAdapter(LocalDateTime.class, new LocalDateTimeDeserializer()).registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer());
+        }
+        Gson gson = builder.create();
+
+        Retrofit retrofit = new Retrofit.Builder().addConverterFactory(GsonConverterFactory.create(gson)).baseUrl(endpoint).client(client).build();
 
         return retrofit.create(service);
     }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -611,15 +611,9 @@ public class SpedizioneViewModel {
                         .findFirst()
                         .orElse(null);
 
-                final List<MtbColr> mtbColrs = Stream.of(pickingObjectDTO.getMtbColts())
-                        .filter(x -> x.getPosizione().equalsIgnoreCase(mtbDepoPosizione.getPosizione()))
-                        .flatMap(x -> Stream.of(x.getMtbColr()))
-                        .filter(x -> x.getCodMart().equalsIgnoreCase(selectedArt.getCodMart()))
-                        .toList();
-
                 MagazzinoAutomaticoPickItemRequestDTO itemDto = new MagazzinoAutomaticoPickItemRequestDTO(selectedArt.getCodMart())
-                        .setQtaTot(Stream.of(mtbColrs).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add))
-                        .setNumCnf(Stream.of(mtbColrs).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add))
+                        .setQtaTot(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd())
+                        .setNumCnf(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd())
                         .setUntMis(selectedArt.getUntMis());
 
                 magazzinoAutomaticoPickItemRequestDTOList.add(itemDto);
@@ -1200,13 +1194,13 @@ public class SpedizioneViewModel {
     }
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
-        final List<CreateUDSRequestOrderDTO> orders = this.mTestateOrdini.stream()
+        final List<CreateUDSRequestOrderDTO> orders = Stream.of(this.mTestateOrdini)
                 .map(x -> new CreateUDSRequestOrderDTO()
                         .setDataCons(UtilityDate.toLocalDate(x.getDataConsD()))
                         .setDataOrd(UtilityDate.toLocalDate(x.getDataOrdD()))
                         .setGestione(x.getGestione())
                         .setNumOrd(x.getNumOrd()))
-                .collect(Collectors.toList());
+                .toList();
 
         final CreateUDSRequestDTO createUDSRequestDTO = new CreateUDSRequestDTO()
                 .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
@@ -1493,7 +1487,7 @@ public class SpedizioneViewModel {
                                     positionedMtbColts -> {
 
                                         this.askPrint(shouldPrint, positionedMtbColts, () -> {
-                                            positionedMtbColts.stream()
+                                            Stream.of(positionedMtbColts)
                                                     .filter(x -> !this.mColliRegistrati.contains(x))
                                                     .forEach(x -> this.mColliRegistrati.add(x));
 
@@ -1728,7 +1722,7 @@ public class SpedizioneViewModel {
     private void postCloseOperations(List<MtbColt> mtbColtList) {
         if (mTestateOrdini != null) {
             for (MtbColt mtbColt : mtbColtList) {
-                mTestateOrdini.stream()
+                Stream.of(mTestateOrdini)
                         .filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrdD().equals(mtbColt.getDataOrdD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum())
                         .forEach(x -> x.setExistColloBoolean(true));
             }
@@ -1764,6 +1758,8 @@ public class SpedizioneViewModel {
                 pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>());
             }
         }
+
+        this.mCurrentMtbColt = null;
     }
 
     public void resetMatchedRows() {

app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java

@@ -257,13 +257,15 @@ public class UltimiArriviFornitoreFragment extends BaseFragment implements ITitl
 
         DialogChooseArtsFromMtbColrList
                 .newInstance(scannedMtbColt.getMtbColr(), items -> {
+                    List<MtbAart> mtbAarts = new ArrayList<>();
 
-                    List<MtbAart> mtbAarts = Stream.of(items)
-                            .map(MtbColr::getMtbAart)
-                            .toList();
+                    if(items != null && !items.isEmpty()) {
+                        mtbAarts = Stream.of(items)
+                                .map(MtbColr::getMtbAart)
+                                .toList();
+                    }
 
                     filterItems(mtbAarts);
-
                 }, null)
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }

app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java

@@ -171,7 +171,11 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
     public void onArtsChooseRequired(List<MtbColr> mtbColrList, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
         this.requireActivity().runOnUiThread(() -> {
             DialogChooseArtsFromMtbColrList
-                    .newInstance(mtbColrList, onComplete, onAbort)
+                    .newInstance(mtbColrList, data -> {
+                        if(data == null || data.isEmpty()) {
+                            onAbort.run();
+                        } else onComplete.run(data);
+                    }, onAbort)
                     .show(requireActivity().getSupportFragmentManager(), "tag");
         });
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java

@@ -122,10 +122,10 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen
                             .map(DialogChooseArtsFromMtbColrListItemModel::getMtbColr)
                             .toList();
 
-                    if (selectedArts.isEmpty()) {
-                        if (this.onAbort != null) this.onAbort.run();
-                        return;
-                    }
+//                    if (selectedArts.isEmpty()) {
+//                        if (this.onAbort != null) this.onAbort.run();
+//                        return;
+//                    }
 
                     if (this.onConfirmed != null)
                         this.onConfirmed.run(selectedArts);