Fix in Picking Vendita.

app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java

@@ -4,9 +4,12 @@ import com.annimon.stream.Stream;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Iterator;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.CommonConst;
@@ -290,6 +293,26 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{
         });
     }
 
+    public static void getMultipleByTestate(List<MtbColt> testate, boolean onlyResiduo, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        ArrayList<MtbColt> resultMtbColt = new ArrayList<>();
+        cyclicGetMultipleByTestate(testate.iterator(), onlyResiduo, resultMtbColt, () -> {
+            onComplete.run(resultMtbColt);
+        }, onFailed);
+    }
+
+
+
+
+    private static void cyclicGetMultipleByTestate(@NotNull Iterator<MtbColt> sourceMtbColts, boolean onlyResiduo, ArrayList<MtbColt> resultMtbColt, Runnable onComplete, RunnableArgs<Exception> onAbort) {
+        if(sourceMtbColts.hasNext()){
+            getByTestata(sourceMtbColts.next(), onlyResiduo, false, mtbColt -> {
+                resultMtbColt.add(mtbColt);
+                cyclicGetMultipleByTestate(sourceMtbColts, onlyResiduo, resultMtbColt, onComplete, onAbort);
+            }, onAbort);
+        } else {
+            onComplete.run();
+        }
+    }
 
     public static void getByTestata(MtbColt testata, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         String ssccString = null;

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java

@@ -697,30 +697,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
     private void loadMatchedRows(List<PickingObjectDTO> matchedRows) {
         if(matchedRows == null || matchedRows.size() == 0) {
             DialogCommon.showNoArtFoundDialog(mActivity, null);
-        } else if(matchedRows.size() == 1) {
-
-
-            if(matchedRows.get(0).getTempPickData() != null &&
-                matchedRows.get(0).getTempPickData().getSourceMtbColt() != null) {
-
-                MtbColt tempSourceMtbColt = matchedRows.get(0).getTempPickData().getSourceMtbColt();
-
-                if(tempSourceMtbColt.getGestione().equals(matchedRows.get(0).getGestione()) &&
-                    tempSourceMtbColt.getNumCollo() == matchedRows.get(0).getNumCollo() &&
-                    tempSourceMtbColt.getSerCollo().equals(matchedRows.get(0).getSerCollo()) &&
-                    tempSourceMtbColt.getDataColloS().equals(matchedRows.get(0).getDataColloS())) {
-
-                    onOrdineRowDispatch(matchedRows.get(0));
-                } else {
-                    //Se sto pickando da una UL diversa da quella suggerita allora non te la apro in
-                    //automatico ma ti mostro il filtro
-                    applyFilter("");
-                    refreshOrderBy(false);
-                }
-
-            } else {
-                onOrdineRowDispatch(matchedRows.get(0));
-            }
         } else {
             for(int i = 0; i < mPickingList.size(); i++) {
                 if(!matchedRows.contains(mPickingList.get(i))) {
@@ -728,10 +704,34 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 }
             }
 
+            if(matchedRows.size() == 1) {
 
+                if (matchedRows.get(0).getTempPickData() != null &&
+                        matchedRows.get(0).getTempPickData().getSourceMtbColt() != null) {
 
-            applyFilter("");
+                    MtbColt tempSourceMtbColt = matchedRows.get(0).getTempPickData().getSourceMtbColt();
-            refreshOrderBy(false);
+
+                    if (tempSourceMtbColt.getGestione().equals(matchedRows.get(0).getGestione()) &&
+                            tempSourceMtbColt.getNumCollo() == matchedRows.get(0).getNumCollo() &&
+                            tempSourceMtbColt.getSerCollo().equals(matchedRows.get(0).getSerCollo()) &&
+                            tempSourceMtbColt.getDataColloS().equals(matchedRows.get(0).getDataColloS())) {
+
+                        onOrdineRowDispatch(matchedRows.get(0));
+                    } else {
+                        //Se sto pickando da una UL diversa da quella suggerita allora non te la apro in
+                        //automatico ma ti mostro il filtro
+                        applyFilter("");
+                        refreshOrderBy(false);
+                    }
+
+                } else {
+                    onOrdineRowDispatch(matchedRows.get(0));
+                }
+            } else {
+
+                applyFilter("");
+                refreshOrderBy(false);
+            }
         }
     }
 
@@ -867,8 +867,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         IOrdiniVendita ordiniVendita = ClassRouter.getIstance(ClassRouter.PATH.ORDINI_VENDITA);
 
         ordiniVendita.distribuisciCollo(progress, cloneMtbColt, mTestateOrdini, mtbColts -> {
+
             if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID);
-            onComplete.run(mtbColts);
+
+            ColliMagazzinoRESTConsumer.getMultipleByTestate(mtbColts, true, mtbColtsReloaded -> {
+                onComplete.run(mtbColtsReloaded);
+            }, ex -> {
+                UtilityExceptions.defaultException(mActivity, ex, progress);
+            });
+
         }, ex -> {
             UtilityExceptions.defaultException(mActivity, ex, progress);
         });
