Merge branch 'feature/RefactoringGestioneColli' into master-beta

app/build.gradle

@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 549
-    def appVersionName = '1.50.00'
+    def appVersionCode = 550
+    def appVersionName = '1.50.01'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java

@@ -817,7 +817,13 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
                             this.mViewModel.resetMatchedRows();
                             return;
                         }
-                        PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO().setNumCnf(resultDTO.getNumCnf()).setQtaCnf(resultDTO.getQtaCnf()).setQtaTot(resultDTO.getQtaTot()).setPartitaMag(resultDTO.getPartitaMag()).setDataScad(resultDTO.getDataScad());
+                        PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+                                .setNumCnf(resultDTO.getNumCnf())
+                                .setQtaCnf(resultDTO.getQtaCnf())
+                                .setQtaTot(resultDTO.getQtaTot())
+                                .setPartitaMag(resultDTO.getPartitaMag())
+                                .setDataScad(resultDTO.getDataScad())
+                                .setShouldCloseLu(resultDTO.isShouldCloseLu());
                         onComplete.run(pickedQuantityDTO, pickedQuantityDTO.isShouldCloseLu());
                     })
                     .show(getSupportFragmentManager(), "tag");

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java

@@ -13,7 +13,9 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -767,22 +769,24 @@ public class AccettazioneOrdiniPickingViewModel {
             if (!shouldDelete)
                 return;
 
-            this.sendOnLoadingStarted();
+        this.sendOnLoadingStarted();
 
-            var deleteUDCRowRequest = new DeleteUDCRowRequestDTO()
-                    .setMtbColrToDelete(mtbColrToDelete);
+        var deleteUDCRowRequest = new DeleteUDCRowRequestDTO()
+                .setMtbColrToDelete(mtbColrToDelete);
 
-            this.mColliCaricoRESTConsumer.deleteUDCRow(deleteUDCRowRequest,
-                    () -> {
-                        Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue())
-                                .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToDelete))
-                                .findSingle();
+        this.mColliCaricoRESTConsumer.deleteUDCRow(deleteUDCRowRequest,
+                () -> {
+                    Optional<PickingObjectDTO> pickingObjectDTO = Stream.of(this.mPickingList.getValue())
+                            .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToDelete))
+                            .findSingle();
 
-                        if (pickingObjectDTO.isPresent()) {
-                            pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete);
-                        }
+                    if (pickingObjectDTO.isPresent()) {
+                        pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete);
+                    }
 
+                    handler.post(() -> {
                         this.mCurrentMtbColt.getMtbColr().remove(mtbColrToDelete);
+                    });
 
                         this.resetMatchedRows();
                         this.sendOnRowSaved();

app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliViewModel.java

@@ -54,6 +54,8 @@ public class ListaBancaliViewModel {
     }
 
     public List<MtbColt> fillMtbColtWithMtbColr(List<MtbColt> mtbColts, boolean onlyResiduo) throws Exception {
+        if (mtbColts == null || mtbColts.isEmpty()) return mtbColts;
+
         List<String> ssccList = mtbColts.stream()
                 .map(MtbColt::getBarcodeUl)
                 .collect(Collectors.toUnmodifiableList());

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

@@ -9,6 +9,8 @@
         <import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
         <import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
 
+        <import type="android.view.View" />
+
         <variable
             name="item"
             type="it.integry.integrywmsnative.core.model.MtbColr" />
@@ -52,6 +54,7 @@
                 android:layout_marginStart="6dp"
                 android:clickable="false"
                 android:focusable="false"
+                android:visibility="@{item.getPartitaMag() != null ? View.VISIBLE : View.GONE}"
                 app:layout_constraintBaseline_toBaselineOf="@id/articolo_textview"
                 app:layout_constraintStart_toEndOf="@id/articolo_textview"
                 app:text='@{"Lotto: " + item.partitaMag}'