From 5c5216e20747612fdece026565eb37730436c1ff Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 6 May 2024 12:49:18 +0200 Subject: [PATCH 1/6] Aggiornato gradle plugin 8.4.0 --- .idea/deploymentTargetSelector.xml | 13 +++++++++++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 .idea/deploymentTargetSelector.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 00000000..cf9149f6 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index a814d42b..d0fd349c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.9.20' - agp_version = '8.3.2' + agp_version = '8.4.0' } repositories { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 383bd37e..0b456dee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Feb 13 15:14:43 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 027d0e891bf8b3785b15fd74272c1459cc044432 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 7 May 2024 18:21:40 +0200 Subject: [PATCH 2/6] Fix stream in spedizione --- .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java | 3 ++- 1 file changed, 2 insertions(+), 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 7a5cdf3d..2b3594e2 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 @@ -1870,7 +1870,8 @@ public class SpedizioneViewModel { .setNumOrd(ord.getNumOrd()) .setGestione(ord.getGestione()) .setCodAnag(ord.getCodAnagOrd()) - ).toList(); + ) + .collect(Collectors.toList()); dto.setPrintList(closedOrders); printClosedOrders(dto, this::onOrderClosedPrintingDone, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded)); From 6cded1d2d1bbc9d03a3f19ca5c9e42febfc19b6a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 7 May 2024 18:22:23 +0200 Subject: [PATCH 3/6] -> v1.40.17 (434) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3d9d3a2b..a00464e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 433 - def appVersionName = '1.40.16' + def appVersionCode = 434 + def appVersionName = '1.40.17' signingConfigs { release { From e45a980ce3755b7400f0f0fc7a0eb970d58b8298 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 10 May 2024 15:44:23 +0200 Subject: [PATCH 4/6] Aggiunto dateTimeRow in ArtDTO --- .idea/deploymentTargetSelector.xml | 3 --- .../gest/contab_doc_interni/dto/ArtDTO.java | 12 ++++++++++++ .../edit_form/DocInterniEditFormViewModel.java | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index cf9149f6..b268ef36 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -2,9 +2,6 @@ - - diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java index 4d0a9db1..33b2d4a1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java @@ -29,8 +29,11 @@ public class ArtDTO { private LocalDate dataScad; private String systemNote; + private String codAlis; + private Date datetimeRow; + public Integer getRigaOrd() { return rigaOrd; } @@ -135,4 +138,13 @@ public class ArtDTO { this.codAlis = codAlis; return this; } + + public Date getDatetimeRow() { + return datetimeRow; + } + + public ArtDTO setDatetimeRow(Date datetimeRow) { + this.datetimeRow = datetimeRow; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java index 3ceab727..c8133c7e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java @@ -240,6 +240,7 @@ public class DocInterniEditFormViewModel { artDto.setBarcode(row.getCodBarre()); artDto.setQta(BigDecimal.valueOf(row.getQtaCol())); artDto.setDataIns(row.getDataCollo()); + artDto.setDatetimeRow(row.getDatetimeRow()); artDto.setColli(BigDecimal.valueOf(row.getNumCnf())); artDto.setUntMis(row.getUntMis()); artDto.setCodMart(row.getCodMart()); From c616a9d31ab094361acef1f4f706038914109b4b Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 14 May 2024 16:55:45 +0200 Subject: [PATCH 5/6] Fix InputQuantity in rettifica giaccenze --- .../RettificaGiacenzeViewModel.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index d4ccee63..b8266759 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -167,8 +167,8 @@ public class RettificaGiacenzeViewModel { this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> { if (onComplete != null) onComplete.run(); - if (mtbAartList != null && mtbAartList.size() > 0) { - this.dispatchArts(mtbAartList); + if (mtbAartList != null && !mtbAartList.isEmpty()) { + this.dispatchArts(mtbAartList, pickData); } else { this.sendError(new NoResultFromBarcodeException(barcodeProd)); } @@ -189,7 +189,7 @@ public class RettificaGiacenzeViewModel { .map(x -> (MtbAart) x.getMtbAart()) .toList(); - dispatchArts(mtbAarts); + dispatchArts(mtbAarts, null); }, this::sendError); } @@ -199,14 +199,13 @@ public class RettificaGiacenzeViewModel { mRettificaGiacenzeRESTConsumer.searchArtInt(queryText, listaArts -> { this.sendOnLoadingEnded(); - dispatchArts(listaArts); + dispatchArts(listaArts, null); if (onComplete != null) onComplete.run(); }, this::sendError); } - - private void dispatchArts(List artsList) { + private void dispatchArts(List artsList, PickDataDTO pickData) { if (artsList == null || artsList.size() == 0) { this.sendError(new NoArtsFoundException()); return; @@ -219,7 +218,7 @@ public class RettificaGiacenzeViewModel { .toList(); if (matchRows.size() != 1) { - dispatchArt(mtbAart, null); + dispatchArt(mtbAart, pickData); } else { dispatchRowEdit(matchRows.get(0)); } From 9abba0ce823a35bfae2711603218e46ed82e1188 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 14 May 2024 16:56:58 +0200 Subject: [PATCH 6/6] -> v.1.40.18 (435) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a00464e6..53010628 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 434 - def appVersionName = '1.40.17' + def appVersionCode = 435 + def appVersionName = '1.40.18' signingConfigs { release {