From e70d5697c30439e9f4cef7c76bd184132849dc44 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 5 Dec 2024 16:08:48 +0100 Subject: [PATCH 1/3] aggiunto isnull su numero risorse in query recuper materiale versato --- .../rest/ProdRecuperMaterialeRESTConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java index bfa6841a..c29fc86a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java @@ -68,7 +68,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer { " dtb_ord_steps.hr_num as hr, " + " mtb_colr.riga_ord, " + " CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " + - " SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " + + " SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " + " 0)) as percentage_hr " + " FROM mtb_colr " + " INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " + From b48b2fbac95513e37fb106ab102b8840d5893bd4 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 5 Dec 2024 17:24:48 +0100 Subject: [PATCH 2/3] Fix su sorting partita mag nulla in Spedizione --- .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ce43239c..8a4b558b 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 @@ -942,7 +942,7 @@ public class SpedizioneViewModel { if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() == null)) { tmp.addAll(availableBatchLots.stream() .filter(x -> x.getDataScad() == null) - .sorted(Comparator.comparing(MtbPartitaMag::getPartitaMag)) + .sorted(Comparator.comparing(x -> UtilityString.isNull(x.getPartitaMag(), ""))) .collect(Collectors.toList())); } From 403f2ec57c59bff70e2256d9105617d00c38fa4d Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 5 Dec 2024 17:25:42 +0100 Subject: [PATCH 3/3] -> v1.41.11 (459) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d95ad6cb..fd88aa00 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 458 - def appVersionName = '1.41.10' + def appVersionCode = 459 + def appVersionName = '1.41.11' signingConfigs { release {