From dd9789c4f350e3ca2e499316fec0a9e6f6beb69f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 24 Mar 2022 16:58:58 +0100 Subject: [PATCH 1/3] Fix su dismiss del DialogInputQuantity --- .../input_quantity_v2/DialogInputQuantityV2View.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 3475fb95..13b28764 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 @@ -87,6 +87,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia private int mBarcodeScannerIstanceID; private boolean mFirstStart = true; + private boolean mAbort = true; public DialogInputQuantityV2View setDialogInputQuantityV2DTO(DialogInputQuantityV2DTO mDialogInputQuantityV2DTO) { @@ -184,22 +185,25 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia public void save() { if (this.mViewModel.validate()) { - this.mOnComplete.run(this.mViewModel.getResult(), false); + this.mAbort = false; dismiss(); + this.mOnComplete.run(this.mViewModel.getResult(), false); } } public void saveAndCloseLU() { if (this.mViewModel.validate()) { - this.mOnComplete.run(this.mViewModel.getResult(), true); + this.mAbort = false; dismiss(); + this.mOnComplete.run(this.mViewModel.getResult(), true); } } @Override public void onDismiss(@NonNull DialogInterface dialog) { + BarcodeManager.removeCallback(mBarcodeScannerIstanceID); - this.mOnAbort.run(); + if(mAbort) this.mOnAbort.run(); super.onDismiss(dialog); } From d3ee6d9ea3a82d77cc1c25ed1dcd1ffcc4eb29f2 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 24 Mar 2022 17:25:47 +0100 Subject: [PATCH 2/3] Aggiornato filtro ordine in caso di recupera UL. --- .../core/rest/consumers/OrdiniRESTConsumer.java | 17 +++++++++-------- .../gest/spedizione/SpedizioneViewModel.java | 10 +++++++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java index 90a58958..177a0c9b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java @@ -93,7 +93,8 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { && (!UtilityString.isNullOrEmpty(x.getPartitaMag()) && x.getPartitaMag().equalsIgnoreCase(mtbColr.getPartitaMag()))) .findFirst(); - if (optionalMtbPartitaMag.isPresent()) mtbColr.setMtbPartitaMag(optionalMtbPartitaMag.get()); + if (optionalMtbPartitaMag.isPresent()) + mtbColr.setMtbPartitaMag(optionalMtbPartitaMag.get()); } } } @@ -182,13 +183,13 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { } String baseSql = "SELECT DISTINCT mtb_colt.* " + - "FROM mtb_colt, " + - " mtb_colr " + - "WHERE mtb_colt.gestione = mtb_colr.gestione " + - " AND mtb_colt.ser_collo = mtb_colr.ser_collo " + - " AND mtb_colt.data_collo = mtb_colr.data_collo " + - " AND mtb_colt.num_collo = mtb_colr.num_collo " + - " AND " + whereCondGestione + + "FROM mtb_colt " + + " INNER JOIN mtb_colr ON " + + " mtb_colt.gestione = mtb_colr.gestione " + + " AND mtb_colt.ser_collo = mtb_colr.ser_collo " + + " AND mtb_colt.data_collo = mtb_colr.data_collo " + + " AND mtb_colt.num_collo = mtb_colr.num_collo " + + " WHERE " + whereCondGestione + " AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " + " AND mtb_colt.data_doc IS NULL AND "; 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 85209507..0ea058d8 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 @@ -78,7 +78,7 @@ public class SpedizioneViewModel { private GestioneEnum mDefaultGestioneOfUL = null; private int mDefaultSegnoCol = -1; private String mDefaultCodMdep = null; - private List mDefaultFiltroOrdine = new ArrayList<>(); + private final List mDefaultFiltroOrdine = new ArrayList<>(); private String mDefaultCodAnagOfUL = null; private String mDefaultRagSocOfUL = null; private String mDefaultRifOrdOfUL = null; @@ -1749,13 +1749,17 @@ public class SpedizioneViewModel { public void recoverLU(MtbColt mtbColt) { + this.sendOnLoadingStarted(); this.mCurrentMtbColt = mtbColt; mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini); this.mCurrentMtbColt.generaFiltroOrdineFromDTO(mDefaultFiltroOrdine); - this.resetMatchedRows(); - this.sendLUOpened(this.mCurrentMtbColt); + this.mColliMagazzinoRESTConsumer.saveCollo(this.mCurrentMtbColt, savedMtbColt -> { + this.resetMatchedRows(); + this.sendLUOpened(this.mCurrentMtbColt); + this.sendOnLoadingEnded(); + }, this::sendError); } private void postCloseOperations(List mtbColtList) { From b19b438489097f5b2eb9ccec7d3a496ff3b7014b Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 24 Mar 2022 17:26:48 +0100 Subject: [PATCH 3/3] -> v1.24.5 (273) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 008f195a..5731358c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 272 - def appVersionName = '1.24.4' + def appVersionCode = 273 + def appVersionName = '1.24.5' signingConfigs { release {