From 3b47b471f1d42b77f1e86ae25199880172fe0866 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 16 Jun 2020 10:35:00 +0200 Subject: [PATCH 1/2] Fix rettifica giacenze: risolto problema di duplicazione delle righe --- .../viewmodel/RettificaGiacenzeViewModel.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index 591711ee..1c6841bc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -724,16 +724,10 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColrToDeleteClone .setRiga(null) .setDatetimeRow(UtilityDate.getDateInstance()) - .setQtaCol(mtbColrToDeleteClone.getQtaCol().multiply(new BigDecimal(-1))) .setUtente(SettingsManager.i().user.fullname) .setCausale(MtbColr.Causale.RETTIFICA) .setOperation(CommonModelConsts.OPERATION.INSERT); - MtbColt mtbColtClone = (MtbColt) mtbColt.get().clone(); - mtbColtClone.setMtbColr(new ObservableArrayList<>()); - mtbColtClone.getMtbColr().add(mtbColrToDeleteClone); - mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); - Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); @@ -748,6 +742,15 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked }, ex -> UtilityExceptions.defaultException(mContext, ex, progressDialog) ); } else { + + mtbColrToDeleteClone + .setQtaCol(mtbColrToDeleteClone.getQtaCol().multiply(new BigDecimal(-1))); + + MtbColt mtbColtClone = (MtbColt) mtbColt.get().clone(); + mtbColtClone.setMtbColr(new ObservableArrayList<>()); + mtbColtClone.getMtbColr().add(mtbColrToDeleteClone); + mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, value -> { progressDialog.dismiss(); mtbColt.get().getMtbColr().remove(mtbColrToDelete); From 5a401a7cbc9ba4a56dce61eec55c15c8d5f17ca5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 16 Jun 2020 10:36:34 +0200 Subject: [PATCH 2/2] -> v1.12.14 (143) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8f2dfc64..e518ad72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 142 - def appVersionName = '1.12.13' + def appVersionCode = 143 + def appVersionName = '1.12.14' signingConfigs { release {