From 707c8523778590671bb68098f2d74ce8b0b5791a Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 23 Jan 2024 16:10:54 +0100 Subject: [PATCH 1/3] Fix per fabbisogno linee --- .../ProdFabbisognoLineeProdViewModel.java | 21 +++++++++---------- .../gest/spedizione/SpedizioneViewModel.java | 6 +++++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java index a38f9453..f3f8a1a7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java +++ b/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) { - Stream.of(jtbFasi) - .forEach(x -> { - x.setDataInizio(dataInizio); - x.setDataFine(dataFine); - }); - this.sendOnLoadingEnded(); - onComplete.run(jtbFasi); - } else { - this.mListener.onError(new NoOrdersScheduledException()); - } + if (jtbFasi == null) jtbFasi = new ArrayList<>(); + + Stream.of(jtbFasi) + .forEach(x -> { + x.setDataInizio(dataInizio); + x.setDataFine(dataFine); + }); + + this.sendOnLoadingEnded(); + onComplete.run(jtbFasi); }, this::sendError); } 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 2666ee5d..fe02ceb5 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 @@ -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 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); From 4f4dea9097ae98d0f27792caeb8e1b76d6bbfcfd Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 23 Jan 2024 18:19:03 +0100 Subject: [PATCH 2/3] Fix descrizione riga UL in ContenutoBancaleActivity --- app/build.gradle | 4 ++-- .../integrywmsnative/core/model/MtbColr.java | 3 ++- .../rest/consumers/DepositoRESTConsumer.java | 24 ------------------- .../rest/consumers/EntityRESTConsumer.java | 3 ++- .../ContenutoBancaleActivity.java | 10 ++++---- .../lista_bancali/ListaBancaliViewModel.java | 18 +++++++------- 6 files changed, 20 insertions(+), 42 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 71b32d7a..88a6a8c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,8 @@ android { } } - applicationVariants.all { variant -> - variant.outputs.all { output -> + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { output -> output.outputFileName = "android-release.apk" } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index ffaf32b9..e1b424d0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/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) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java index ad4bb337..93853e04 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java +++ b/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 onComplete, RunnableArgs 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 value) { - if (value != null && value.size() > 0) { - onComplete.run(value.get(0)); - } - } - - @Override - public void onFailed(Exception ex) { - onFailed.run(ex); - } - }, MtbDepo.class); - } - } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java index 15a94255..1a23b78f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java @@ -121,11 +121,12 @@ public class EntityRESTConsumer extends _BaseRESTConsumer { } + @Deprecated public void selectEntity(T entityToSave, final ISimpleOperationCallback> callback, Class type) { EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class); Call> request = service.processEntity(entityToSave); - request.enqueue(new Callback>() { + request.enqueue(new Callback<>() { @Override public void onResponse(Call> call, Response> response) { if (response.isSuccessful()) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java index 7af712ed..bbb66d67 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java +++ b/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 -> { - descrizioneDepo.set("(" + depo.getDescrizione() + ")"); - }, this::onError); + SettingsManager.iDB().getAvailableCodMdep().stream() + .filter(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.get().getCodMdep())) + .findFirst() + .ifPresent(x -> descrizioneDepo.set("(" + x.getDescrizione() + ")")); } private void initFab() { @@ -138,7 +140,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB fabPopupMenu.setForceShowIcon(true); fabPopupMenu.getMenuInflater().inflate(R.menu.contenuto_bancale_fab_menu, fabPopupMenu.getMenu()); - if(mtbColt.get().isDocumentPresent()){ + if (mtbColt.get().isDocumentPresent()) { fabPopupMenu.getMenu().removeItem(R.id.delete_ul); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliViewModel.java index 6f28e59c..9b9e05f4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliViewModel.java +++ b/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 onComplete) { this.sendOnLoadingStarted(); - new Thread(() -> { - mColliMagazzinoRESTConsumer.getByTestata(mtbColtToDispatch, onlyResiduo, false, mtbColt -> { - this.sendOnLoadingEnded(); + mColliMagazzinoRESTConsumer.getByTestata(mtbColtToDispatch, onlyResiduo, false, mtbColt -> { + this.sendOnLoadingEnded(); - ObservableArrayList mtbColrObservableArrayList = new ObservableArrayList<>(); - if(mtbColt != null && mtbColt.getMtbColr() != null) mtbColrObservableArrayList.addAll(mtbColt.getMtbColr()); - mtbColtToDispatch.setMtbColr(mtbColrObservableArrayList); + ObservableArrayList mtbColrObservableArrayList = new ObservableArrayList<>(); + if (mtbColt != null && mtbColt.getMtbColr() != null) + mtbColrObservableArrayList.addAll(mtbColt.getMtbColr()); + mtbColtToDispatch.setMtbColr(mtbColrObservableArrayList); - onComplete.run(mtbColtToDispatch); - }, this::sendError); - - }).start(); + onComplete.run(mtbColtToDispatch); + }, this::sendError); } From 61810c44c782f37b21ffa9ef3e58bd5a2ff0768a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 23 Jan 2024 18:20:52 +0100 Subject: [PATCH 3/3] -> v1.38.01 (411) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 88a6a8c8..944ba533 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 410 - def appVersionName = '1.38.00' + def appVersionCode = 411 + def appVersionName = '1.38.01' signingConfigs { release {