Merge branch 'release/v1.30.07__325'

v1.30.05__323

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="20119B1E55" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-12-12T15:40:54.351888Z" />
-  </component>
-</project>

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 321
-    def appVersionName = '1.30.03'
+    def appVersionCode = 325
+    def appVersionName = '1.30.07'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliOrdineDataSource.java

@@ -15,6 +15,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 
 public class ArticoliOrdineDataSource extends BaseDataSource implements ArticoliOrdineRepository {
 
@@ -53,6 +54,7 @@ public class ArticoliOrdineDataSource extends BaseDataSource implements Articoli
     }
 
     public void saveArticoloToOrdine(ArticoloOrdine articolo, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        articolo.setDataIns(UtilityDate.getDateInstance());
         if (articolo.getArticoloOrdineId() != null && articolo.getArticoloOrdineId() > 0) {
             execute(() -> mArticoloOrdineDao.update(articolo), onSuccess, onError);
         } else {

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

@@ -97,7 +97,6 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
         }
 
         ordineDTO.setChiaveGriglia(ordine.getCodAlis());
-        ordineDTO.setDataCons(UtilityDate.getDateInstance());
         ordineDTO.setArtRows(artRows);
         saveDTO.setGestione("O");
         saveDTO.setOrdineDTO(ordineDTO);

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

@@ -26,6 +26,7 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
     private String ragSocCom;
     private String ragSocOrd;
     private String destinatario;
+    private String codVdes;
     private String citta;
     private String provincia;
     private String indirizzo;
@@ -424,4 +425,13 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
             return this;
         }
     }
+
+    public String getCodVdes() {
+        return codVdes;
+    }
+
+    public OrdineUscitaInevasoDTO setCodVdes(String codVdes) {
+        this.codVdes = codVdes;
+        return this;
+    }
 }

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

@@ -215,15 +215,6 @@ public class DBSettingsModel {
         return this;
     }
 
-    public boolean isFlagUseNewPickingListSpedizione() {
-        return flagUseNewPickingListSpedizione;
-    }
-
-    public DBSettingsModel setFlagUseNewPickingListSpedizione(boolean flagUseNewPickingListSpedizione) {
-        this.flagUseNewPickingListSpedizione = flagUseNewPickingListSpedizione;
-        return this;
-    }
-
     public boolean isFlagVersamentoDirettoProduzione() {
         return flagVersamentoDirettoProduzione;
     }

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

@@ -356,7 +356,6 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list, "SPEDIZIONE", "ENABLE_CHECK_DEPOSITO", Boolean.class));
             dbSettingsModelIstance.setFlagForceAllToColli(getValueFromList(list, "SETUP", "FLAG_FORCE_ALL_TO_COLLI", Boolean.class));
             dbSettingsModelIstance.setFlagAskPesoColloSpedizione(getValueFromList(list, "SETUP", "FLAG_ASK_PESO_COLLO", Boolean.class));
