From f6ff7aa80d88324dcc435f6f8d25e37b6432f81f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 17 Nov 2020 18:29:15 +0100 Subject: [PATCH 1/2] Aggiunto controllo su refMtbColt --- .../gest/spedizione/SpedizioneViewModel.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 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 1a972e80..6aa7227e 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 @@ -1217,15 +1217,17 @@ public class SpedizioneViewModel { .setMtbAart(pickingObjectDTO.getMtbAart()); - mtbColr.setRefMtbColr(new MtbColr() - .setCodMart(mtbColr.getCodMart()) - .setPartitaMag(mtbColr.getPartitaMag()) - .setCodTagl(mtbColr.getCodTagl()) - .setCodCol(mtbColr.getCodCol()) - .setNumCollo(refMtbColt.getNumCollo()) - .setDataCollo(refMtbColt.getDataColloS()) - .setSerCollo(refMtbColt.getSerCollo()) - .setGestione(refMtbColt.getGestione())); + if(mEnableGiacenza) { + mtbColr.setRefMtbColr(new MtbColr() + .setCodMart(mtbColr.getCodMart()) + .setPartitaMag(mtbColr.getPartitaMag()) + .setCodTagl(mtbColr.getCodTagl()) + .setCodCol(mtbColr.getCodCol()) + .setNumCollo(refMtbColt.getNumCollo()) + .setDataCollo(refMtbColt.getDataColloS()) + .setSerCollo(refMtbColt.getSerCollo()) + .setGestione(refMtbColt.getGestione())); + } pickingObjectDTO.getWithdrawMtbColrs().add(mtbColr); mCurrentMtbColt.getMtbColr().add(mtbColr); From 770f014a704c208ec302b44f7a1c465d8a7ac463 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 17 Nov 2020 18:29:56 +0100 Subject: [PATCH 2/2] -> v1.13.24 (170) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 88db3976..92e7e5d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 169 - def appVersionName = '1.13.23' + def appVersionCode = 170 + def appVersionName = '1.13.24' signingConfigs { release {