From 56ba43183c90fecda642419793923a2d2a42d28b Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 6 Apr 2021 13:35:36 +0200 Subject: [PATCH 1/2] Fix su causale in Picking Libero. Fix su nome utente in MtbColt e MtbColr. --- .../java/it/integry/integrywmsnative/core/model/MtbColr.java | 5 +++++ .../java/it/integry/integrywmsnative/core/model/MtbColt.java | 4 ++++ .../gest/picking_libero/PickingLiberoViewModel.java | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index 19ae2f2b..673b0e2d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDate; public class MtbColr extends EntityBase { @@ -56,6 +57,10 @@ public class MtbColr extends EntityBase { public MtbColr() { type = "mtb_colr"; + + if(SettingsManager.i().isUserLoggedIn()) { + setUtente(SettingsManager.i().getUser().getFullname()); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index c2ccf5be..c5d04b8d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -99,6 +99,10 @@ public class MtbColt extends EntityBase { type = "mtb_colt"; setDataCollo(UtilityDate.getDateInstance()); setSerCollo("/"); + + if(SettingsManager.i().isUserLoggedIn()) { + setPreparatoDa(SettingsManager.i().getUser().getFullname()); + } } public MtbColt initDefaultFields() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 59a9461a..affe0be1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -646,8 +646,6 @@ public class PickingLiberoViewModel { .setQtaCol(qtaTot) .setPartitaMag(partitaMag) .setDataScadPartita(dataScad) - .setUtente(SettingsManager.i().getUser().getFullname()) - .setCausale(MtbColr.Causale.RETTIFICA) .setDatetimeRow(UtilityDate.getDateInstance()); mtbColt.getMtbColr().add(mtbColr); From 2ae311c28a07ab9b7d0f577df63f5c1fcf5567c4 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 6 Apr 2021 13:36:06 +0200 Subject: [PATCH 2/2] -> v1.16.19 (201) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b0360a2f..20804a63 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 200 - def appVersionName = '1.16.18' + def appVersionCode = 201 + def appVersionName = '1.16.19' signingConfigs { release {