diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index 48b927aa..121f0d0e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -9,6 +9,7 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -34,6 +35,7 @@ import it.integry.integrywmsnative.core.rest.model.RettificaULDTO; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO; import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO; +import it.integry.integrywmsnative.core.rest.model.UpdateDepositoULRequestDTO; import it.integry.integrywmsnative.core.rest.model.UpdatePosizioneULRequestDTO; import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO; import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO; @@ -467,6 +469,22 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { }); } + public void updateDepositoULSynchronized(String gestione, LocalDate data, int num, String serie, String newCodMdep) throws Exception { + + UpdateDepositoULRequestDTO updateDepositoULRequest = new UpdateDepositoULRequestDTO() + .setGestione(gestione) + .setData(data) + .setNum(num) + .setSerie(serie); + + ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = restBuilder.getService(ColliMagazzinoRESTConsumerService.class); + Response> response = colliMagazzinoRESTConsumerService + .updateDepositoUL(newCodMdep, updateDepositoULRequest) + .execute(); + + analyzeAnswer(response, "updateDepositoUL"); + } + public void updateDataFine(MtbColt mtbColt, Runnable onComplete, RunnableArgs onFailed) { MtbColt cloneMtbColt = (MtbColt) mtbColt.clone(); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java index f6e69b88..90ee3d06 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java @@ -9,6 +9,7 @@ import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULRequestDTO; import it.integry.integrywmsnative.core.rest.model.SpostaArtsTraULResponseDTO; import it.integry.integrywmsnative.core.rest.model.SpostaULRequestDTO; +import it.integry.integrywmsnative.core.rest.model.UpdateDepositoULRequestDTO; import it.integry.integrywmsnative.core.rest.model.UpdatePosizioneULRequestDTO; import it.integry.integrywmsnative.core.rest.model.UpdateTipoULRequestDTO; import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO; @@ -38,6 +39,9 @@ public interface ColliMagazzinoRESTConsumerService { @POST("wms/updatePosizioneUL") Call> updatePosizioneUL(@Body UpdatePosizioneULRequestDTO requestDto); + @POST("wms/updateDepositoUL") + Call> updateDepositoUL(@Query("newDeposito") String newDeposito, @Body UpdateDepositoULRequestDTO request); + @POST("wms/spostaUL") Call> spostaUL(@Body SpostaULRequestDTO requestDto); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateDepositoULRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateDepositoULRequestDTO.java new file mode 100644 index 00000000..79a70fd0 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateDepositoULRequestDTO.java @@ -0,0 +1,47 @@ +package it.integry.integrywmsnative.core.rest.model; + +import java.time.LocalDate; + +public class UpdateDepositoULRequestDTO { + + private String gestione; + private LocalDate data; + private int num; + private String serie; + + public String getGestione() { + return gestione; + } + + public UpdateDepositoULRequestDTO setGestione(String gestione) { + this.gestione = gestione; + return this; + } + + public LocalDate getData() { + return data; + } + + public UpdateDepositoULRequestDTO setData(LocalDate data) { + this.data = data; + return this; + } + + public int getNum() { + return num; + } + + public UpdateDepositoULRequestDTO setNum(int num) { + this.num = num; + return this; + } + + public String getSerie() { + return serie; + } + + public UpdateDepositoULRequestDTO setSerie(String serie) { + this.serie = serie; + return this; + } +} 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 cc8ef490..adb787f7 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 @@ -1602,7 +1602,11 @@ public class SpedizioneViewModel { String newCodMdep = shouldChangeCodMdep ? refMtbColt.getCodMdep() : null; if (shouldChangeCodMdep) { - mColliMagazzinoRESTConsumer.spostaUlSynchronized(mCurrentMtbColt, newCodMdep, null, false); + mColliMagazzinoRESTConsumer.updateDepositoULSynchronized(mCurrentMtbColt.getGestione(), + mCurrentMtbColt.getDataColloLD(), + mCurrentMtbColt.getNumCollo(), + mCurrentMtbColt.getSerCollo(), + newCodMdep); mCurrentMtbColt.setCodMdep(newCodMdep); } }