Merge branch 'develop' into feature/Refactoring_Spedizione

# Conflicts:
#	app/build.gradle
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
#	app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java

.idea/runConfigurations/app_base.xml

@@ -14,8 +14,6 @@
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />

.idea/runConfigurations/app_frudis.xml

@@ -14,8 +14,6 @@
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />
@@ -42,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="ADVANCED_PROFILING_ENABLED" value="true" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
     </Profilers>

.idea/runConfigurations/app_ime.xml

@@ -11,11 +11,9 @@
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="false" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />

.idea/runConfigurations/app_saporiveri.xml

@@ -14,8 +14,6 @@
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />

.idea/runConfigurations/app_saporiveri_pv.xml

@@ -14,8 +14,6 @@
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />

.idea/runConfigurations/app_vglimenti.xml

@@ -14,8 +14,6 @@
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />

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

@@ -207,7 +207,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+    public static void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt,MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
                 .initDefaultFields()
@@ -239,7 +239,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 //            onFailed.run(new Exception());
 //            return;
 //        }
-        MtbColr original = sourceMtbColt.getMtbColr().get(0);
+        MtbColr original = sourceMtbColr;
         MtbColr mtbColrClone = new MtbColr();
         mtbColrClone
                 .setNumCollo(null)
