From 4445e9aff2f6f41fd3f2a4070740180c340a2f1c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 2 Mar 2023 11:10:03 +0100 Subject: [PATCH] Rimossa domanda di cambio posizione per le rettifiche di spedizione. Cambiata response di save doc in rettifica di spedizione. --- .../rest/consumers/_BaseRESTConsumer.java | 1 + .../RettificaGiacenzeViewModel.java | 46 ++++++++++++------- .../rest/RettificaGiacenzeRESTConsumer.java | 7 ++- .../RettificaGiacenzeRESTConsumerService.java | 4 +- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java index 1166cc28..e513aeca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java @@ -101,6 +101,7 @@ public abstract class _BaseRESTConsumer { if (response.getEsito() == EsitoType.OK) { if (!UtilityString.isNullOrEmpty(response.getErrorMessage())) { onFailed.run(new Exception(response.getErrorMessage())); + return; } else { T dataObj = response.getDto() != null ? response.getDto() : diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index 563bd31b..6c8483fe 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -442,23 +442,14 @@ public class RettificaGiacenzeViewModel { Runnable saveAction = () -> { this.mColliMagazzinoRESTConsumer.updateDataFine( mCurrentMtbColt, () -> { - this.sendLUPositionChangeRequest((shouldChangePosition, mtbDepoPosizione) -> { - - if (shouldChangePosition) { - this.savePosizione(mtbDepoPosizione, () -> { - this.createDoc(() -> { - this.mAnyEditDone = false; - postSaveBehaviour(onComplete); - }); - }); - } else { - this.createDoc(() -> { - this.mAnyEditDone = false; - postSaveBehaviour(onComplete); - }); - } + this.askPostionChange(mCurrentMtbColt, () -> { + this.createDoc(mCurrentMtbColt, () -> { + this.mAnyEditDone = false; + postSaveBehaviour(onComplete); + }); }); + }, this::sendError); }; @@ -474,7 +465,30 @@ public class RettificaGiacenzeViewModel { } - private void createDoc(Runnable onComplete) { + private void askPostionChange(MtbColt mtbColt, Runnable onComplete) { + if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1) { + onComplete.run(); + return; + } + + + this.sendLUPositionChangeRequest((shouldChangePosition, mtbDepoPosizione) -> { + if (shouldChangePosition) { + this.savePosizione(mtbDepoPosizione, () -> { + onComplete.run(); + }); + } else { + onComplete.run(); + } + }); + } + + private void createDoc(MtbColt mtbColt, Runnable onComplete) { + if (mtbColt.getGestioneEnum() != GestioneEnum.VENDITA && mtbColt.getSegno() != -1) { + onComplete.run(); + return; + } + mRettificaGiacenzeRESTConsumer.saveDoc(this.mCurrentMtbColt, onComplete, this::sendError); } 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 d587b3c3..366b0211 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 @@ -5,7 +5,6 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collections; -import java.util.List; import javax.inject.Singleton; @@ -101,12 +100,12 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer { service.saveDocFromPickingPvm(request) .enqueue(new Callback<>() { @Override - public void onResponse(Call>> call, Response>> response) { - analyzeListOfAnswers(response, "saveDocFromPickingPvm", data -> onComplete.run(), onError); + public void onResponse(Call> call, Response> response) { + analyzeAnswerList(response, "saveDocFromPickingPvm", data -> onComplete.run(), onError); } @Override - public void onFailure(Call>> call, Throwable t) { + public void onFailure(Call> call, Throwable t) { onError.run(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumerService.java index 837efa12..fd6ae1d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumerService.java @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.rest; -import java.util.List; - import it.integry.integrywmsnative.core.rest.model.SaveDocFromPickingRequestDTO; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; @@ -12,6 +10,6 @@ public interface RettificaGiacenzeRESTConsumerService { @POST("saveDocFromPickingPvm") - Call>> saveDocFromPickingPvm(@Body SaveDocFromPickingRequestDTO saveDocFromPickingRequestDTO); + Call> saveDocFromPickingPvm(@Body SaveDocFromPickingRequestDTO saveDocFromPickingRequestDTO); }