@@ -981,26 +988,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         mArticoliInColloBottomSheetViewModel.mtbColt.set(null);
         isFabVisible.set(true);
 
-        if(mtbColt != null && mtbColt.getMtbColr() != null) {
 
-            List<MtbColr> mtbColrs = mtbColt.getMtbColr();
+        for(int i = 0; i < this.mPickingList.size(); i++) {
 
-            for (int i = 0; i < mtbColrs.size(); i++) {
+            for(int k = 0; k < this.mPickingList.get(i).getWithdrawRows().size(); k++) {
 
-                MtbColr x = mtbColt.getMtbColr().get(i);
+                MtbColr withdrawRow = this.mPickingList.get(i).getWithdrawRows().get(k);
 
-                Stream.of(this.mPickingList)
+                this.mPickingList.get(i).setQtaCollo(this.mPickingList.get(i).getQtaCollo().subtract(withdrawRow.getQtaCol()));
-                        .filter(currentRow ->
+                this.mPickingList.get(i).setQtaOrd(this.mPickingList.get(i).getQtaOrd().subtract(withdrawRow.getQtaCol()));
-                                x.getCodMart().equalsIgnoreCase(currentRow.getCodMart()) &&
-                                        ((x.getCodJcom() == null && currentRow.getCodJcom() == null) || (x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(currentRow.getCodJcom()))) &&
-                                        (!SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV() || (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV() && ((x.getPartitaMag() == null && currentRow.getPartitaMag() == null) || (x.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(currentRow.getPartitaMag()))))) &&
-                                        ((x.getNumColloRif() == null && currentRow.getNumCollo() == null) || (x.getNumColloRif() != null && x.getNumColloRif().equals(currentRow.getNumCollo())))
-                        )
-
-                        .forEach(currentRow -> {
-                            currentRow.setQtaCollo(currentRow.getQtaCollo().subtract(x.getQtaCol()));
-                            currentRow.setQtaOrd(currentRow.getQtaOrd().subtract(x.getQtaCol()));
-                        });
 
             }
         }

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

@@ -57,19 +57,32 @@
                         android:textAllCaps="true"
                         android:textSize="16sp"/>
 
-                    <Button
+                    <!--<Button-->
+                        <!--android:id="@+id/articoli_in_collo_close_collo"-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:text="@string/action_close_ul"-->
+                        <!--android:textSize="16sp"-->
+                        <!--android:layout_alignParentEnd="true"-->
+                        <!--android:theme="@style/white_button"-->
+                        <!--android:drawableEnd="@drawable/ic_close_red_24dp"-->
+                        <!--android:drawablePadding="8dp"-->
+                        <!--android:onClick="@{() -> viewModel.closeCurrentUL()}"-->
+                        <!--android:drawableTint="@color/red_600"-->
+                        <!--android:textColor="@color/red_600"/>-->
+
+
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/articoli_in_collo_close_collo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/action_close_ul"
+                        style="@style/Button.DangerOutline"
-                        android:textSize="16sp"
                         android:layout_alignParentEnd="true"
-                        android:theme="@style/white_button"
+                        android:layout_marginLeft="8dp"
-                        android:drawableEnd="@drawable/ic_close_red_24dp"
+                        android:layout_marginRight="8dp"
-                        android:drawablePadding="8dp"
+                        android:text="@string/action_close_ul"
                         android:onClick="@{() -> viewModel.closeCurrentUL()}"
-                        android:drawableTint="@color/red_600"
+                        app:strokeColor="@color/red_600"/>
-                        android:textColor="@color/red_600"/>
 
                     <!--<android.support.v7.widget.AppCompatButton-->
                         <!--android:id="@+id/articoli_in_collo_close_collo"-->