@@ -538,23 +538,19 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public static void changePosizione(MtbColt testata, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+    public static void changePosizione(MtbColt mtbColtToSave, MtbDepoPosizione posizione, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        MtbColt mtbColtToSaveClone = (MtbColt) mtbColtToSave.clone();
 
-        testata.setOperation(CommonModelConsts.OPERATION.UPDATE);
+        mtbColtToSaveClone.setOperation(CommonModelConsts.OPERATION.UPDATE);
+        mtbColtToSaveClone.setMtbColr(new ObservableArrayList<>());
 
-        if (posizione == null) testata.setPosizione(null);
+        if (posizione == null) mtbColtToSaveClone.setPosizione(null);
-        else testata.setPosizione(posizione.getPosizione());
+        else mtbColtToSaveClone.setPosizione(posizione.getPosizione());
 
-        ColliMagazzinoRESTConsumer.saveColloStatic(testata, new ISimpleOperationCallback<MtbColt>() {
+        ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtToSaveClone, mtbColt -> {
-            @Override
-            public void onSuccess(MtbColt value) {
             if (onComplete != null) onComplete.run();
-            }
+        }, ex -> {
-
-            @Override
-            public void onFailed(Exception ex) {
             if (onFailed != null) onFailed.run(ex);
-            }
         });
 
     }

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java

@@ -39,10 +39,10 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter<ChooseOrd
     private HashMap<CheckableOrdineLavoro, Integer> mDatasetPositions = new HashMap<>();
 
 
-    public ChooseOrdsLavFromListAdapter(Context context, List<ChooseOrdsLavFromListItemModel> myDataset, MtbColt mtbColt) throws ParseException, TimeNotRecognizedException, DateNotRecognizedException {
+    public ChooseOrdsLavFromListAdapter(Context context, List<ChooseOrdsLavFromListItemModel> myDataset, MtbColt mtbColt, MtbColr mtbColr) throws ParseException, TimeNotRecognizedException, DateNotRecognizedException {
         mContext = context;
         mMtbColt = mtbColt;
-        mMtbColr = mtbColt.getMtbColr().get(0);
+        mMtbColr = mtbColr;
         if (myDataset != null) {
             mDataset = Stream.of(myDataset)
                     .withoutNulls()
@@ -91,7 +91,7 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter<ChooseOrd
 
 
     private void calculateMtbColtShare() {
-        MtbColr mtbColr = mMtbColt.getMtbColr().get(0);
+        MtbColr mtbColr = mMtbColr;
         BigDecimal residuoCol = mtbColr.getQtaCol();
         BigDecimal residuoCnf = mtbColr.getNumCnf();
         BigDecimal offsetCol = BigDecimal.ZERO.add(residuoCol);

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java

@@ -11,14 +11,18 @@ import android.widget.Toast;
 import androidx.databinding.ObservableField;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
 import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
@@ -56,6 +60,7 @@ public class ProdVersamentoMaterialViewModel {
     private List<ChooseOrdsLavFromListItemModel> mDataset = new ArrayList<>();
     private ChooseOrdsLavFromListAdapter currentAdapter;
     public ObservableField<MtbColt> mtbColt = new ObservableField<>();
+    public MtbColr mMtbColr;
 
 
     public void init(Activity context, FragmentProdVersamentoMaterialeBinding binding, ProdVersamentoMaterialHelper helper, Runnable onVersamentoCompleted) {
@@ -68,6 +73,7 @@ public class ProdVersamentoMaterialViewModel {
     }
 
     public void setMtbColr(MtbColr mtbColr) {
+        mMtbColr = mtbColr;
         mBinding.descrArt.setText(mtbColr.getDescrizione());
         mBinding.codArt.setText(mtbColr.getCodMart());
         mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getRifPartitaMag() != null) ? " - "+ mtbColr.getRifPartitaMag().getDescrizione() : ""));
@@ -84,7 +90,6 @@ public class ProdVersamentoMaterialViewModel {
         }
     }
 
-
     public void openLU() {
         DialogScanOrCreateLU.make(mContext, false, false, true, false, (mtbColt, created) -> {
             if (mtbColt == null) {
@@ -124,9 +129,13 @@ public class ProdVersamentoMaterialViewModel {
                                     null, this::openLU).show();
                             return;
                         } else if (mtbColt.get().getMtbColr().size() > 1) {
+
                             DialogSimpleMessageHelper.makeWarningDialog(mContext,
                                     new SpannableString(Html.fromHtml("Il collo selezionato contiene più articoli, solo il primo verrà versato in questa sessione. <br> Per versare i colli restanti ripetere l'operazione di versamento.")),
-                                    null, null).show();
+                                    null, () -> {
+                                        cyclicGetOrdiniLavByCollo(mtbColt.get().getMtbColr().iterator(), mtbDepoPosizione);
+                                    }).show();
+                            return;
 
                         }
                         MesRESTConsumer.getOrdiniLavorazioneMateriale(mtbDepoPosizione.getPosizione(), getIdMaterialeFromCollo(mtbColt.get()), ordini -> richiediOrdiniPerVersamento(ordini, mtbDepoPosizione), e -> DialogSimpleMessageHelper.makeWarningDialog(mContext,
@@ -151,7 +160,6 @@ public class ProdVersamentoMaterialViewModel {
         return UtilityString.isNullOrEmpty(articolo.getIdArtEqui()) ? articolo.getCodMart() : articolo.getIdArtEqui();
     }
 
-
     private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) {
 
         Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
@@ -162,7 +170,6 @@ public class ProdVersamentoMaterialViewModel {
         }), ex -> UtilityExceptions.defaultException(mContext, ex));
     }
 
-
     public void setMtbColt(MtbColt mtbColt) {
         this.mtbColt.set(mtbColt);
         this.setMtbColr(mtbColt.getMtbColr().get(0));
@@ -170,10 +177,11 @@ public class ProdVersamentoMaterialViewModel {
 
     public void resetMtbColt() {
         this.mtbColt.set(null);
+        this.mMtbColr = null;
         openLU();
     }
 
-    public void richiediOrdiniPerVersamento(List<OrdineLavorazioneDTO> ordini, MtbDepoPosizione mtbDepoPosizione) {
+    private void richiediOrdiniPerVersamento(List<OrdineLavorazioneDTO> ordini, MtbDepoPosizione mtbDepoPosizione) {
 
         if (ordini == null || ordini.size() <= 0) {
             mBinding.positiveFab.setVisibility(View.GONE);
@@ -200,7 +208,7 @@ public class ProdVersamentoMaterialViewModel {
         List<OrdineLavorazioneDTO> ordLavs = currentAdapter.getSelectedItems();
         if (ordLavs.size() > 0) {
             Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
-            ColliMagazzinoRESTConsumer.createColliScaricoDaOrdineLavorazione(mtbColt.get(), mtbDepoPosizione, ordLavs, generatedMtbColt -> DialogCommon.showDataSaved(mContext, () -> {
+            ColliMagazzinoRESTConsumer.createColliScaricoDaOrdineLavorazione(mtbColt.get(), mMtbColr, mtbDepoPosizione, ordLavs, generatedMtbColt -> DialogCommon.showDataSaved(mContext, () -> {
                 progressDialog.dismiss();
                 mOnVersamentoCompleted.run();
             }), ex -> UtilityExceptions.defaultException(mContext, ex));
@@ -216,8 +224,28 @@ public class ProdVersamentoMaterialViewModel {
 
         mBinding.dialogChooseArtsFromListaArtMainList.setLayoutManager(new LinearLayoutManager(mContext));
 
-        currentAdapter = new ChooseOrdsLavFromListAdapter(mContext, mDataset, mtbColt.get());
+        currentAdapter = new ChooseOrdsLavFromListAdapter(mContext, mDataset, mtbColt.get(), mMtbColr);
         mBinding.dialogChooseArtsFromListaArtMainList.setAdapter(currentAdapter);
     }
 
+    private void cyclicGetOrdiniLavByCollo(@NotNull Iterator<MtbColr> righeCollo, MtbDepoPosizione mtbDepoPosizione) {
+        MtbColr colr = righeCollo.next();
+        setMtbColr(colr);
+        MtbAart articolo = colr.getMtbAart();
+
+        MesRESTConsumer.getOrdiniLavorazioneMateriale(mtbDepoPosizione.getPosizione(), UtilityString.isNullOrEmpty(articolo.getIdArtEqui()) ? articolo.getCodMart() : articolo.getIdArtEqui(), ordini -> {
+                    if (ordini == null || ordini.isEmpty()) {
+                        if (righeCollo.hasNext()) {
+                            cyclicGetOrdiniLavByCollo(righeCollo, mtbDepoPosizione);
+                        } else {
+                            richiediOrdiniPerVersamento(ordini, mtbDepoPosizione);
+                        }
+                    } else {
+                        richiediOrdiniPerVersamento(ordini, mtbDepoPosizione);
+                    }
+                }
+                , e -> DialogSimpleMessageHelper.makeWarningDialog(mContext,
+                        new SpannableString(Html.fromHtml(e.getMessage())),
+                        null, this::openLU).show());
+    }
 }

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

@@ -5,6 +5,7 @@ import android.app.Dialog;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
 import androidx.recyclerview.widget.LinearLayoutManager;
+
 import android.text.SpannableString;
 
 import com.annimon.stream.Stream;
@@ -187,7 +188,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             defaultCodMdepOfUL = SettingsManager.i().userSession.depo.getCodMdep();
 
 
-
             //Definizione del filtro ordine da applicare a tutti i colli generati
             Stream.of(mTestateOrdini).forEach(x -> {
                 FiltroOrdineDTO filtro = new FiltroOrdineDTO()
@@ -200,7 +200,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             });
 
 
-
             //Definizione del codAnag
             List<String> foundCodAnag = Stream.of(mTestateOrdini)
                     .map(OrdineVenditaInevasoDTO::getCodAnagOrd)
@@ -213,7 +212,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             }
 
 
-
             //Definizione del codAnag
             List<String> foundRagSoc = Stream.of(mTestateOrdini)
                     .map(OrdineVenditaInevasoDTO::getRagSocOrd)
@@ -487,6 +485,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString("Nessuna posizione trovata con il barcode scansionato"), null, BarcodeManager::enable).show();
 
         }
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
+=======
+
+
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
     }
 
 
@@ -518,7 +521,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
             if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
             if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
-            if(!UtilityString.isNullOrEmpty(ean128Model.Content)) barcodeProd = ean128Model.Content;
+            if (!UtilityString.isNullOrEmpty(ean128Model.Content))
+                barcodeProd = ean128Model.Content;
 
 
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
@@ -560,8 +564,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         }
     }
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
     private void loadArticolo(String barcodeProd, PickingObjectDTOOld.PickData pickData, Dialog progressDialog) {
         if(barcodeProd.length() == 14) {
+=======
+    private void loadArticolo(String barcodeProd, PickingObjectDTO.PickData pickData, Dialog progressDialog) {
+        if (barcodeProd.length() == 14) {
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
             barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
         }
 
@@ -618,6 +627,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
         //Cerco se devo fare pick dell'articolo tramite codMart perché forse non risulta in nessun collo
         //if(matchPickingObject != null && matchPickingObject.size() == 0 && scannedUL.getItem() != null && scannedUL.getItem().size() > 0) {
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
             List<String> listOfCodMartsInRowCollo = Stream.of(scannedUL.getMtbColr())
                     .map(MtbColr::getCodMart)
                     .withoutNulls()
@@ -640,6 +650,37 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     List<MtbColr> matchWithPartitaMag = Stream.of(scannedUL.getMtbColr())
                             .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart()) &&
                                          Objects.equals(x.getPartitaMag(), tmpPickObj.getPartitaMag())).toList();
+=======
+        List<String> listOfCodMartsInRowCollo = Stream.of(scannedUL.getMtbColr())
+                .map(MtbColr::getCodMart)
+                .withoutNulls()
+                .toList();
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+
+
+        List<PickingObjectDTO> matchPickingObjectByArt = Stream.of(pickingList)
+                .filter(x -> //x.getNumCollo() == null &&
+                        (listOfCodMartsInRowCollo.contains(x.getCodMart()) && !alreadyMatchedArts.contains(x.getCodMart())))
+                .toList();
+
+
+        if (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
+            for (int i = 0; i < matchPickingObjectByArt.size(); i++) {
+                PickingObjectDTO tmpPickObj = matchPickingObjectByArt.get(i);
+
+
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
+                            PickingObjectDTOOld.PickData pickData = new PickingObjectDTOOld.PickData()
+                                    .setMtbPartitaMag(matchRow.getRifPartitaMag())
+                                    .setNumCnf(matchRow.getNumCnf())
+                                    .setQtaCnf(matchRow.getQtaCnf())
+                                    .setQtaTot(matchRow.getQtaCol())
+                                    .setSourceMtbColt(scannedUL);
+=======
+                List<MtbColr> matchWithPartitaMag = Stream.of(scannedUL.getMtbColr())
+                        .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart()) &&
+                                Objects.equals(x.getPartitaMag(), tmpPickObj.getPartitaMag())).toList();
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
 
                 boolean anyMatch = matchWithPartitaMag.size() > 0;
 
@@ -648,12 +689,23 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     i--;
                 } else {
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
+                    PickingObjectDTOOld tmpPickObj = matchPickingObjectByArt.get(i);
+                    List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr())
+                            .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
+=======
                     for (int k = 0; k < matchWithPartitaMag.size(); k++) {
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
 
 
                         MtbColr matchRow = matchWithPartitaMag.get(k);
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
+                        MtbColr matchRow = matchWithColloRow.get(k);
                         PickingObjectDTOOld.PickData pickData = new PickingObjectDTOOld.PickData()
+=======
+                        PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
                                 .setMtbPartitaMag(matchRow.getRifPartitaMag())
                                 .setNumCnf(matchRow.getNumCnf())
                                 .setQtaCnf(matchRow.getQtaCnf())
@@ -668,7 +720,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         } else {
             for (int i = 0; i < matchPickingObjectByArt.size(); i++) {
 
-                    PickingObjectDTOOld tmpPickObj = matchPickingObjectByArt.get(i);
+                PickingObjectDTO tmpPickObj = matchPickingObjectByArt.get(i);
                 List<MtbColr> matchWithColloRow = Stream.of(scannedUL.getMtbColr())
                         .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
 
@@ -676,7 +728,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
 
                     MtbColr matchRow = matchWithColloRow.get(k);
-                        PickingObjectDTOOld.PickData pickData = new PickingObjectDTOOld.PickData()
+                    PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData()
                             .setMtbPartitaMag(matchRow.getRifPartitaMag())
                             .setNumCnf(matchRow.getNumCnf())
                             .setQtaCnf(matchRow.getQtaCnf())
@@ -690,8 +742,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         }
 
 
-
-
         //}
         matchPickingObject.addAll(matchPickingObjectByArt);
 
@@ -713,8 +763,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 .toList();
 
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
         if(SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
             List<PickingObjectDTOOld> matchWithPartitaMag = Stream.of(matchPickingObject)
+=======
+        if (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
+            List<PickingObjectDTO> matchWithPartitaMag = Stream.of(matchPickingObject)
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
                     .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()) &&
                             (pickData != null && pickData.getMtbPartitaMag() != null && Objects.equals(x.getPartitaMag(), pickData.getMtbPartitaMag().getPartitaMag()))).toList();
 
@@ -728,8 +783,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
         this.loadMatchedRows(matchPickingObject);
     }
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
     private void loadMatchedRows(List<PickingObjectDTOOld> matchedRows) {
         if(matchedRows == null || matchedRows.size() == 0) {
+=======
+
+
+    private void loadMatchedRows(List<PickingObjectDTO> matchedRows) {
+        if (matchedRows == null || matchedRows.size() == 0) {
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
             DialogCommon.showNoArtFoundDialog(mActivity, null);
         } else {
             for (int i = 0; i < mPickingList.size(); i++) {
@@ -865,7 +927,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                         ColliMagazzinoRESTConsumer.updateDataFineStatic(
                                 currentMtbColt,
                                 () -> distribuisciCollo(progress, (generatedMtbColts) -> {
-                                    if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete);
+                                    if (shouldPrint)
+                                        printCollo(progress, generatedMtbColts, onComplete);
                                     else {
                                         postCloseOperations(generatedMtbColts, onComplete);
                                         progress.dismiss();
@@ -925,8 +988,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
     private void printCollo(Dialog progress, List<MtbColt> mtbColtsToPrint, Runnable onComplete) {
         DialogAskShouldPrint.make(mActivity, "Packing List", shouldPrint -> {
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
             if(shouldPrint) {
                 PrinterRESTConsumer.getAvailablePrintersStatic(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, value -> {
+=======
+            if (shouldPrint) {
+                PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, value -> {
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
 
                     if (value.size() > 0) {
                         try {
@@ -978,6 +1046,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
     private void singlePrint(MtbColt mtbColtToPrint, String printerName, Runnable onComplete, RunnableArgs<Exception> onFailed) {
         ReportManager.getRightReportNameByGestione(mtbColtToPrint.getGestioneEnum(), reportName -> {
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
                 PrinterRESTConsumer.printCollo(
                         printerName,
                         mtbColtToPrint,
@@ -985,6 +1054,15 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                         reportName, onComplete, onFailed);
 
             }, onFailed);
+=======
+            PrinterRESTConsumer.printCollo(
+                    printerName,
+                    mtbColtToPrint,
+                    1,
+                    reportName, onComplete, onAbort);
+
+        }, onAbort);
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
     }
 
 
@@ -1048,8 +1126,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
 
     @Override
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
     public void onOrdineRowDispatch(final PickingObjectDTOOld item) {
         if(mArticoliInColloBottomSheetViewModel.mtbColt.get() != null){
+=======
+    public void onOrdineRowDispatch(final PickingObjectDTO item) {
+        if (mArticoliInColloBottomSheetViewModel.mtbColt.get() != null) {
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
 
 
             List<MtbColr> currentMtbColrs = mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr();
@@ -1075,7 +1158,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             if (numCnfDaEvadere < 0) numCnfDaEvadere = 0;
 
 
-
             AtomicBigDecimal qtaColEvasaInCurrentUL = new AtomicBigDecimal();
             AtomicBigDecimal numCnfEvasaInCurrentUL = new AtomicBigDecimal();
 
@@ -1115,8 +1197,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
             boolean batchLotEnabled = true;
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
             if(item.getTempPickData() != null) {
                 PickingObjectDTOOld.PickData tmpPickData = item.getTempPickData();
+=======
+            if (item.getTempPickData() != null) {
+                PickingObjectDTO.PickData tmpPickData = item.getTempPickData();
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
 
                 if (tmpPickData.getQtaCnf() == null && tmpPickData.getNumCnf() != null && tmpPickData.getQtaTot() != null) {
                     tmpPickData.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf(), 3, RoundingMode.HALF_EVEN));
@@ -1140,8 +1227,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
                 boolean useQtaDaEvadere = false;
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
                 if(tmpPickData.getQtaTot() != null) {
                     useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissaBoolean();
+=======
+                if (tmpPickData.getQtaTot() != null) {
+                    useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa();
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
                     if (useQtaDaEvadere && !isTakenFromUL) {
                         dto.setQtaTot(qtaDaEvadere);
                         dto.setMaxQta(qtaDaEvadere);
@@ -1171,8 +1263,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                         }
 
 
-
-
                     }
 
                     if (tmpPickData.getQtaCnf() != null && useQtaDaEvadere) {
@@ -1204,7 +1294,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     qtaCnf = item.getMtbAart().getQtaCnf();
                 }
 
-                if(qtaDaEvadere.compareTo(BigDecimal.ZERO) > 0) {
+
+                if (qtaDisponibile != null && qtaDisponibile.compareTo(BigDecimal.ZERO) > 0) {
+                    dto.setNumCnf(qtaDisponibile.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
+                } else if (qtaDaEvadere.compareTo(BigDecimal.ZERO) > 0) {
                     dto.setNumCnf(qtaDaEvadere.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
                 }
 
@@ -1223,7 +1316,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         }
     }
 
+<<<<<<< HEAD:app/src/main/java/it/integry/integrywmsnative/gest/spedizione/viewmodel/VenditaOrdineInevasoViewModel.java
     private void onOrdineRowDispatched(PickingObjectDTOOld item, QuantityDTO quantityDTO, boolean closeUL){
+=======
+    private void onOrdineRowDispatched(PickingObjectDTO item, QuantityDTO quantityDTO, boolean closeUL) {
+>>>>>>> develop:app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
         final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
 
         final MtbColr mtbColr = new MtbColr()
@@ -1290,7 +1387,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         onOrdineRowSave(item, cloneMtbColt, closeUL, !shouldPrint, progress);
 
 
-
     }
 
     private void addTipoPedanaFromArt(PickingObjectDTOOld item, MtbColt cloneMtbColt, boolean closeUL, Dialog progress) {
@@ -1471,9 +1567,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
     }
 
 
-
-
-
     public void manualSearch() {
         BarcodeManager.disable();
         DialogSimpleInputHelper.makeInputDialog(mActivity, "Inserisci il codice a barre", codice -> {