Finish v1.40.26(443)

.idea/runConfigurations/app.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS_Native.app.main" />
+    <module name="WMS.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 437
-    def appVersionName = '1.40.20'
+    def appVersionCode = 443
+    def appVersionName = '1.40.26'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java

@@ -161,6 +161,10 @@ public class MtbColt extends EntityBase {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS());
     }
 
+    public LocalDate getDataColloLD() {
+        return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataColloS());
+    }
+
     public MtbColt setDataCollo(String dataCollo) {
         this.dataCollo = dataCollo;
         return this;

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

@@ -114,4 +114,21 @@ public class ColliAccettazioneRESTConsumer extends _BaseRESTConsumer implements
                 });
     }
 
+    public void checkBarcodeUl(String barcodeUl, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed){
+        ColliAccettazioneRESTConsumerService colliAccettazioneRESTConsumerService = RESTBuilder.getService(ColliAccettazioneRESTConsumerService.class);
+
+        colliAccettazioneRESTConsumerService.checkIfBarcodeUlAlreadyRegistered(barcodeUl)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Boolean>> call, Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "accettazione/checkIfBarcodeUlAlreadyRegistered", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Boolean>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
+
 }

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

@@ -12,7 +12,9 @@ import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 
 public interface ColliAccettazioneRESTConsumerService {
 
@@ -31,4 +33,7 @@ public interface ColliAccettazioneRESTConsumerService {
     @POST("wms/accettazione/deleteUDCRow")
     Call<ServiceRESTResponse<Void>> deleteUDCRow(@Body DeleteUDCRowRequestDTO deleteUDCRowRequestDTO);
 
+    @GET("wms/accettazione/checkIfBarcodeUlAlreadyRegistered")
+    Call<ServiceRESTResponse<Boolean>> checkIfBarcodeUlAlreadyRegistered(@Query("barcodeUl") String barcodeUl);
+
 }

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

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import androidx.annotation.NonNull;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -13,6 +15,8 @@ import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
@@ -113,4 +117,21 @@ public class ColliSpedizioneRESTConsumer extends _BaseRESTConsumer implements Co
 
     }
 
+    public void duplicateUDS(DuplicateUDSRequestDTO duplicateUDSRequestDTO, RunnableArgs<DuplicateUDSResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
+        ColliSpedizioneRESTConsumerService colliSpedizioneRESTConsumerService = RESTBuilder.getService(ColliSpedizioneRESTConsumerService.class);
+
+        colliSpedizioneRESTConsumerService.duplicateUDS(duplicateUDSRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Response<ServiceRESTResponse<DuplicateUDSResponseDTO>> response) {
+                        analyzeAnswer(response, "spedizione/duplicateUDS", onComplete, onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception());
+                    }
+                });
+    }
+
 }

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

@@ -6,6 +6,8 @@ import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
@@ -35,4 +37,7 @@ public interface ColliSpedizioneRESTConsumerService {
     @POST("wms/spedizione/deleteUDSRow")
     Call<ServiceRESTResponse<Void>> deleteUDSRow(@Body DeleteUDSRowRequestDTO deleteUDSRowRequestDTO);
 
+    @POST("wms/spedizione/duplicateUDS")
+    Call<ServiceRESTResponse<DuplicateUDSResponseDTO>> duplicateUDS(@Body DuplicateUDSRequestDTO duplicateUDSRequestDTO);
+
 }

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

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 
 import androidx.annotation.NonNull;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -18,7 +19,7 @@ import retrofit2.Response;
 
 @Singleton
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
-    
+
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
         DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
@@ -50,8 +51,21 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void checkFrumaDocument(String fornitore, String numDoc, String dataDoc, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
+        var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        inventarioRESTConsumerService.checkFrumaDoc(fornitore, numDoc, dataDoc)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Response<ServiceRESTResponse<Boolean>> response) {
+                        analyzeAnswer(response, "checkDocument", onComplete, onFailed);
+                    }
 
