From e62e5d11f00d8acaa89d11fcf44b8b56db2d18db Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 19 Jan 2024 17:27:38 +0100 Subject: [PATCH] Impedito prelevamento merce posizionata su depositi diversi --- .../exception/InvalidCodMdepException.java | 10 ++++ .../PickingLiberoViewModel.java | 19 ++++++- .../ProdFabbisognoLineeProdFragment.java | 2 +- .../ProdVersamentoMaterialeViewModel.java | 17 +++++- .../gest/spedizione/SpedizioneViewModel.java | 56 +++++++++++++------ .../VersamentoMerceViewModel.java | 24 +++++++- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 104 insertions(+), 26 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java new file mode 100644 index 00000000..82d3d8a4 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/InvalidCodMdepException.java @@ -0,0 +1,10 @@ +package it.integry.integrywmsnative.core.exception; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.utility.UtilityResources; + +public final class InvalidCodMdepException extends Exception { + public InvalidCodMdepException() { + super(UtilityResources.getString(R.string.invalid_codmdep)); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 6d727dbb..48c17530 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -13,6 +13,7 @@ import java.util.List; 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.NoLUFoundException; import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException; import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException; @@ -211,7 +212,14 @@ public class PickingLiberoViewModel { } } else if (mtbColtList.size() == 1) { this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> { - pickMerceULtoUL(mtbColt, articolo, onComplete); + + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + pickMerceULtoUL(mtbColt, articolo, onComplete); + } else this.sendError(new InvalidCodMdepException()); + }, this::sendError); } else { this.sendError(new TooManyLUFoundInMonoLUPositionException()); @@ -235,7 +243,14 @@ public class PickingLiberoViewModel { if (mtbColtScanned == null) { this.sendError(new NoLUFoundException()); } else if ((mtbColtScanned.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColtScanned.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColtScanned.getSegno() > 0) { - pickMerceULtoUL(mtbColtScanned, onComplete); + + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColtScanned.getCodMdep())); + + if (codMdepIsValid) { + pickMerceULtoUL(mtbColtScanned, onComplete); + } else this.sendError(new InvalidCodMdepException()); + } else { this.sendError(new NoLUFoundException()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java index a1a320c1..749c5096 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java @@ -324,7 +324,7 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi SpedizioneActivity.startActivity(getActivity(), sitArtOrdDTOS, - null, + new ArrayList<>(), new ArrayList<>(), GestioneEnum.LAVORAZIONE, +1, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java index 0a82e599..6aab6a26 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java @@ -14,6 +14,7 @@ import java.util.List; 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.NoLUFoundException; import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException; import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException; @@ -109,7 +110,14 @@ public class ProdVersamentoMaterialeViewModel { this.sendError(new NoLUFoundException()); } else if (mtbColtList.size() == 1) { this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> { - this.onLUOpened(mtbColt); + + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + this.onLUOpened(mtbColt); + } else this.sendError(new InvalidCodMdepException()); + }, this::sendError); } else { this.sendError(new TooManyLUFoundInMonoLUPositionException()); @@ -122,7 +130,12 @@ public class ProdVersamentoMaterialeViewModel { private void executeEtichettaLU(String sscc) { this.mColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> { - this.onLUOpened(mtbColt); + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + this.onLUOpened(mtbColt); + } else this.sendError(new InvalidCodMdepException()); }, this::sendError); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index dd7ab597..0bea560c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -20,6 +20,7 @@ import it.integry.barcode_base_android_library.model.BarcodeScanDTO; import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService; import it.integry.integrywmsnative.core.exception.EmptyLUException; +import it.integry.integrywmsnative.core.exception.InvalidCodMdepException; import it.integry.integrywmsnative.core.exception.InvalidLUException; import it.integry.integrywmsnative.core.exception.NoArtsFoundException; import it.integry.integrywmsnative.core.exception.NoLUFoundException; @@ -158,7 +159,7 @@ public class SpedizioneViewModel { this.mEnableQuantityReset = enableQuantityReset; this.mUseQtaOrd = useQtaOrd; - if (testateOrdini != null) { + if (testateOrdini != null && testateOrdini.size() > 0) { this.mIsOrdTrasf = Stream.of(testateOrdini).map(OrdineUscitaInevasoDTO::isOrdTrasf).withoutNulls().distinctBy(x -> x).findFirst().get(); } @@ -238,19 +239,18 @@ public class SpedizioneViewModel { mDefaultFiltroOrdine.add(filtro); }); + } - if (mDefaultGestioneOfUL == GestioneEnum.VENDITA) { - mColliScaricoRESTConsumer = mColliSpedizioneRESTConsumer; + if (mDefaultGestioneOfUL == GestioneEnum.VENDITA) { + mColliScaricoRESTConsumer = mColliSpedizioneRESTConsumer; - } else if (mDefaultGestioneOfUL == GestioneEnum.LAVORAZIONE && mDefaultSegnoCol == -1) { - mColliScaricoRESTConsumer = mColliLavorazioneRESTConsumer; - - } else if (mDefaultGestioneOfUL == GestioneEnum.LAVORAZIONE && mDefaultSegnoCol == +1) { - mColliScaricoRESTConsumer = mColliLavorazioneRESTConsumer; - } else { - this.sendError(new NotImplementedException(String.format("Gestione %s e segno %d non gestito", mDefaultGestioneOfUL.getText(), mDefaultSegnoCol))); - } + } else if (mDefaultGestioneOfUL == GestioneEnum.LAVORAZIONE && mDefaultSegnoCol == -1) { + mColliScaricoRESTConsumer = mColliLavorazioneRESTConsumer; + } else if (mDefaultGestioneOfUL == GestioneEnum.LAVORAZIONE && mDefaultSegnoCol == +1) { + mColliScaricoRESTConsumer = mColliLavorazioneRESTConsumer; + } else { + this.sendError(new NotImplementedException(String.format("Gestione %s e segno %d non gestito", mDefaultGestioneOfUL.getText(), mDefaultSegnoCol))); } } @@ -492,7 +492,13 @@ public class SpedizioneViewModel { } } else { - this.createNewLU(null, null, () -> searchArtFromUL(mtbColt, onComplete)); + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + this.createNewLU(null, null, () -> searchArtFromUL(mtbColt, onComplete)); + } else this.sendError(new InvalidCodMdepException()); + } }, this::sendError); @@ -530,7 +536,14 @@ public class SpedizioneViewModel { mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> { if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) { - this.searchArtFromUL(mtbColt, onComplete); + + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + this.searchArtFromUL(mtbColt, onComplete); + } else this.sendError(new InvalidCodMdepException()); + } else { this.sendError(new EmptyLUException()); } @@ -546,8 +559,17 @@ public class SpedizioneViewModel { if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) { if (mtbColt.getSegno() != -1) { - searchArtFromUL(mtbColt, onComplete); - } else this.sendError(new InvalidLUException()); + + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + searchArtFromUL(mtbColt, onComplete); + } else this.sendError(new InvalidCodMdepException()); + + } else { + this.sendError(new InvalidLUException()); + } } else { this.sendError(new EmptyLUException()); } @@ -773,7 +795,7 @@ public class SpedizioneViewModel { MtbColt refMtbColt = matchedItem.getRefMtbColt(); if (matchedItem.getMtbColts() != null && matchedItem.getMtbColts().size() == 1) { refMtbColt = matchedItem.getMtbColts().get(0); - } else if(matchedItem.getTempPickData().getSourceMtbColt() != null){ + } else if (matchedItem.getTempPickData().getSourceMtbColt() != null) { refMtbColt = matchedItem.getTempPickData().getSourceMtbColt(); } MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null; @@ -862,8 +884,6 @@ public class SpedizioneViewModel { } else { dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, null, canPartitaMagBeChanged); } - - } private void dispatchOrdineRowOnPostBatchLotSelection(final PickingObjectDTO pickingObjectDTO, MtbColt refMtbColt, MtbColr refMtbColr, MtbColr scannedMtbColr, boolean canPartitaMagBeChanged) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java index 1e856162..3f2b20ef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java @@ -14,6 +14,7 @@ import java.util.List; 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.InvalidLUGestioneException; import it.integry.integrywmsnative.core.exception.NoArtsInLUException; import it.integry.integrywmsnative.core.exception.NoLUFoundException; @@ -135,7 +136,12 @@ public class VersamentoMerceViewModel { mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> { //TAKE HERE - pickMerceULtoUL(mtbColt, onComplete); + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + pickMerceULtoUL(mtbColt, onComplete); + } else this.sendError(new InvalidCodMdepException()); }, this::sendError); } else { @@ -184,11 +190,23 @@ public class VersamentoMerceViewModel { if (mtbColt == null) { this.mColliMagazzinoRESTConsumer.createColloFromEtichettaAnonima(sscc, GestioneEnum.LAVORAZIONE, mtbColtAnonimo -> { onComplete.run(); - pickMerceULtoUL(mtbColtAnonimo, onComplete); + + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + pickMerceULtoUL(mtbColtAnonimo, onComplete); + } else this.sendError(new InvalidCodMdepException()); + }, this::sendError); } else { - pickMerceULtoUL(mtbColt, onComplete); + boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep()) + .anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep())); + + if (codMdepIsValid) { + pickMerceULtoUL(mtbColt, onComplete); + } else this.sendError(new InvalidCodMdepException()); } } diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ded9e2cf..02de1b79 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -143,6 +143,7 @@ %s non è valido. Controllalo e riprova]]> %s sulla porta %d non è al momento raggiungibile. Riprova più tardi]]> Nessun deposito trovato per l\'utente corrente + Impossibile utilizzare unità logistiche di altri depositi Seleziona un database Nessuna riga presente nell\'Unità Logistica diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c8083c22..1858e149 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -141,6 +141,7 @@ %s is not valid. Check and retry later]]> %s on port %d is not reachable. Retry later]]> No deposit available with current user + Unable to use logistics units from other depots Choose a database No rows found in LU