From f11a81ef05ed63bab9bcadb487547664898e2ccb Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 17 Feb 2022 11:42:27 +0100 Subject: [PATCH 1/4] gestita where cond in caso di filtro null --- .../core/rest/consumers/ArticoloRESTConsumer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java index 23eda756..deadedff 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java @@ -83,7 +83,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer { @Override public void onResponse(Call> call, Response> response) { analyzeAnswer(response, "getByCodMart", (m) -> { - if(response.body().getEntityList() != null && !response.body().getEntityList().isEmpty()) { + if (response.body().getEntityList() != null && !response.body().getEntityList().isEmpty()) { onComplete.run(response.body().getEntityList().get(0)); } else onComplete.run(null); @@ -107,9 +107,10 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer { }) .toList(); - var whereCond = " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap); + var whereCond = whereCondMap.isEmpty() ? "" : " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap); - Type typeOfObjectsList = new TypeToken>() {}.getType(); + Type typeOfObjectsList = new TypeToken>() { + }.getType(); this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed); } From 8a1b3a1b001df5042bdbd5035f408d4e35bc9ed9 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 17 Feb 2022 11:43:04 +0100 Subject: [PATCH 2/4] aggiunto controllo sulla qta ordinata nulla per rettifica giacenze --- .../DialogInputQuantityV2View.java | 13 ++++++++++--- 1 file changed, 10 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 3dbac6b5..1f2e7887 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 @@ -378,9 +378,16 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia this.enabledLUCloseButton.set(this.mDialogInputQuantityV2DTO.isCanLUBeClosed()); this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg()); - this.currentTextNumCnfToTake.set(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue()); - int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue(); - this.currentTextNumPezziToTake.set(qtaText); + if (this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd() != null) { + this.currentTextNumCnfToTake.set(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue()); + int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue(); + this.currentTextNumPezziToTake.set(qtaText); + } else { + this.currentTextNumCnfToTake.set(0); + this.currentTextNumPezziToTake.set(0); + + } + } From 84cff70567fe05e7f854e908d7c5bf7fd7f561dd Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 17 Feb 2022 11:43:33 +0100 Subject: [PATCH 3/4] aggiunto controllo su testate ordini per approvvigionamento da lavorazione --- .../gest/spedizione/SpedizioneViewModel.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 ebb2c0a3..806a757d 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 @@ -1762,10 +1762,12 @@ public class SpedizioneViewModel { .filter(x -> !this.mColliRegistrati.contains(x)) .forEach(x -> this.mColliRegistrati.add(x)); - for (MtbColt mtbColt : mtbColtList) { - Stream.of(mTestateOrdini) - .filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrdD().equals(mtbColt.getDataOrdD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum()) - .forEach(x -> x.setExistColloBoolean(true)); + if (mTestateOrdini != null) { + for (MtbColt mtbColt : mtbColtList) { + Stream.of(mTestateOrdini) + .filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrdD().equals(mtbColt.getDataOrdD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum()) + .forEach(x -> x.setExistColloBoolean(true)); + } } if (mMtbColtSessionID != null) From f037617dd943f302c74cb7e88f84df37921ed304 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 17 Feb 2022 11:44:17 +0100 Subject: [PATCH 4/4] -> v1.23.3 (258) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a96a8246..8de5120d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 257 - def appVersionName = '1.23.2' + def appVersionCode = 258 + def appVersionName = '1.23.3' signingConfigs { release {