From 73d516ea72db148a2bfba2c8bb6e5c3f075b7e1f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 28 Jul 2020 18:52:45 +0200 Subject: [PATCH] =?UTF-8?q?[BUG]=20Cambiato=20nome=20propriet=C3=A0=20da?= =?UTF-8?q?=20rifPartitaMag=20a=20MtbPartitaMag=20in=20MtbColr.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../integrywmsnative/core/model/MtbColr.java | 18 +++++------------- .../consumers/ColliMagazzinoRESTConsumer.java | 11 +++++------ .../ProdVersamentoMaterialViewModel.java | 3 +-- .../VenditaOrdineInevasoViewModel.java | 4 ++-- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e518ad72..db517032 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 143 - def appVersionName = '1.12.14' + def appVersionCode = 144 + def appVersionName = '1.12.15' signingConfigs { release { 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 50b992ec..dcfce5b4 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 @@ -1,18 +1,10 @@ package it.integry.integrywmsnative.core.model; -import android.os.Parcel; -import android.os.Parcelable; - import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.utility.UtilityDate; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.core.utility.UtilityString; public class MtbColr extends EntityBase { @@ -59,7 +51,7 @@ public class MtbColr extends EntityBase { private MtbAart mtbAart; - private MtbPartitaMag rifPartitaMag; + private MtbPartitaMag mtbPartitaMag; public MtbColr() { type = "mtb_colr"; @@ -411,12 +403,12 @@ public class MtbColr extends EntityBase { } - public MtbPartitaMag getRifPartitaMag() { - return rifPartitaMag; + public MtbPartitaMag getMtbPartitaMag() { + return mtbPartitaMag; } - public MtbColr setRifPartitaMag(MtbPartitaMag rifPartitaMag) { - this.rifPartitaMag = rifPartitaMag; + public MtbColr setMtbPartitaMag(MtbPartitaMag mtbPartitaMag) { + this.mtbPartitaMag = mtbPartitaMag; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index be8a7417..3da97944 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -11,7 +11,6 @@ import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import org.jetbrains.annotations.NotNull; -import org.json.JSONObject; import java.lang.reflect.Type; import java.math.BigDecimal; @@ -52,7 +51,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { for (int i = 0; i < mtbColtToSave.getMtbColr().size(); i++) { mtbColtToSave.getMtbColr().get(i) .setMtbAart(null) - .setRifPartitaMag(null); + .setMtbPartitaMag(null); } EntityRESTConsumer.processEntity(mtbColtToSave, callback, MtbColt.class); @@ -70,7 +69,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { mtbColtToSaveClone.getMtbColr().add( ((MtbColr) mtbColtToSave.getMtbColr().get(i).clone()) .setMtbAart(null) - .setRifPartitaMag(null)); + .setMtbPartitaMag(null)); } EntityRESTConsumer.processEntity(mtbColtToSaveClone, new ISimpleOperationCallback() { @@ -96,7 +95,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { for (int i = 0; i < mtbColt.getMtbColr().size(); i++) { mtbColt.getMtbColr().get(i) .setMtbAart(null) - .setRifPartitaMag(null); + .setMtbPartitaMag(null); } } @@ -117,7 +116,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { public static void saveRigaCollo(MtbColr mtbColrToSave, RunnableArgs onComplete, RunnableArgs onFailed) { mtbColrToSave.setMtbAart(null); - mtbColrToSave.setRifPartitaMag(null); + mtbColrToSave.setMtbPartitaMag(null); EntityRESTConsumer.processEntity(mtbColrToSave, new ISimpleOperationCallback() { @Override @@ -681,7 +680,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { public static void creaRettificaCollo(MtbColr sourceMtbColrOriginal, BigDecimal newNumCnf, BigDecimal newQtaTot, Runnable onComplete, RunnableArgs onFailed) { MtbColr sourceMtbColr = (MtbColr) sourceMtbColrOriginal.clone(); - sourceMtbColr.setRifPartitaMag(null); + sourceMtbColr.setMtbPartitaMag(null); sourceMtbColr.setMtbAart(null); RettificaULDTO rettificaULDTO = new RettificaULDTO() diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java index d33a4e1c..ff5e1055 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java @@ -22,7 +22,6 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.exception.DateNotRecognizedException; import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; @@ -76,7 +75,7 @@ public class ProdVersamentoMaterialViewModel { mMtbColr = mtbColr; mBinding.descrArt.setText(mtbColr.getDescrizione()); mBinding.codArt.setText(mtbColr.getCodMart()); - mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getRifPartitaMag() != null) ? " - "+ mtbColr.getRifPartitaMag().getDescrizione() : "")); + mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getMtbPartitaMag() != null) ? " - "+ mtbColr.getMtbPartitaMag().getDescrizione() : "")); if (!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())) { String text = UtilityNumber.decimalToString(mtbColr.getQtaCol()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index a7efc7ff..efd61d62 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -655,7 +655,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO MtbColr matchRow = matchWithPartitaMag.get(k); PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() - .setMtbPartitaMag(matchRow.getRifPartitaMag()) + .setMtbPartitaMag(matchRow.getMtbPartitaMag()) .setNumCnf(matchRow.getNumCnf()) .setQtaCnf(matchRow.getQtaCnf()) .setQtaTot(matchRow.getQtaCol()) @@ -678,7 +678,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO MtbColr matchRow = matchWithColloRow.get(k); PickingObjectDTO.PickData pickData = new PickingObjectDTO.PickData() - .setMtbPartitaMag(matchRow.getRifPartitaMag()) + .setMtbPartitaMag(matchRow.getMtbPartitaMag()) .setNumCnf(matchRow.getNumCnf()) .setQtaCnf(matchRow.getQtaCnf()) .setQtaTot(matchRow.getQtaCol())