diff --git a/app/build.gradle b/app/build.gradle index 782f8921..c169c3e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 212 - def appVersionName = '1.16.30' + def appVersionCode = 213 + def appVersionName = '1.16.31' signingConfigs { release { 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 21d99d5d..622657c6 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 @@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull; import java.lang.reflect.Type; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -485,40 +484,31 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { } public static void getByTestataStatic(MtbColt testata, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs onComplete, RunnableArgs onFailed) { - String ssccString = null; + testata.setMtbColr(new ObservableArrayList<>()); - if (testata.getSerCollo().equalsIgnoreCase(CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE)) { - ssccString = "U"; - SimpleDateFormat sdf = new SimpleDateFormat("yy"); - ssccString += sdf.format(testata.getDataColloD()); + ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class); + colliMagazzinoRESTConsumerService.getColloInGiac(onlyResiduo, throwExcIfNull, testata).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + analyzeAnswer(response, "getColloInGiac", mtbColt -> { - ssccString += String.format("%07d", testata.getNumCollo()); - } else { - ssccString = ""; + if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) { + List mtbColtList = new ArrayList<>(); + mtbColtList.add(mtbColt); + fillMtbAartsOfMtbColtsStatic(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed); + } else { + onComplete.run(mtbColt); + } - switch (testata.getGestioneEnum()) { - case ACQUISTO: - ssccString += "1"; - break; - - case LAVORAZIONE: - ssccString += "2"; - break; - - case VENDITA: - ssccString += "3"; - break; + }, onFailed); } - SimpleDateFormat sdf = new SimpleDateFormat("yy"); - ssccString += sdf.format(testata.getDataColloD()); - - ssccString += String.format("%05d", testata.getNumCollo()); - ssccString += "0"; - } - - getBySSCCStatic(ssccString, onlyResiduo, throwExcIfNull, onComplete, onFailed); + @Override + public void onFailure(Call> call, Throwable t) { + onFailed.run(new Exception(t)); + } + }); } 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 69516076..14307d43 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 @@ -24,6 +24,9 @@ public interface ColliMagazzinoRESTConsumerService { @POST("getColloByBarcode") Call> getColloByBarcode(@Query("codBarreCollo") String sscc, @Query("onlyResiduo") boolean onlyResiduo, @Query("throwExcIfNull") boolean throwExcIfNull); + @POST("getColloInGiac") + Call> getColloInGiac(@Query("onlyResiduo") boolean onlyResiduo, @Query("throwExcIfNull") boolean throwExcIfNull, @Body MtbColt mtbColt); + @GET("getColliInBasket") Call>> getColliInBasket(@Query("codMdep") String codMdep);