Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rimossa domanda di cambio posizione per le rettifiche di spedizione. Cambiata response di save doc in rettifica di spedizione.

Browse Source
This commit is contained in:
Giuseppe Scorrano
2023-03-02 11:10:03 +01:00
parent 9cd0855dcf
commit 4445e9aff2
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java
View File

@@ -101,6 +101,7 @@ public abstract class _BaseRESTConsumer {
if (response.getEsito() == EsitoType.OK) { if (response.getEsito() == EsitoType.OK) {
if (!UtilityString.isNullOrEmpty(response.getErrorMessage())) { if (!UtilityString.isNullOrEmpty(response.getErrorMessage())) {
onFailed.run(new Exception(response.getErrorMessage())); onFailed.run(new Exception(response.getErrorMessage()));
return;
} else { } else {
T dataObj = response.getDto() != null ? T dataObj = response.getDto() != null ?
response.getDto() : response.getDto() :

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

@@ -442,23 +442,14 @@ public class RettificaGiacenzeViewModel {
Runnable saveAction = () -> { Runnable saveAction = () -> {
this.mColliMagazzinoRESTConsumer.updateDataFine( this.mColliMagazzinoRESTConsumer.updateDataFine(
mCurrentMtbColt, () -> { 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); }, 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); mRettificaGiacenzeRESTConsumer.saveDoc(this.mCurrentMtbColt, onComplete, this::sendError);
} }

7
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java
View File

@@ -5,7 +5,6 @@ import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -101,12 +100,12 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
service.saveDocFromPickingPvm(request) service.saveDocFromPickingPvm(request)
.enqueue(new Callback<>() { .enqueue(new Callback<>() {
@Override @Override
public void onResponse(Call<List<ServiceRESTResponse<Void>>> call, Response<List<ServiceRESTResponse<Void>>> response) { public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
analyzeListOfAnswers(response, "saveDocFromPickingPvm", data -> onComplete.run(), onError); analyzeAnswerList(response, "saveDocFromPickingPvm", data -> onComplete.run(), onError);
} }
@Override @Override
public void onFailure(Call<List<ServiceRESTResponse<Void>>> call, Throwable t) { public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
onError.run(new Exception(t)); onError.run(new Exception(t));
} }
}); });

4
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumerService.java
View File

@@ -1,7 +1,5 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.rest; 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.SaveDocFromPickingRequestDTO;
import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
import retrofit2.Call; import retrofit2.Call;
@@ -12,6 +10,6 @@ public interface RettificaGiacenzeRESTConsumerService {
@POST("saveDocFromPickingPvm") @POST("saveDocFromPickingPvm")
Call<List<ServiceRESTResponse<Void>>> saveDocFromPickingPvm(@Body SaveDocFromPickingRequestDTO saveDocFromPickingRequestDTO); Call<ServiceRESTResponse<Void>> saveDocFromPickingPvm(@Body SaveDocFromPickingRequestDTO saveDocFromPickingRequestDTO);
} }