-            dbSettingsModelIstance.setFlagUseNewPickingListSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_NEW_PICKING_LIST", Boolean.class));
             dbSettingsModelIstance.setFlagVersamentoDirettoProduzione(getValueFromList(list, "PRODUZIONE", "FLAG_VERSAMENTO_DIRETTO", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableManualPick(getValueFromList(list, "SPEDIZIONE", "ENABLE_MANUAL_PICK", Boolean.class));
             dbSettingsModelIstance.setFlagSpedizioneEnableFakeGiacenza(getValueFromList(list, "SPEDIZIONE", "ENABLE_FAKE_GIACENZA", Boolean.class));

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java

@@ -294,9 +294,6 @@ public class AccettazionePickingViewModel {
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.sendError(new LUScanNotGrantedException());
                 } else {
-                    if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
-                        barcodeProd = barcodeProd.substring(1);
-                    }
 
                     PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
                     this.loadArticolo(barcodeProd, pickDataDTO, onComplete);

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

@@ -183,9 +183,6 @@ public class PickingLiberoViewModel {
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
                 } else if (!UtilityString.isNullOrEmpty(barcodeProd)) {
-                    if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
-                        barcodeProd = barcodeProd.substring(1);
-                    }
                     this.loadArticolo(barcodeProd, ean128Model, onComplete);
                 } else {
                     this.sendError(new NoLUFoundException());

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java

@@ -159,15 +159,9 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
 
         DialogAskActionView.newInstance(articoloOrdine.getDescrizione(),
                 articoloOrdine.getQtaOrd() + " " + articoloOrdine.getUntMis(),
-                () -> {
-                    this.mViewModel.checkArticolo(articoloOrdine.getCodMart(),
-                            artOrd -> {
-                                this.onItemDispatched(artOrd);
-                                BarcodeManager.enable();
-                            },
-                            this::onError);
-                    BarcodeManager.enable();
-                },
+                () -> this.onItemDispatched(articoloOrdine, () -> {
+
+                }),
                 () -> {
                     this.deleteArticolo(articoloOrdine);
                     BarcodeManager.enable();
@@ -186,23 +180,18 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
     }
 
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
-        mBinding.closeActivityFab.close(false);
-        this.onLoadingStarted();
-        BarcodeManager.disable();
-
-        this.mViewModel.processBarcodeDTO(data, this::onLoadingEnded);
-
+        this.mViewModel.processBarcode(data.getStringValue());
     };
 
     @Override
-    public void onItemDispatched(ArticoloOrdine articoloOrdine) {
+    public void onItemDispatched(ArticoloOrdine articoloOrdine, Runnable onSuccess) {
         DialogEditArticoloView
                 .newInstance(articoloOrdine, articolo -> {
                     runOnUiThread(() -> {
                         if (articolo != null) {
                             Toast.makeText(this, "Articolo aggiunto all'ordine!", Toast.LENGTH_SHORT).show();
                         }
-                        this.mViewModel.refreshListArticoli();
+                        this.mViewModel.refreshListArticoli(onSuccess);
                     });
                 }, null).show(this.getSupportFragmentManager(), "DialogEditArticoloView");
     }
@@ -233,16 +222,9 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
 
     public void manualSearch() {
         BarcodeManager.disable();
-        DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il codice a barre/codice articolo da cercare", codice -> {
+        DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il codice a barre/codice articolo da cercare", barcode -> {
             this.onLoadingStarted();
-            this.mViewModel.checkArticolo(codice,
-                    articoloOrdine -> {
-                        this.onItemDispatched(articoloOrdine);
-                        this.onLoadingEnded();
-                        BarcodeManager.enable();
-                    },
-                    this::onError
-            );
+            this.mViewModel.processBarcode(barcode);
         }, BarcodeManager::enable).show();
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java

@@ -12,8 +12,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
@@ -69,19 +69,23 @@ public class PVOrdineAcquistoEditViewModel {
 
     public void init(Ordine ordine, List<ArticoloDTO> articoliGriglia) {
         this.mCurrentOrdine = ordine;
-
-        this.sendOnLoadingStarted();
-
         mArticoliGriglia.clear();
         mArticoliGriglia.addAll(articoliGriglia);
         this.refreshListArticoli();
     }
 
     public void refreshListArticoli() {
+        refreshListArticoli(null);
+    }
+
+    public void refreshListArticoli(Runnable onSuccess) {
+        this.sendOnLoadingStarted();
         this.loadArticoli(mCurrentOrdine, articoli -> {
-            articoli = Stream.of(articoli).map(this::completeDataArticoli).toList();
+            articoli = Stream.of(articoli).map(this::completeDataArticoli).sorted((a, b) -> a.getDataIns().after(b.getDataIns()) ? -1 : 1).toList();
             this.mArticoli.postValue(articoli);
             this.sendOnLoadingEnded();
+            if (onSuccess != null)
+                onSuccess.run();
         });
     }
 
@@ -92,6 +96,12 @@ public class PVOrdineAcquistoEditViewModel {
         art.setQtaProposta(BigDecimal.valueOf(artGrid.getQtaProposta()));
         art.setQtaPrevistaVendita(BigDecimal.valueOf(artGrid.getQtaPrevistaVendita()));
         art.setBgTint(getBgTint(art));
+        art.setMediaSett(artGrid.getMediaSett());
+        art.setQtaMinOrdinabile(artGrid.getQtaMinOrdinabile());
+        art.setMerceDaRic(artGrid.getMerceDaRic());
+        art.setNewNoPromo(artGrid.isNewNoPromo());
+        art.setFlagQtaMultipla(artGrid.getFlagQtaMultipla());
+        art.setSystemNote(artGrid.generateSystemNote());
         return art;
     }
 
@@ -111,15 +121,26 @@ public class PVOrdineAcquistoEditViewModel {
         return mArticoli;
     }
 
-    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
-        this.checkArticolo(
-                barcodeScanDTO.getStringValue(),
-                articoloOrdine -> {
-                    this.sendOnItemDispatched(articoloOrdine);
-                    onComplete.run();
-                },
-                this::sendError
-        );
+    public void processBarcode(String barcode) {
+        try {
+            BarcodeManager.disable();
+            this.sendOnLoadingStarted();
+            ArticoloDTO articoloDTO = getArticoloFromBarcode(barcode);
+            if (articoloDTO == null) {
+                throw new NoResultFromBarcodeException(barcode);
+            }
+            this.addArticoloToOrdine(
+                    articoloDTO,
+                    BarcodeManager::enable,
+                    e -> {
+                        this.sendError(e);
+                        BarcodeManager.enable();
+                    }
+            );
+        } catch (Exception e) {
+            this.sendError(e);
+            BarcodeManager.enable();
+        }
     }
 
     private void loadArticoli(Ordine ordine, RunnableArgs<List<ArticoloOrdine>> onLoad) {
@@ -130,42 +151,17 @@ public class PVOrdineAcquistoEditViewModel {
         }
     }
 
-    public void checkArticolo(String barcode, RunnableArgs<ArticoloOrdine> onSuccess, RunnableArgs<Exception> onFail) {
+    public void addArticoloToOrdine(ArticoloDTO art, Runnable onSuccess, RunnableArgs<Exception> onFail) {
         try {
-            if (mArticoliGriglia == null || mArticoliGriglia.isEmpty()) {
-                onFail.run(new NoArtsInGridException());
-                return;
-            }
-            ArticoloDTO art = Stream.of(mArticoliGriglia).filter(articolo ->
-                    articolo.getCodMart().equalsIgnoreCase(barcode) ||
-                            articolo.getBarcode().equalsIgnoreCase(barcode) ||
-                            articolo.getBarcode().equalsIgnoreCase(StringUtils.leftPad(barcode, 13, "0"))
-            ).sortBy(x -> x.getSortByBarcodeCondition(barcode)).findFirst().orElse(null);
-
-            if (art == null) {
-                onFail.run(new NoResultFromBarcodeException(barcode));
-                return;
-            }
 
             mArticoliOrdineRepository.findArticoloByScanAndOrdine(mCurrentOrdine, art.codMart, (articolo) -> {
-
+                this.sendOnLoadingEnded();
                 if (articolo != null) {
                     if (isAutoOrderOnScan()) {
                         articolo.setQtaOrd(articolo.getQtaOrd() + articolo.getQtaCnf());
-                        mArticoliOrdineRepository.saveArticoloToOrdine(articolo, this::refreshListArticoli, this::sendError);
+                        mArticoliOrdineRepository.saveArticoloToOrdine(articolo, () -> this.refreshListArticoli(onSuccess), onFail);
                     } else {
-                        articolo
-                                .setQtaPrevistaVendita(BigDecimal.valueOf(art.getQtaPrevistaVendita()))
-                                .setQtaProposta(BigDecimal.valueOf(art.getQtaProposta()))
-                                .setGiacenza(BigDecimal.valueOf(art.getGiacenza()))
-                                .setMediaSett(art.getMediaSett());
-
-                        articolo.setQtaMinOrdinabile(art.getQtaMinOrdinabile());
-                        articolo.setMerceDaRic(art.getMerceDaRic());
-                        articolo.setNewNoPromo(art.isNewNoPromo());
-                        articolo.setFlagQtaMultipla(art.getFlagQtaMultipla());
-                        articolo.setSystemNote(art.generateSystemNote());
-                        onSuccess.run(articolo);
+                        this.sendOnItemDispatched(articolo, onSuccess);
                     }
 
 
@@ -173,9 +169,9 @@ public class PVOrdineAcquistoEditViewModel {
                     articolo = art.convertToArticoloOrdine(mCurrentOrdine);
                     if (isAutoOrderOnScan()) {
                         articolo.setQtaOrd(articolo.getQtaCnf());
-                        mArticoliOrdineRepository.saveArticoloToOrdine(articolo, this::refreshListArticoli, this::sendError);
+                        mArticoliOrdineRepository.saveArticoloToOrdine(articolo, () -> this.refreshListArticoli(onSuccess), onFail);
                     } else {
-                        onSuccess.run(articolo);
+                        this.sendOnItemDispatched(articolo, onSuccess);
                     }
                 }
             }, onFail);
@@ -186,6 +182,19 @@ public class PVOrdineAcquistoEditViewModel {
         }
     }
 
+    public ArticoloDTO getArticoloFromBarcode(String barcode) throws NoArtsInGridException {
+        if (mArticoliGriglia == null || mArticoliGriglia.isEmpty()) {
+            throw new NoArtsInGridException();
+        }
+
+        return Stream.of(mArticoliGriglia).filter(articolo ->
+                articolo.getCodMart().equalsIgnoreCase(barcode) ||
+                        articolo.getBarcode().equalsIgnoreCase(barcode) ||
+                        articolo.getBarcode().equalsIgnoreCase(StringUtils.leftPad(barcode, 13, "0"))
+        ).sortBy(x -> x.getSortByBarcodeCondition(barcode)).findFirst().orElse(null);
+    }
+
+
     private boolean isAutoOrderOnScan() {
         return SettingsManager.iDB().isFlagOrdinaArticoliOnScan();
     }
@@ -195,8 +204,6 @@ public class PVOrdineAcquistoEditViewModel {
     }
 
     public void orderNewProducts() {
-        this.sendOnLoadingStarted();
-
         List<ArticoloDTO> newArts = getNewArticoli();
         if (!newArts.isEmpty()) {
             List<ArticoloOrdine> articoliToSave = new ArrayList<>();
@@ -243,8 +250,8 @@ public class PVOrdineAcquistoEditViewModel {
         }, this::sendError);
     }
 
-    private void sendOnItemDispatched(ArticoloOrdine articoloOrdine) {
-        if (this.mListener != null) mListener.onItemDispatched(articoloOrdine);
+    private void sendOnItemDispatched(ArticoloOrdine articoloOrdine, Runnable onSuccess) {
+        if (this.mListener != null) mListener.onItemDispatched(articoloOrdine, onSuccess);
     }
 
     private void sendOnLoadingStarted() {
@@ -260,7 +267,7 @@ public class PVOrdineAcquistoEditViewModel {
     }
 
     public interface Listener extends ILoadingListener {
-        void onItemDispatched(ArticoloOrdine articoloOrdine);
+        void onItemDispatched(ArticoloOrdine articoloOrdine, Runnable onSuccess);
 
         int getColorFromResource(int resId);
 

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java

@@ -28,6 +28,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -105,6 +106,10 @@ public class RettificaGiacenzeViewModel {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
 
+        } else if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
+            //Cerco tramite articolo ean peso
+            this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
+
         } else if (UtilityBarcode.isEtichettaArt(barcodeScanDTO)) {
             this.searchArtInt(barcodeScanDTO.getStringValue(), onComplete);
 
@@ -129,9 +134,6 @@ public class RettificaGiacenzeViewModel {
 
 
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
-                if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
-                    barcodeProd = barcodeProd.substring(1);
-                }
 
                 PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
                 this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
@@ -144,6 +146,15 @@ public class RettificaGiacenzeViewModel {
         }, this::sendError);
     }
 
+    private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
+        try {
+            Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue());
+            this.loadArticolo(ean13PesoModel.getPrecode(), PickDataDTO.fromEan128(ean13PesoModel.toEan128()), onComplete);
+        } catch (Exception ex) {
+            this.sendError(ex);
+        }
+    }
+
     private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
             if (onComplete != null) onComplete.run();

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

@@ -540,9 +540,6 @@ public class SpedizioneViewModel {
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
                 } else {
-                    if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
-                        barcodeProd = barcodeProd.substring(1);
-                    }
 
                     PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
                     this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
@@ -698,14 +695,7 @@ public class SpedizioneViewModel {
 
             List<MtbColr> scannedMtbColrs = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr();
 
-            List<MtbPartitaMag> availableBatchLots = Stream.of(scannedMtbColrs)
-                    .filter(x ->
-                            x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
-                                    (x.getPartitaMag() == null ||
-                                            UtilityString.isNullOrEmpty(x.getMtbPartitaMag().getDataScadS()) ||
-                                            UtilityDate.getDateInstance().before(x.getMtbPartitaMag().getDataScadD())))
-                    .distinctBy(MtbColr::getPartitaMag)
-                    .map(x -> x.getPartitaMag() == null ? new MtbPartitaMag().setCodMart(x.getMtbAart().getCodMart()) : x.getMtbPartitaMag()).toList();
+            List<MtbPartitaMag> availableBatchLots = Stream.of(scannedMtbColrs).filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) && (x.getPartitaMag() == null || UtilityString.isNullOrEmpty(x.getMtbPartitaMag().getDataScadS()) || UtilityDate.getDateInstance().before(x.getMtbPartitaMag().getDataScadD()))).distinctBy(MtbColr::getPartitaMag).map(x -> x.getPartitaMag() == null ? new MtbPartitaMag().setCodMart(x.getMtbAart().getCodMart()) : x.getMtbPartitaMag()).toList();
 
             //Controllo se una delle partite combacia con quella che voglio evadere
             if (refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) {
@@ -897,68 +887,14 @@ public class SpedizioneViewModel {
         });
     }
 
-    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,
-                                 Date dataScad,
-                                 boolean canOverflowOrderQuantity,
-                                 boolean canPartitaMagBeChanged,
-                                 RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+    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, Date dataScad, boolean canOverflowOrderQuantity, boolean canPartitaMagBeChanged, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
         if (SettingsManager.iDB().isNotifyLotStatus() && !UtilityString.isNullOrEmpty(partitaMag)) {
             this.loadProductLotStatus(mtbAart.getCodMart(), partitaMag, (status) -> {
                 pickingObjectDTO.setStatoArticoloDTO(status);
-                this.sendOnFullItemDispatched(pickingObjectDTO,
-                        mtbAart,
-                        initialNumCnf,
-                        initialQtaCnf,
-                        initialQtaTot,
-                        totalQtaOrd,
-                        totalNumCnfOrd,
-                        qtaCnfOrd,
-                        totalQtaToBeTaken,
-                        totalNumCnfToBeTaken,
-                        qtaCnfToBeTaken,
-                        totalQtaAvailable,
-                        totalNumCnfAvailable,
-                        qtaCnfAvailable,
-                        partitaMag,
-                        dataScad,
-                        canOverflowOrderQuantity,
-                        canPartitaMagBeChanged,
-                        onComplete);
+                this.sendOnFullItemDispatched(pickingObjectDTO, mtbAart, initialNumCnf, initialQtaCnf, initialQtaTot, totalQtaOrd, totalNumCnfOrd, qtaCnfOrd, totalQtaToBeTaken, totalNumCnfToBeTaken, qtaCnfToBeTaken, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, canOverflowOrderQuantity, canPartitaMagBeChanged, onComplete);
             });
         } else {
-            this.sendOnFullItemDispatched(pickingObjectDTO,
-                    mtbAart,
-                    initialNumCnf,
-                    initialQtaCnf,
-                    initialQtaTot,
-                    totalQtaOrd,
-                    totalNumCnfOrd,
-                    qtaCnfOrd,
-                    totalQtaToBeTaken,
-                    totalNumCnfToBeTaken,
-                    qtaCnfToBeTaken,
-                    totalQtaAvailable,
-                    totalNumCnfAvailable,
-                    qtaCnfAvailable,
-                    partitaMag,
-                    dataScad,
-                    canOverflowOrderQuantity,
-                    canPartitaMagBeChanged,
-                    onComplete);
+            this.sendOnFullItemDispatched(pickingObjectDTO, mtbAart, initialNumCnf, initialQtaCnf, initialQtaTot, totalQtaOrd, totalNumCnfOrd, qtaCnfOrd, totalQtaToBeTaken, totalNumCnfToBeTaken, qtaCnfToBeTaken, totalQtaAvailable, totalNumCnfAvailable, qtaCnfAvailable, partitaMag, dataScad, canOverflowOrderQuantity, canPartitaMagBeChanged, onComplete);
         }
 
 
@@ -1108,11 +1044,10 @@ public class SpedizioneViewModel {
                 AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal(0);
                 AtomicBigDecimal qtaColWithdrawRows = new AtomicBigDecimal(0);
 
-                Stream.of(finalPickingObjectDTO.getWithdrawMtbColrs())
-                        .forEach(row -> {
-                            numCnfWithdrawRows.addAndGet(row.getNumCnf());
-                            qtaColWithdrawRows.addAndGet(row.getQtaCol());
-                        });
+                Stream.of(finalPickingObjectDTO.getWithdrawMtbColrs()).forEach(row -> {
+                    numCnfWithdrawRows.addAndGet(row.getNumCnf());
+                    qtaColWithdrawRows.addAndGet(row.getQtaCol());
+                });
 
                 numCnfDaEvadere = totalNumCnfOrd.subtract(numCnfWithdrawRows.getBigDecimalValue()).add(mtbColrToEdit.getNumCnf());
                 qtaDaEvadere = totalQtaOrd.subtract(qtaColWithdrawRows.getBigDecimalValue()).add(mtbColrToEdit.getQtaCol());
@@ -1652,20 +1587,17 @@ public class SpedizioneViewModel {
             onOrderClosedPrintingDone();
             return;
         }
-        List<DtbOrdt> closedOrders = Stream.of(this.mTestateOrdini)
-                .map(ord -> {
-                    DtbOrdt ordV = new DtbOrdt();
-                    ordV.setDataOrd(ord.getDataOrdS()).setNumOrd(ord.getNumOrd()).setGestione(ord.getGestione()).setCodAnag(ord.getCodAnagOrd());
-                    return ordV;
-                }).toList();
+        List<DtbOrdt> closedOrders = Stream.of(this.mTestateOrdini).map(ord -> {
+            DtbOrdt ordV = new DtbOrdt();
+            ordV.setDataOrd(ord.getDataOrdS()).setNumOrd(ord.getNumOrd()).setGestione(ord.getGestione()).setCodAnag(ord.getCodAnagOrd());
+            return ordV;
+        }).toList();
 
         dto.setPrintList(closedOrders);
         printClosedOrders(dto, this::onOrderClosedPrintingDone, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));
     }
 
     private void printClosedOrders(PrintOrderCloseDTO dto, Runnable onSuccess, RunnableArgs<Exception> onAbort) {
-
-
         this.mPrinterRESTConsumer.printClosedOrders(dto, SettingsManager.i().getUserSession().getDepo().getCodMdep(), onSuccess, onAbort);
     }
 
@@ -1737,10 +1669,13 @@ public class SpedizioneViewModel {
 
         var loadCollidto = new LoadColliDTO();
         var codAnag = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getCodAnagOrd).withoutNulls().distinctBy(x -> x).findFirst().get();
+        var codVdes = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getCodVdes).withoutNulls().distinctBy(x -> x).findFirst().get();
+
         loadCollidto.setColli(getCreatedMtbColts());
         loadCollidto.setCodDtip(SettingsManager.iDB().getCodDtipOrdTrasfV());
         loadCollidto.setCodMdep(mDefaultCodMdep);
         loadCollidto.setCodAnag(codAnag);
+        loadCollidto.setCodVdes(codVdes);
         loadCollidto.setSaveDoc(true);
         loadCollidto.setGestione("L");
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java

@@ -90,9 +90,6 @@ public class DialogScanArtViewModel {
                 if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
                     this.executeEtichettaLU(ean128Model.Sscc, onComplete);
                 } else if (!mForceOnlyUL) {
-                    if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
-                        barcodeProd = barcodeProd.substring(1);
-                    }
 
                     this.loadArticolo(barcodeProd, ean128Model, onComplete);
                 } else {

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.13'
 

gradle.properties

@@ -33,4 +33,5 @@ org.gradle.parallel=true
 # Enable simple gradle caching
 org.gradle.caching=true
 #  Increase memory allotted to JVM
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4096m
+org.gradle.unsafe.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneyWellBarcodeReader.java

@@ -45,9 +45,7 @@ public class HoneyWellBarcodeReader implements BarcodeReaderInterface {
         compatibleModels.add("EDA51");
         compatibleModels.add("CT60");
 
-        if (compatibleModels.contains(model)) {
-            return true;
-        } else return false;
+        return compatibleModels.contains(model);
     }
 
     @Override