From f1f56b97d64fbd3b5a5e9ede21b46ea352003eb0 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 21 Feb 2024 11:34:16 +0100 Subject: [PATCH] Aggiornato servizio di createUdc in Rettifica Giacenze --- .../rest/RettificaGiacenzeRESTConsumer.java | 2 ++ .../DialogScanOrCreateLUModule.java | 13 +++++++++++-- .../DialogScanOrCreateLUViewModel.java | 12 ++++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java index a08054f6..3ed3faa7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java @@ -81,6 +81,8 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer { Response>> response) { analyzeAnswer(response, "searchByCodMartOrBarcode", data -> { + if(data == null) data = new ArrayList<>(); + var listToReturn = Stream.of(data) .map(x -> x.getMtbAart() .setQtaEsistente(x.getQtaEsistente()) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUModule.java index 1fccde3c..6487b1b3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUModule.java @@ -4,6 +4,7 @@ import dagger.Module; import dagger.Provides; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; @@ -11,8 +12,16 @@ import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; public class DialogScanOrCreateLUModule { @Provides - DialogScanOrCreateLUViewModel providesDialogScanOrCreateLUViewModel(PosizioniRESTConsumer posizioniRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) { - return new DialogScanOrCreateLUViewModel(posizioniRESTConsumer, barcodeRESTConsumer, colliMagazzinoRESTConsumer, articoloRESTConsumer); + DialogScanOrCreateLUViewModel providesDialogScanOrCreateLUViewModel( + PosizioniRESTConsumer posizioniRESTConsumer, + BarcodeRESTConsumer barcodeRESTConsumer, + ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, + ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer, + ArticoloRESTConsumer articoloRESTConsumer) { + + return new DialogScanOrCreateLUViewModel(posizioniRESTConsumer, + barcodeRESTConsumer, colliMagazzinoRESTConsumer, + colliLavorazioneRESTConsumer, articoloRESTConsumer); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java index 0c3c77b3..990b2bd1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java @@ -14,8 +14,10 @@ import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityPosizione; @@ -27,6 +29,7 @@ public class DialogScanOrCreateLUViewModel { private final PosizioniRESTConsumer mPosizioniRESTConsumer; private final BarcodeRESTConsumer mBarcodeRESTConsumer; private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer; + private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer; private final ArticoloRESTConsumer mArticoloRESTConsumer; private boolean mShouldCheckResiduo = false; @@ -36,10 +39,11 @@ public class DialogScanOrCreateLUViewModel { private Listener mListener; - public DialogScanOrCreateLUViewModel(PosizioniRESTConsumer mPosizioniRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) { + public DialogScanOrCreateLUViewModel(PosizioniRESTConsumer mPosizioniRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) { this.mPosizioniRESTConsumer = mPosizioniRESTConsumer; this.mBarcodeRESTConsumer = barcodeRESTConsumer; this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer; + this.mColliLavorazioneRESTConsumer = mColliLavorazioneRESTConsumer; this.mArticoloRESTConsumer = articoloRESTConsumer; } @@ -53,7 +57,11 @@ public class DialogScanOrCreateLUViewModel { public void createNewLU() { this.sendOnLoadingStarted(); - this.mColliMagazzinoRESTConsumer.createColloLavorazione(+1, createdMtbColt -> { + + var createUdcRequest = new CreateUDCRequestDTO() + .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()); + + this.mColliLavorazioneRESTConsumer.createUDC(createUdcRequest, createdMtbColt -> { this.sendOnLoadingEnded(); this.sendOnLUOpened(createdMtbColt, true); }, this::sendError);