From d4f44c1ab720c19e898587fe2c5b2454d1f52864 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 16 Mar 2021 17:53:39 +0100 Subject: [PATCH 1/2] Fix vari --- .../rest/consumers/ColliMagazzinoRESTConsumer.java | 9 ++++++--- .../AccettazionePickingViewModel.java | 2 +- .../rest/AccettazionePickingRESTConsumer.java | 10 +++++----- .../lista_bancali/viewmodel/ListaBancaliViewModel.java | 2 +- .../gest/spedizione/SpedizioneViewModel.java | 3 ++- .../input_quantity_v2/DialogInputQuantityV2View.java | 3 +-- .../DialogInputQuantityV2ViewModel.java | 5 ++++- 7 files changed, 20 insertions(+), 14 deletions(-) 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 173231f7..886a1112 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 @@ -411,7 +411,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) { List mtbColtList = new ArrayList<>(); mtbColtList.add(mtbColt); - fillMtbAartsOfMtbColts(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed); + fillMtbAartsOfMtbColtsStatic(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed); } else { onComplete.run(mtbColt); } @@ -426,8 +426,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { }); } + public void fillMtbAartsOfMtbColts(List mtbColts, RunnableArgs> onComplete, RunnableArgs onFailed) { + fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed); + } - public static void fillMtbAartsOfMtbColts(List mtbColts, RunnableArgs> onComplete, RunnableArgs onFailed) { + public static void fillMtbAartsOfMtbColtsStatic(List mtbColts, RunnableArgs> onComplete, RunnableArgs onFailed) { List codMarts = new ArrayList<>(); for (MtbColt mtbColt : mtbColts) { @@ -661,7 +664,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { @Override public void onResponse(Call>> call, Response>> response) { analyzeAnswer(response, "getColliInBasket", mtbColts -> { - fillMtbAartsOfMtbColts(mtbColts, onComplete, onFailed); + fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed); }, onFailed); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index 41097b74..06320e6d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -173,7 +173,7 @@ public class AccettazionePickingViewModel { public void retrieveExistentLU(RunnableArgs> onComplete) { this.sendOnLoadingStarted(); - this.mAccettazionePickingRESTConsumer.getBancaliGiaRegistrati(this.mSitArts, mtbColtList -> { + this.mAccettazionePickingRESTConsumer.getBancaliGiaRegistrati(this.mOrders, mtbColtList -> { this.sendOnLoadingEnded(); onComplete.run(mtbColtList); }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java index 9b6af80d..44a9265d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java @@ -16,7 +16,7 @@ import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityQuery; -import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO; +import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; @Singleton public class AccettazionePickingRESTConsumer { @@ -28,18 +28,18 @@ public class AccettazionePickingRESTConsumer { this.mSystemRestConsumer = systemRESTConsumer; } - public void getBancaliGiaRegistrati(List ordiniToShow, RunnableArgs> onComplete, RunnableArgs onFailed) { + public void getBancaliGiaRegistrati(List ordiniToShow, RunnableArgs> onComplete, RunnableArgs onFailed) { List> whereCondListMap = new ArrayList<>(); Stream .of(ordiniToShow) - .distinctBy(x -> x.getDataOrd() + " " + x.getGestione() + " " + x.getNumOrd()) + .distinctBy(x -> x.getData() + " " + x.getGestione() + " " + x.getNumero()) .forEach(x -> { try { HashMap whereCondMap = new HashMap<>(); - whereCondMap.put("mtb_colr.data_ord", UtilityDate.recognizeDate(x.getDataOrd())); + whereCondMap.put("mtb_colr.data_ord", UtilityDate.recognizeDate(x.getData())); whereCondMap.put("mtb_colr.gestione", x.getGestione().equalsIgnoreCase("P") ? "L" : x.getGestione()); - whereCondMap.put("mtb_colr.num_ord", x.getNumOrd()); + whereCondMap.put("mtb_colr.num_ord", x.getNumero()); whereCondListMap.add(whereCondMap); } catch (Exception ex) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java index f43c2757..274129ea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java @@ -63,7 +63,7 @@ public class ListaBancaliViewModel implements IRecyclerItemClicked { ColliMagazzinoRESTConsumer.getByTestataStatic(item, mLoadOnlyResiduo, false, mtbColt -> { ObservableArrayList mtbColrObservableArrayList = new ObservableArrayList<>(); - mtbColrObservableArrayList.addAll(mtbColt.getMtbColr()); + if(mtbColt != null && mtbColt.getMtbColr() != null) mtbColrObservableArrayList.addAll(mtbColt.getMtbColr()); item.setMtbColr(mtbColrObservableArrayList); progress.dismiss(); 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 66e56442..b9177e1d 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 @@ -1594,7 +1594,8 @@ public class SpedizioneViewModel { IOrdiniVendita ordiniVendita = ClassRouter.getInstance(ClassRouter.PATH.ORDINI_VENDITA); ordiniVendita.distribuisciCollo(cloneMtbColt, mTestateOrdini, mtbColts -> { - mColliMagazzinoRESTConsumer.getMultipleByTestate(mtbColts, false, onComplete, this::sendError); + mColliMagazzinoRESTConsumer.fillMtbAartsOfMtbColts(mtbColts, onComplete, this::sendError); +// mColliMagazzinoRESTConsumer.getMultipleByTestate(mtbColts, false, onComplete, this::sendError); }, this::sendError); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index d908afc4..d074df0f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -145,12 +145,11 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia private final RunnableArgs onScanSuccessful = data -> { BarcodeManager.disable(); - this.openProgress(); this.mViewModel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); this.closeProgress(); + BarcodeManager.enable(); }); }; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index 72f7fa1c..5a5c2e37 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -125,6 +125,9 @@ public class DialogInputQuantityV2ViewModel { this.setNumCnf(BigDecimal.ONE); this.setQtaCnf(UtilityBigDecimal.divide(this.getQtaTot(), this.getNumCnf())); } + + this.unlockNumCnf(); + this.unlockQtaCnf(); } onComplete.run(); @@ -302,7 +305,7 @@ public class DialogInputQuantityV2ViewModel { } if (!this.blockedQtaCnf.get() && !this.mtbAart.get().isFlagQtaCnfFissaBoolean() && this.internalQtaTot != null) - this.internalQtaCnf = UtilityBigDecimal.divide(newValue, internalQtaTot); + this.internalQtaCnf = UtilityBigDecimal.divide(internalQtaTot, newValue); else if (!this.blockedQtaTot.get() && this.internalQtaCnf != null) this.internalQtaTot = UtilityBigDecimal.multiply(newValue, this.internalQtaCnf); From 19b0465569472a4c96996c6ad89dcade5c03e9e3 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 16 Mar 2021 17:55:22 +0100 Subject: [PATCH 2/2] -> v1.16.17 (199) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 10937b3b..6eb4ca23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 198 - def appVersionName = '1.16.16' + def appVersionCode = 199 + def appVersionName = '1.16.17' signingConfigs { release {