Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/Refactoring_Spedizione

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
This commit is contained in:
Giuseppe Scorrano 2020-06-16 10:38:49 +02:00
commit 9f038607b6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -723,16 +723,10 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
mtbColrToDeleteClone mtbColrToDeleteClone
.setRiga(null) .setRiga(null)
.setDatetimeRow(UtilityDate.getDateInstance()) .setDatetimeRow(UtilityDate.getDateInstance())
.setQtaCol(mtbColrToDeleteClone.getQtaCol().multiply(new BigDecimal(-1)))
.setUtente(SettingsManager.i().user.fullname) .setUtente(SettingsManager.i().user.fullname)
.setCausale(MtbColr.Causale.RETTIFICA) .setCausale(MtbColr.Causale.RETTIFICA)
.setOperation(CommonModelConsts.OPERATION.INSERT); .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); Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
@ -747,6 +741,15 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
}, ex -> UtilityExceptions.defaultException(mContext, ex, progressDialog) }, ex -> UtilityExceptions.defaultException(mContext, ex, progressDialog)
); );
} else { } 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.saveColloStatic(mtbColtClone, value -> { ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtClone, value -> {
progressDialog.dismiss(); progressDialog.dismiss();
mtbColt.get().getMtbColr().remove(mtbColrToDelete); mtbColt.get().getMtbColr().remove(mtbColrToDelete);