From 138500a16f642822ddbd701b8ae358fd5174fc0b Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 4 Oct 2023 18:53:58 +0200 Subject: [PATCH 1/4] [CARELLI] Cambiata condizione su gestione anag fornitore per documenti di trasferimento interno --- .../contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java index 10e059c1..60a694e3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java @@ -65,7 +65,7 @@ public class DialogSelectDocInfoViewModel extends ViewModel { if (val.getGestioneDoc().equalsIgnoreCase("T")) { return forn.getTipoAnag().equalsIgnoreCase("D") && forn.getGestioneAnag().equalsIgnoreCase( - val.getGestione().equalsIgnoreCase("V") ? "V" : "A" + val.getGestione().equalsIgnoreCase("V") ? "V" : "L" ); } else { return forn.getTipoAnag().equalsIgnoreCase("F"); From 19122ed6372ddc4f78334eaf769c57fead3a2d78 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 4 Oct 2023 18:55:17 +0200 Subject: [PATCH 2/4] -> v1.36.02 (395) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 63742068..488fc0a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 394 - def appVersionName = '1.36.01' + def appVersionCode = 395 + def appVersionName = '1.36.02' signingConfigs { release { From bea30a540067a2a261872b53e2b20521b60dc73c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 6 Oct 2023 11:34:09 +0200 Subject: [PATCH 3/4] Fix su gestione P in caso di creazione UDC in accettazione ordini produzione --- .../rest/consumers/CommessaRESTConsumer.java | 8 +++++++ .../AccettazioneOrdiniPickingViewModel.java | 22 ++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java index 8b70a29e..91bf0da0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java @@ -13,6 +13,7 @@ import javax.inject.Singleton; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.JtbComt; import it.integry.integrywmsnative.core.utility.UtilityQuery; +import it.integry.integrywmsnative.core.utility.UtilityString; @Singleton public class CommessaRESTConsumer extends _BaseRESTConsumer { @@ -26,6 +27,8 @@ public class CommessaRESTConsumer extends _BaseRESTConsumer { public void getJtbComts(List itemsToFind, RunnableArgs> onComplete, RunnableArgs onFailed) { var whereCondMap = Stream.of(itemsToFind) + .withoutNulls() + .filter(x -> !UtilityString.isNullOrEmpty(x)) .map(x -> { HashMap vars = new HashMap<>(); vars.put("cod_jcom", x); @@ -33,6 +36,11 @@ public class CommessaRESTConsumer extends _BaseRESTConsumer { }) .toList(); + if(whereCondMap.isEmpty()) { + onComplete.run(new ArrayList<>()); + return; + } + var whereCond = " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap); Type typeOfObjectsList = new TypeToken>() {}.getType(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java index ffb9747b..700974e2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java @@ -371,11 +371,23 @@ public class AccettazioneOrdiniPickingViewModel { this.sendOnInfoAggiuntiveRequest((additionalNotes, tCol) -> { final List orders = Stream.of(this.mOrders) - .map(x -> new CreateUDCRequestOrderDTO() - .setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null) - .setDataOrd(UtilityDate.toLocalDate(x.getDataD())) - .setGestione(x.getGestioneEnum() == GestioneEnum.PRODUZIONE ? GestioneEnum.LAVORAZIONE.getText() : x.getGestione()) - .setNumOrd(x.getNumero())) + .map(x -> { + final CreateUDCRequestOrderDTO createUDCRequestOrderDTO = new CreateUDCRequestOrderDTO() + .setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null) + .setDataOrd(UtilityDate.toLocalDate(x.getDataD())) + .setNumOrd(x.getNumero()); + + if(x.getGestioneEnum() == GestioneEnum.PRODUZIONE) { + if(x.isOrdTrasf()) + createUDCRequestOrderDTO.setGestione(GestioneEnum.ACQUISTO.getText()); + else + createUDCRequestOrderDTO.setGestione(GestioneEnum.LAVORAZIONE.getText()); + } else { + createUDCRequestOrderDTO.setGestione(x.getGestione()); + } + + return createUDCRequestOrderDTO; + }) .toList(); final CreateUDCRequestDTO createUDCRequestDTO = new CreateUDCRequestDTO() From 2ce2b8b25c552a269727bd3634f2afd3c623be83 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 6 Oct 2023 11:34:53 +0200 Subject: [PATCH 4/4] -> v1.36.03 (396) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 488fc0a9..dab3d41c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 395 - def appVersionName = '1.36.02' + def appVersionCode = 396 + def appVersionName = '1.36.03' signingConfigs { release {