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

Merge branch 'feature/RefactoringGestioneColli' into master-beta

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-04-10 17:02:02 +02:00
parent b9bbbabc5c 17b0454f8b
commit 4500696bcd
4 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
View File

@@ -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<ServiceRESTResponse<Void>> response = colliMagazzinoRESTConsumerService
.updateDepositoUL(newCodMdep, updateDepositoULRequest)
.execute();
analyzeAnswer(response, "updateDepositoUL");
}
public void updateDataFine(MtbColt mtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
MtbColt cloneMtbColt = (MtbColt) mtbColt.clone();

4
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
View File

@@ -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<ServiceRESTResponse<Void>> updatePosizioneUL(@Body UpdatePosizioneULRequestDTO requestDto);
@POST("wms/updateDepositoUL")
Call<ServiceRESTResponse<Void>> updateDepositoUL(@Query("newDeposito") String newDeposito, @Body UpdateDepositoULRequestDTO request);
@POST("wms/spostaUL")
Call<ServiceRESTResponse<Void>> spostaUL(@Body SpostaULRequestDTO requestDto);

47
app/src/main/java/it/integry/integrywmsnative/core/rest/model/UpdateDepositoULRequestDTO.java Normal file
View File

@@ -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;
}
}

6
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@@ -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);
}
}