Finish v1.38.01(411)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 410
+    def appVersionCode = 411
-    def appVersionName = '1.38.00'
+    def appVersionName = '1.38.01'
 
     signingConfigs {
         release {
@@ -25,8 +25,8 @@ android {
         }
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
-        variant.outputs.all { output ->
+        variant.outputs.configureEach { output ->
             output.outputFileName = "android-release.apk"
         }
     }

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java

@@ -7,6 +7,7 @@ import java.util.Date;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 public class MtbColr extends EntityBase {
 
@@ -372,7 +373,7 @@ public class MtbColr extends EntityBase {
     }
 
     public String getDescrizione() {
-        return descrizione;
+        return UtilityString.isNull(descrizione, getMtbAart() != null ? UtilityString.isNull(getMtbAart().getDescrizioneEstesa(), getMtbAart().getDescrizione()) : null);
     }
 
     public MtbColr setDescrizione(String descrizione) {

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java

@@ -9,7 +9,6 @@ import java.util.List;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbDepo;
 
 @Singleton
@@ -28,27 +27,4 @@ public class DepositoRESTConsumer extends _BaseRESTConsumer {
         }.getType();
         this.systemRESTConsumer.processSql("SELECT * FROM mtb_depo", typeOfObjectsList, onComplete, onFailed);
     }
-
-    public void getDepoByCodMdep(String codMdep, RunnableArgs<MtbDepo> onComplete, RunnableArgs<Exception> onFailed) {
-
-        MtbDepo mtbDepo = new MtbDepo();
-        mtbDepo.setCodMdep(codMdep);
-        mtbDepo.setOperation(CommonModelConsts.OPERATION.SELECT);
-        mtbDepo.setOnlyPkMaster(false);
-
-        this.entityRESTConsumer.selectEntity(mtbDepo, new ISimpleOperationCallback<>() {
-            @Override
-            public void onSuccess(List<MtbDepo> value) {
-                if (value != null && value.size() > 0) {
-                    onComplete.run(value.get(0));
-                }
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                onFailed.run(ex);
-            }
-        }, MtbDepo.class);
-    }
-
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java

@@ -121,11 +121,12 @@ public class EntityRESTConsumer extends _BaseRESTConsumer {
     }
 
 
+    @Deprecated
     public <T extends EntityBase> void selectEntity(T entityToSave, final ISimpleOperationCallback<List<T>> callback, Class type) {
 
         EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
         Call<ServiceRESTResponse<JsonObject>> request = service.processEntity(entityToSave);
-        request.enqueue(new Callback<ServiceRESTResponse<JsonObject>>() {
+        request.enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<JsonObject>> call, Response<ServiceRESTResponse<JsonObject>> response) {
                 if (response.isSuccessful()) {

app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java

@@ -25,6 +25,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume
 import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ui.ContenutoBancaleListAdapter;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
@@ -124,9 +125,10 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
     }
 
     private void initColloInfo() {
-        mDepositoRESTConsumer.getDepoByCodMdep(mtbColt.get().getCodMdep(), depo -> {
+        SettingsManager.iDB().getAvailableCodMdep().stream()
-            descrizioneDepo.set("(" + depo.getDescrizione() + ")");
+                .filter(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.get().getCodMdep()))
-        }, this::onError);
+                .findFirst()
+                .ifPresent(x -> descrizioneDepo.set("(" + x.getDescrizione() + ")"));
     }
 
     private void initFab() {

app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliViewModel.java

@@ -26,18 +26,16 @@ public class ListaBancaliViewModel {
     public void dispatchMtbColt(MtbColt mtbColtToDispatch, boolean onlyResiduo, RunnableArgs<MtbColt> onComplete) {
         this.sendOnLoadingStarted();
 
-        new Thread(() -> {
         mColliMagazzinoRESTConsumer.getByTestata(mtbColtToDispatch, onlyResiduo, false, mtbColt -> {
             this.sendOnLoadingEnded();
 
             ObservableArrayList<MtbColr> mtbColrObservableArrayList = new ObservableArrayList<>();
-                if(mtbColt != null && mtbColt.getMtbColr() != null) mtbColrObservableArrayList.addAll(mtbColt.getMtbColr());
+            if (mtbColt != null && mtbColt.getMtbColr() != null)
+                mtbColrObservableArrayList.addAll(mtbColt.getMtbColr());
             mtbColtToDispatch.setMtbColr(mtbColrObservableArrayList);
 
             onComplete.run(mtbColtToDispatch);
         }, this::sendError);
-
-        }).start();
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java

@@ -70,17 +70,16 @@ public class ProdFabbisognoLineeProdViewModel {
         this.sendOnLoadingStarted();
 
         this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(ordini, codMdep, jtbFasi -> {
-            if (jtbFasi != null) {
+            if (jtbFasi == null) jtbFasi = new ArrayList<>();
+
             Stream.of(jtbFasi)
                     .forEach(x -> {
                         x.setDataInizio(dataInizio);
                         x.setDataFine(dataFine);
                     });
+
             this.sendOnLoadingEnded();
             onComplete.run(jtbFasi);
-            } else {
-                this.mListener.onError(new NoOrdersScheduledException());
-            }
         }, this::sendError);
     }
 

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

@@ -1269,6 +1269,9 @@ public class SpedizioneViewModel {
     }
 
     public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
+        int causaleCollo = 0;
+        if (mDefaultGestioneOfUL == GestioneEnum.LAVORAZIONE && mDefaultSegnoCol == +1) causaleCollo = 1;
+
         final List<CreateUDSRequestOrderDTO> orders = Stream.of(this.mTestateOrdini)
                 .map(x -> new CreateUDSRequestOrderDTO()
                         .setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null)
@@ -1282,6 +1285,7 @@ public class SpedizioneViewModel {
                 .setSegno(mDefaultSegnoCol)
                 .setNumCollo(customNumCollo)
                 .setSerCollo(customSerCollo)
+                .setCausaleCollo(causaleCollo)
                 .setOrders(orders);
 
         this.mColliScaricoRESTConsumer.createUDS(createUDSRequestDTO, createdUDS -> {
@@ -1517,7 +1521,7 @@ public class SpedizioneViewModel {
                 //.setPrintSSCC(shouldPrint)
                 .setOrderCodMdep(codMdep);
 
-        this.mColliSpedizioneRESTConsumer.closeUDS(closeUDSRequestDto, closeResponse -> {
+        this.mColliScaricoRESTConsumer.closeUDS(closeUDSRequestDto, closeResponse -> {
             onComplete.run(closeResponse.getGeneratedMtbColts());
         }, this::sendError);