-
+                    @Override
+                    public void onFailure(@NonNull Call<ServiceRESTResponse<Boolean>> call, @NonNull Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 
     public void loadDocumentAvailableArts(String codDtip, String codMgrp, String codAnagForn, RunnableArgs<RetrieveDocumentoArtsResponseDTO> onComplete, RunnableArgs<Exception> onFailed) {
         var inventarioRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.Date;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.model.DtbDoct;
@@ -20,8 +21,11 @@ public interface DocumentiRESTConsumerService {
     @POST("createDocFromColli")
     Call<ServiceRESTResponse<DtbDoct>> createDocFromColli(@Body LoadColliDTO listColli);
 
-
-
+    @GET("wms/documento/checkFruma")
+    Call<ServiceRESTResponse<Boolean>> checkFrumaDoc(
+            @Query("fornitore") String fornitore,
+            @Query("numDoc") String numDoc,
+            @Query("dataDoc") String dataDoc);
 
     @GET("wms/documento/arts")
     Call<ServiceRESTResponse<RetrieveDocumentoArtsResponseDTO>> retrieveArts(

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSRequestDTO.java

@@ -0,0 +1,28 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class DuplicateUDSRequestDTO {
+
+    private MtbColt mtbColt;
+
+    private int numOfDuplicates;
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public DuplicateUDSRequestDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+
+    public int getNumOfDuplicates() {
+        return numOfDuplicates;
+    }
+
+    public DuplicateUDSRequestDTO setNumOfDuplicates(int numOfDuplicates) {
+        this.numOfDuplicates = numOfDuplicates;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/DuplicateUDSResponseDTO.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class DuplicateUDSResponseDTO {
+
+    private List<MtbColt> mtbColtList;
+
+    public List<MtbColt> getMtbColtList() {
+        return mtbColtList;
+    }
+
+    public DuplicateUDSResponseDTO setMtbColtList(List<MtbColt> mtbColtList) {
+        this.mtbColtList = mtbColtList;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -78,6 +78,8 @@ public class DBSettingsModel {
 
     private boolean flagTracciamentoImballiCaricoEnabled = false;
     private boolean flagTracciamentoImballiScaricoEnabled = false;
+    private boolean flagPickingLiberoEnableScanArt = false;
+    private boolean flagAskDuplicateUDSSpedizione = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -654,4 +656,22 @@ public class DBSettingsModel {
         this.flagTracciamentoImballiScaricoEnabled = flagTracciamentoImballiScaricoEnabled;
         return this;
     }
+
+    public boolean isFlagPickingLiberoEnableScanArt() {
+        return flagPickingLiberoEnableScanArt;
+    }
+
+    public DBSettingsModel setFlagPickingLiberoEnableScanArt(boolean flagPickingLiberoEnableScanArt) {
+        this.flagPickingLiberoEnableScanArt = flagPickingLiberoEnableScanArt;
+        return this;
+    }
+
+    public boolean isFlagAskDuplicateUDSSpedizione() {
+        return flagAskDuplicateUDSSpedizione;
+    }
+
+    public DBSettingsModel setFlagAskDuplicateUDSSpedizione(boolean flagAskDuplicateUDSSpedizione) {
+        this.flagAskDuplicateUDSSpedizione = flagAskDuplicateUDSSpedizione;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -388,6 +388,11 @@ public class SettingsManager {
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_ASK_INFO_AGGIUNTIVE")
                 .setSetter(dbSettingsModelIstance::setFlagAskInfoAggiuntiveSpedizione));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_ASK_DUPLICATE_UDS")
+                .setSetter(dbSettingsModelIstance::setFlagAskDuplicateUDSSpedizione));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
@@ -518,6 +523,12 @@ public class SettingsManager {
                 .setKeySection("FLAG_WARNING_NEW_PARTITA_MAG")
                 .setSetter(dbSettingsModelIstance::setFlagWarningNewPartitaMag)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PICKING_LIBERO")
+                .setKeySection("ENABLE_SCAN_ART")
+                .setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt)
+                .setDefaultValue(true));
 
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java

@@ -22,6 +22,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -33,6 +35,7 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
@@ -54,11 +57,15 @@ import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.SitBo
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest.dto.TestataBollaAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.AccettazioneBollaPickingOrderBy;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.filters.AccettazioneBollaPickingFilterViewModel;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui.AccettazioneBollaPickingListAdapter;
 import it.integry.integrywmsnative.gest.accettazione_bolla_picking.ui.AccettazioneBollaPickingListModel;
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.filters.FilterDescrLayoutView;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
 import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView;
@@ -82,8 +89,9 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
     private ActivityAccettazioneBollaPickingBinding mBindings;
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
-
-
+    
+    private final AccettazioneBollaPickingFilterViewModel mAppliedFilterViewModel = new AccettazioneBollaPickingFilterViewModel();
+    
     private final ObservableArrayList<AccettazioneBollaPickingListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
     public BindableBoolean noItemsToPick = new BindableBoolean(false);
@@ -150,7 +158,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
-//        this.initFilters();
+        this.initFilters();
         this.initFab();
 
         boolean useQtaBolla = SettingsManager.iDB().isFlagAccettazioneBollaUseQtaOrd();
@@ -201,16 +209,85 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         this.mBindings.accettazionePickingList.setAdapter(adapter);
 
         this.mViewModel.getPickingList().observe(this, updatedData -> {
-//            mAppliedFilterViewModel.init(updatedData);
+            mAppliedFilterViewModel.init(updatedData);
 
             refreshList();
         });
 
+        adapter.setOnLongClickListener(clickedItem -> {
+            this.mViewModel.dispatchBollaRow(clickedItem, true);
+        });
+
         adapter.setOnItemClicked(clickedItem -> {
             this.mViewModel.dispatchBollaRow(clickedItem);
         });
     }
 
+    private void initFilters() {
+
+        var onPredicateChanged = new OnGeneralChangedCallback() {
+            @Override
+            public void run() {
+                refreshList();
+            }
+        };
+        
+        mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged);
+
+        List<FilterChipDTO> filterList = Stream.of(AccettazioneBollaPickingBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
+
+        for (FilterChipDTO filterChipDTO : filterList) {
+
+            FilterChipView filterChipView = new FilterChipView(this, filterChipDTO.getFilterChipText(), v -> initBottomSheetDialogFilter(filterChipDTO));
+
+            if (filterChipDTO.getID() == AccettazioneBollaPickingBindings.DESCR_FILTER_ID) {
+                mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() {
+                    @Override
+                    public void run() {
+                        if (mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null) {
+                            mViewModel.resetMatchedRows();
+                            filterChipView.disableCloseIcon();
+
+                            mBindings.filterChipsGroup.removeView(filterChipView);
+                            mBindings.filterChipsGroup.addView(filterChipView);
+                            mBindings.filterChips.smoothScrollTo(0, 0);
+                        } else {
+                            filterChipView.enableCloseIcon();
+
+                            mBindings.filterChipsGroup.removeView(filterChipView);
+                            mBindings.filterChipsGroup.addView(filterChipView, 0);
+                            mBindings.filterChips.smoothScrollTo(0, 0);
+                        }
+                    }
+                });
+                filterChipView.setOnResetClicked(() -> mAppliedFilterViewModel.getCurrentDescrPredicate().set(null));
+            }
+
+            this.mBindings.filterChipsGroup.addView(filterChipView);
+        }
+    }
+
+    private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
+
+        filterChipDTO.getFilterLayoutView().setFilterName(filterChipDTO.getFilterChipText()).setContext(this);
+
+        var filterLayoutView = filterChipDTO.getFilterLayoutView();
+
+        if (filterChipDTO.getID() == AccettazioneBollaPickingBindings.DESCR_FILTER_ID) {
+            ((FilterDescrLayoutView) filterLayoutView)
+                    .setAll(mAppliedFilterViewModel.getAllDescrs())
+                    .setAvailable(mAppliedFilterViewModel.getAvailableDescrs())
+                    .setOnFilterApplied(mAppliedFilterViewModel::setDescrFilter)
+                    .setPreselected(
+                            Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
+                                    .filter(mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null ? x -> false : Objects.requireNonNull(mAppliedFilterViewModel.getCurrentDescrPredicate().get()))
+                                    .map(x -> x.getMtbAart().getDescrizioneEstesa()).toList()
+                    );
+        }
+
+
+        if (!filterLayoutView.isAdded()) filterLayoutView.show(getSupportFragmentManager(), "TAG");
+    }
 
     private void initFab() {
         fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab,
@@ -246,13 +323,13 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         runOnUiThread(() -> {
             List<PickingObjectDTO> tmpList;
 
-//            if (mAppliedFilterViewModel != null) {
-//                mAppliedFilterViewModel.applyAllTests();
-//                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-//            } else {
+            if (mAppliedFilterViewModel != null) {
+                mAppliedFilterViewModel.applyAllTests();
+                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            } else {
             tmpList = mViewModel.getPickingList().getValue();
-//            }
-//
+            }
+
             var list = convertDataModelToListModel(tmpList);
 
             this.mAccettazioneMutableData.clear();

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingBindings.java

@@ -0,0 +1,22 @@
+package it.integry.integrywmsnative.gest.accettazione_bolla_picking;
+
+import java.util.HashMap;
+
+import it.integry.integrywmsnative.gest.accettazione_ordini_picking.filters.FilterDescrLayoutView;
+import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO;
+
+public class AccettazioneBollaPickingBindings {
+
+    public static final int DESCR_FILTER_ID = 0;
+
+    public static final HashMap<Integer, FilterChipDTO> AVAILABLE_FILTERS = new HashMap<>() {
+        {
+
+            put(DESCR_FILTER_ID, new FilterChipDTO()
+                    .setID(DESCR_FILTER_ID)
+                    .setPosizione(1)
+                    .setFilterChipText("Descrizione articolo")
+                    .setFilterLayoutView(new FilterDescrLayoutView()));
+        }
+    };
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java

@@ -443,7 +443,11 @@ public class AccettazioneBollaPickingViewModel {
         dispatchBollaRow(pickingObjectDTO);
     }
 
-    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO) {
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO){
+        dispatchBollaRow(pickingObjectDTO, false);
+    }
+
+    public void dispatchBollaRow(final PickingObjectDTO pickingObjectDTO, boolean longClick) {
         if (this.mCurrentMtbColt == null) return;
 
         AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
@@ -578,31 +582,42 @@ public class AccettazioneBollaPickingViewModel {
             }
         }
 
-        this.sendOnItemDispatched(
-                pickingObjectDTO,
-                pickingObjectDTO.getMtbAart(),
-                initialNumCnf, initialQtaCnf, initialQtaTot,
-                qtaDaEvadere,
-                numCnfDaEvadere,
-                qtaCnfDaEvadere,
-                qtaColDaPrelevare,
-                numCnfDaPrelevare,
-                qtaCnfDaPrelevare,
-                null,
-                null,
-                null,
-                partitaMag,
-                dataScad,
-                true,
-                (pickedQuantityDTO, shouldCloseLU) -> {
-                    this.saveNewRow(pickingObjectDTO,
-                            pickedQuantityDTO.getNumCnf(),
-                            pickedQuantityDTO.getQtaCnf(),
-                            pickedQuantityDTO.getQtaTot(),
-                            pickedQuantityDTO.getPartitaMag(),
-                            pickedQuantityDTO.getDataScad(),
-                            shouldCloseLU);
-                });
+        if (!longClick){
+            this.sendOnItemDispatched(
+                    pickingObjectDTO,
+                    pickingObjectDTO.getMtbAart(),
+                    initialNumCnf, initialQtaCnf, initialQtaTot,
+                    qtaDaEvadere,
+                    numCnfDaEvadere,
+                    qtaCnfDaEvadere,
+                    qtaColDaPrelevare,
+                    numCnfDaPrelevare,
+                    qtaCnfDaPrelevare,
+                    null,
+                    null,
+                    null,
+                    partitaMag,
+                    dataScad,
+                    true,
+                    (pickedQuantityDTO, shouldCloseLU) -> {
+                        this.saveNewRow(pickingObjectDTO,
+                                pickedQuantityDTO.getNumCnf(),
+                                pickedQuantityDTO.getQtaCnf(),
+                                pickedQuantityDTO.getQtaTot(),
+                                pickedQuantityDTO.getPartitaMag(),
+                                pickedQuantityDTO.getDataScad(),
+                                shouldCloseLU);
+                    });
+        } else {
+            this.saveNewRow(
+                    pickingObjectDTO,
+                    initialNumCnf,
+                    initialQtaCnf,
+                    initialQtaTot,
+                    partitaMag,
+                    dataScad,
+                    false);
+        }
 
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java

@@ -0,0 +1,75 @@
+package it.integry.integrywmsnative.gest.accettazione_bolla_picking.filters;
+
+import androidx.databinding.ObservableField;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+import com.annimon.stream.function.Predicate;
+
+import java.util.List;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO;
+
+public class AccettazioneBollaPickingFilterViewModel {
+    private final ObservableField<Predicate<PickingObjectDTO>> currentDescrPredicate = new ObservableField<>();
+
+    private List<PickingObjectDTO> initialOrderList;
+    private final MutableLiveData<List<PickingObjectDTO>> currentFilteredOrderList = new MutableLiveData<>();
+
+    public void init(List<PickingObjectDTO> initialList) {
+        this.initialOrderList = initialList;
+        this.currentFilteredOrderList.setValue(this.initialOrderList);
+    }
+
+    public MutableLiveData<List<PickingObjectDTO>> getMutableFilteredOrderList() {
+        return this.currentFilteredOrderList;
+    }
+
+
+    public void setDescrFilter(List<String> descrs) {
+        if (descrs == null || descrs.isEmpty()) currentDescrPredicate.set(null);
+        else {
+            currentDescrPredicate.set(o -> descrs.contains(o.getMtbAart().getDescrizione()));
+        }
+    }
+
+    public void applyAllTests() {
+
+        List<PickingObjectDTO> returnList;
+
+        if (currentDescrPredicate.get() == null) {
+            returnList = this.initialOrderList;
+        } else {
+            Stream<PickingObjectDTO> tmpStream = Stream.of(this.initialOrderList)
+                    .filter(x ->(currentDescrPredicate.get() == null || (currentDescrPredicate.get().test(x)))
+                    );
+
+            returnList = tmpStream.toList();
+        }
+
+        this.currentFilteredOrderList.setValue(returnList);
+    }
+
+    public ObservableField<Predicate<PickingObjectDTO>> getCurrentDescrPredicate() {
+        return currentDescrPredicate;
+    }
+
+    public List<String> getAllDescrs() {
+        return Stream
+                .of(Objects.requireNonNull(initialOrderList))
+                .filter(x -> x.getMtbAart().getDescrizioneEstesa() != null)
+                .sortBy(x -> x.getMtbAart().getDescrizioneEstesa())
+                .map(x -> x.getMtbAart().getDescrizioneEstesa() != null ? x.getMtbAart().getDescrizioneEstesa() : null)
+                .distinct()
+                .toList();
+    }
+
+    public List<String> getAvailableDescrs() {
+        return Stream.of(this.initialOrderList)
+                .map(x -> x.getMtbAart().getDescrizioneEstesa())
+                .distinct()
+                .toList();
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java

@@ -33,6 +33,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
     private final List<AccettazioneBollaPickingListModel> mDataset = new ArrayList<>();
 
     private RunnableArgs<PickingObjectDTO> mOnItemClicked;
+    private RunnableArgs<PickingObjectDTO> mOnItemLongClicked;
 
     static class SubheaderHolder extends RecyclerView.ViewHolder {
 
@@ -75,6 +76,9 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         this.mOnItemClicked = onItemClicked;
     }
 
+    public void setOnLongClickListener(RunnableArgs<PickingObjectDTO> onItemLongClicked){
+        this.mOnItemLongClicked = onItemLongClicked;
+    }
 
     @Override
     public AccettazioneBollaPickingListAdapter.SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
@@ -160,6 +164,12 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());
         });
+
+        holder.mBinding.getRoot().setOnLongClickListener(v -> {
+            if (this.mOnItemLongClicked != null)
+                this.mOnItemLongClicked.run(pickingObjectDTO.getOriginalModel());
+            return true;
+        });
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
 import android.view.Gravity;
 import android.view.Menu;
@@ -741,6 +742,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         BarcodeManager.enable();
     }
 
+    @Override
+    public void onWarning(String warningText, Runnable action) {
+        this.runOnUiThread(() -> {
+            this.onLoadingEnded();
+            DialogSimpleMessageView
+                    .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
+                    .show(getSupportFragmentManager(), "tag");
+        });
+    }
+
     @Override
     public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, String customArtDescription, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO().setMtbAart(mtbAart).setInitialNumCnf(initialNumCnf).setInitialQtaCnf(initialQtaCnf).setInitialQtaTot(initialQtaTot).setTotalQtaOrd(totalQtaOrd).setTotalNumCnfOrd(totalNumCnfOrd).setQtaCnfOrd(qtaCnfOrd).setTotalQtaToBeTaken(totalQtaToBeTaken).setTotalNumCnfToBeTaken(totalNumCnfToBeTaken).setQtaCnfToBeTaken(qtaCnfToBeTaken).setTotalQtaAvailable(totalQtaAvailable).setTotalNumCnfAvailable(totalNumCnfAvailable).setQtaCnfAvailable(qtaCnfAvailable).setPartitaMag(partitaMag).setDataScad(dataScad).setCanPartitaMagBeChanged(canPartitaMagBeChanged).setCanLUBeClosed(true).setCanOverflowOrderQuantity(canOverflowQuantity).setCustomArtDescription(customArtDescription);

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

@@ -247,8 +247,14 @@ public class AccettazioneOrdiniPickingViewModel {
         try {
             Ean128Model ean128Model = mEan128Service.decode(barcodeScanDTO);
 
-            //Nel caso trovo un SSCC lo aggiungo
-            this.processBarcodeNotOpenedLU(barcodeScanDTO, ean128Model.Sscc, onComplete);
+            mColliAccettazioneRESTConsumer.checkBarcodeUl(ean128Model.Sscc, result -> {
+                if (result){
+                    this.sendWarning("Barcode ul già registrato!", onComplete);
+                } else {
+                    //Nel caso trovo un SSCC lo aggiungo
+                    this.processBarcodeNotOpenedLU(barcodeScanDTO, ean128Model.Sscc, onComplete);
+                }
+            }, this::sendError);
 
         } catch (Exception e) {
             this.sendError(e);
@@ -933,6 +939,10 @@ public class AccettazioneOrdiniPickingViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    private void sendWarning(String warningText, Runnable action) {
+        if (this.mListener != null) mListener.onWarning(warningText, action);
+    }
+
     private void sendLUOpened(MtbColt mtbColt) {
         if (this.mListener != null) mListener.onLUOpened(mtbColt);
     }
@@ -1050,6 +1060,8 @@ public class AccettazioneOrdiniPickingViewModel {
 
         void onFilterPosizioneApplied(String posizioneToFilter);
 
+        void onWarning(String warningText, Runnable action);
+
         void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete);
 
     }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java

@@ -3,6 +3,8 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.SpannableString;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -37,6 +39,7 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniE
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListAdapter;
 import it.integry.integrywmsnative.gest.contab_doc_interni.ui.DocInterniListModel;
 import it.integry.integrywmsnative.ui.ElevatedToolbar;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class DocInterniFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, DocInterniViewModel.Listener {
 
@@ -120,10 +123,21 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
         this.openDocumentSelectionDialog();
     }
 
+    @Override
+    public void onWarning(String warningText, Runnable action) {
+        this.requireActivity().runOnUiThread(() -> {
+            this.onLoadingEnded();
+            DialogSimpleMessageView
+                    .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
+        });
+    }
+
     @Override
     public void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection) {
-        mViewModel.setSelectedDocDetails(selection);
-        mBinding.invalidateAll();
+        mViewModel.setSelectedDocDetails(selection, () -> {
+            mBinding.invalidateAll();
+        });
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
@@ -17,6 +18,8 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO;
@@ -76,6 +79,14 @@ public class DocInterniViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    private void sendWarning(String warningText, Runnable action) {
+        if (this.mListener != null) mListener.onWarning(warningText, action);
+    }
+
+    private void sendDocDetailsChanged(DialogSelectDocInfoResponseDTO selection){
+        if (this.mListener != null) mListener.onDocDetailsChanged(selection);
+    }
+
     public DocInterniViewModel setListeners(Listener listener) {
         this.mListener = listener;
         return this;
@@ -85,7 +96,7 @@ public class DocInterniViewModel {
         return mDocsList;
     }
 
-    public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection) {
+    public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection, Runnable action) {
         this.fornitore = selection.getFornitore();
         this.dtbTipi = selection.getTipoDoc();
 
@@ -94,10 +105,31 @@ public class DocInterniViewModel {
         this.numDoc = selection.getNumDoc() != null ? selection.getNumDoc().toString() : null;
         this.note = selection.getNote();
 
-        this.sendOnLoadingStarted();
-        fetchProducts(() -> {
-            fetchDocuments(this::sendOnLoadingEnded);
-        });
+        if (dtbTipi.getCodDtip().equalsIgnoreCase("FRUMA")) {
+            documentRESTConsumer.checkFrumaDocument(
+                    fornitore.getCodAnag(),
+                    numDoc,
+                    UtilityDate.formatDate(dataDoc, "yyyy/MM/dd"),
+                    data -> {
+                        if (!data) {
+                            this.sendWarning(UtilityResources.getString(R.string.no_doc_found_message), this::init);
+                        } else {
+                            action.run();
+                            this.sendOnLoadingStarted();
+                            fetchProducts(() -> {
+                                fetchDocuments(this::sendOnLoadingEnded);
+                            });
+                        }
+                    },
+                    this::sendError
+            );
+        } else {
+            action.run();
+            this.sendOnLoadingStarted();
+            fetchProducts(() -> {
+                fetchDocuments(this::sendOnLoadingEnded);
+            });
+        }
     }
 
     public void fetchProducts(Runnable onComplete) {
@@ -210,6 +242,8 @@ public class DocInterniViewModel {
 
         void onError(Exception ex);
 
+        void onWarning(String warningText, Runnable action);
+
         void onDocInterniSetupFetched(DocInterniSetupDTO docInterniSetupDTO);
 
         void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection);

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java

@@ -14,6 +14,7 @@ import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.exception.InvalidCodMdepException;
+import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException;
@@ -137,13 +138,15 @@ public class PickingLiberoViewModel {
             //Cerco tramite etichetta ean 128 (che può indicarmi una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
 
-        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
+        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO) && SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()) {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
 
-        } else {
+        } else if (SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()){
             //Cerco tramite ean13  un collo  in posizione mono ul definita in anagrafica articolo, altrimenti se abilitato procedo con picking manuale
             this.loadArticolo(barcodeScanDTO.getStringValue(), null, onComplete);
+        } else {
+            this.sendError(new NoArtsFoundException());
         }
     }
 
@@ -269,18 +272,16 @@ public class PickingLiberoViewModel {
             if (!UtilityString.isNullOrEmpty(ean128Model.Content))
                 barcodeProd = ean128Model.Content;
 
-
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
 
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
-                } else if (!UtilityString.isNullOrEmpty(barcodeProd)) {
+                } else if (!UtilityString.isNullOrEmpty(barcodeProd) && SettingsManager.iDB().isFlagPickingLiberoEnableScanArt()) {
                     this.loadArticolo(barcodeProd, ean128Model, onComplete);
                 } else {
                     this.sendError(new NoLUFoundException());
                 }
 
-
             } else {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
                 this.sendError(new NoLUFoundException());
@@ -326,7 +327,7 @@ public class PickingLiberoViewModel {
     private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, Runnable onComplete) {
         if (this.mFlagAskLineaProd) {
             this.sendLULineaProdRequired(response -> {
-                    createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
+                createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
 
             }, () -> {
                 this.sendOnLoadingEnded();

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java

@@ -94,7 +94,7 @@ public class ProdRecuperoMaterialeViewModel {
     private HistoryVersamentoProdULDTO getHistoryElementFromMtbColt(MtbColt mtbColt) {
         List<HistoryVersamentoProdULDTO> filteredItems = this.mUlList.getValue().stream()
                 .filter(x -> Objects.equals(x.getNumColloRif(), mtbColt.getNumCollo()) &&
-                        x.getDataColloRif().equals(UtilityDate.toLocalDate(mtbColt.getDataColloD())) &&
+                        x.getDataColloRif().equals(mtbColt.getDataColloLD()) &&
                         x.getSerColloRif().equalsIgnoreCase(mtbColt.getSerCollo()) &&
                         x.getGestioneRif().equalsIgnoreCase(mtbColt.getGestione()))
                 .collect(Collectors.toList());
@@ -266,7 +266,7 @@ public class ProdRecuperoMaterialeViewModel {
 
                 if (!Objects.equals(mtbColt.getNumCollo(), item.getNumColloRif()) ||
                         !Objects.equals(mtbColt.getSerCollo(), item.getSerColloRif()) ||
-                        !Objects.equals(mtbColt.getDataColloS(), item.getDataColloRif()) ||
+                        !Objects.equals(mtbColt.getDataColloLD(), item.getDataColloRif()) ||
                         !Objects.equals(mtbColt.getGestione(), item.getGestioneRif())) {
 
                     final MtbColt mtbColtCarico = mtbColt

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

@@ -1072,4 +1072,16 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         DialogInfoAggiuntiveLUView.newInstance(mtbColt, onComplete, this::onLoadingEnded)
                 .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
     }
+
+    @Override
+    public void onInputDuplicate(RunnableArgs<Integer> onComplete){
+        DialogSimpleInputHelper.makeInputDialog(this, "Numero pedane da duplicare", inputValue -> {
+            try {
+                Integer num = Integer.parseInt(inputValue);
+                onComplete.run(num);
+            } catch (NumberFormatException ex) {
+                this.onError(new Exception("Inserire un numero di risorse valido"));
+            }
+        }, () -> {}).show();
+    }
 }

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

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.gest.spedizione;
 
+import androidx.annotation.IntegerRes;
 import androidx.databinding.ObservableArrayList;
 import androidx.lifecycle.MutableLiveData;
 
@@ -13,6 +14,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -72,6 +74,7 @@ import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestOrderDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.DuplicateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.PrintULRequestDTO;
@@ -813,7 +816,8 @@ public class SpedizioneViewModel {
 
         List<PickingObjectDTO> matchPickingObject = pickingList.stream()
                 .filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitArtOrdDTO().getCodMart()))
-                .filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt()).filter(x -> {
+                .filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt())
+                .filter(x -> {
                     MtbPartitaMag mtbPartitaMag = pickData != null && pickData.getManualPickDTO() != null && pickData.getManualPickDTO().getMtbPartitaMag() != null ? pickData.getManualPickDTO().getMtbPartitaMag() : null;
                     return !mEnableCheckPartitaMag || (mtbPartitaMag != null && UtilityString.equalsIgnoreCase(x.getSitArtOrdDTO().getPartitaMag(), mtbPartitaMag.getPartitaMag()));
                 }).collect(Collectors.toList());
@@ -1548,31 +1552,35 @@ public class SpedizioneViewModel {
 
                     this.closeLU(generatedMtbColts -> {
 
-                        this.mColliMagazzinoRESTConsumer.fillMtbAartsOfMtbColts(generatedMtbColts, filledMtbColts -> {
+                        this.duplicateUDS(generatedMtbColts, duplicatedMtbColts -> {
 
-                            this.askPositionChange(
-                                    filledMtbColts,
-                                    positionedMtbColts -> {
+                            generatedMtbColts.addAll(duplicatedMtbColts);
 
-                                        this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts, () -> {
-                                            positionedMtbColts.stream()
-                                                    .filter(x -> !this.mColliRegistrati.contains(x))
-                                                    .forEach(x -> this.mColliRegistrati.add(x));
+                            this.mColliMagazzinoRESTConsumer.fillMtbAartsOfMtbColts(generatedMtbColts, filledMtbColts -> {
 
-                                            postCloseOperations(positionedMtbColts);
+                                this.askPositionChange(
+                                        filledMtbColts,
+                                        positionedMtbColts -> {
 
-                                            this.mIsNewLU = false;
+                                            this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts, () -> {
+                                                positionedMtbColts.stream()
+                                                        .filter(x -> !this.mColliRegistrati.contains(x))
+                                                        .forEach(x -> this.mColliRegistrati.add(x));
+
+                                                postCloseOperations(positionedMtbColts);
+
+                                                this.mIsNewLU = false;
+
+                                                this.resetMatchedRows();
+                                                this.sendLUClosed();
+                                                this.sendOnLoadingEnded();
+                                            });
 
-                                            this.resetMatchedRows();
-                                            this.sendLUClosed();
-                                            this.sendOnLoadingEnded();
                                         });
 
-                                    });
-
-                        }, this::sendError);
+                            }, this::sendError);
+                        });
                     });
-
                 });
             });
         });
@@ -1595,8 +1603,35 @@ public class SpedizioneViewModel {
         this.mColliScaricoRESTConsumer.closeUDS(closeUDSRequestDto, closeResponse -> {
             onComplete.run(closeResponse.getGeneratedMtbColts());
         }, this::sendError);
+    }
 
+    private void duplicateUDS(List<MtbColt> mtbColtList, RunnableArgs<List<MtbColt>> onComplete) {
+        var clonedLu = (MtbColt) this.mCurrentMtbColt.clone();
 
+        boolean noReference = clonedLu.getMtbColr().stream()
+                .allMatch(
+                        x -> x.getGestioneRif() == null &&
+                                x.getDataColloRifD() == null &&
+                                x.getSerColloRif() == null &&
+                                x.getNumColloRif() == null
+                );
+
+        if (mtbColtList.size() > 1 || !noReference || !SettingsManager.iDB().isFlagAskDuplicateUDSSpedizione()) {
+            onComplete.run(new ArrayList<>());
+            return;
+        }
+
+        var savedMtbColt = mtbColtList.get(0);
+
+        sendInputDuplicate(inputNumber -> {
+            var duplicateUDSRequestDTO = new DuplicateUDSRequestDTO()
+                    .setMtbColt(savedMtbColt)
+                    .setNumOfDuplicates(inputNumber);
+
+            this.mColliSpedizioneRESTConsumer.duplicateUDS(duplicateUDSRequestDTO, data -> {
+                onComplete.run(data.getMtbColtList());
+            }, this::sendError);
+        });
     }
 
     private void checkIfShouldBeDeleted(Runnable onDeleted, Runnable onContinue) {
@@ -1937,6 +1972,10 @@ public class SpedizioneViewModel {
         this.mDocumentRESTConsumer.createDocFromColli(loadCollidto, doc -> this.sendOnOrderClosed(), this::sendError);
     }
 
+    private void sendInputDuplicate(RunnableArgs<Integer> onComplete) {
+        if (this.mListener != null) mListener.onInputDuplicate(onComplete);
+    }
+
     public SpedizioneViewModel setListeners(Listener listener) {
         this.mListener = listener;
         return this;
@@ -1969,6 +2008,8 @@ public class SpedizioneViewModel {
         void onChooseArtsRequest(List<MtbAart> artsList, RunnableArgs<List<MtbAart>> onComplete);
 
         void onOrderClosed();
+
+        void onInputDuplicate(RunnableArgs<Integer> onComplete);
     }
 
 }