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 9b0ad913..c78f4696 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 @@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull; import org.json.JSONObject; import java.lang.reflect.Type; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; 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 f62ac4c1..b0be33ba 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 @@ -460,12 +460,9 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked MtbColt cloneMtbColt = (MtbColt) mtbColt.get().clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP); - MtbColt cloneMtbColt = (MtbColt) mtbColt.get().clone(); - cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP); + cloneMtbColt.setMtbColr(new ObservableArrayList()); - cloneMtbColt.setMtbColr(new ObservableArrayList()); - - ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback() { + ColliMagazzinoRESTConsumer.saveColloStatic(cloneMtbColt, new ISimpleOperationCallback() { @Override public void onSuccess(MtbColt value) { @@ -698,7 +695,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColtClone.getMtbColr().add(mtbColrToEditClone); mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); - ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, valueNewMtbColt -> { + ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtClone, valueNewMtbColt -> { progressDialog.dismiss(); mtbColt.get().getMtbColr().remove(index); @@ -749,7 +746,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked }, ex -> UtilityExceptions.defaultException(mContext, ex, progressDialog) ); } else { - ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, value -> { + ColliMagazzinoRESTConsumer.saveColloStatic(mtbColtClone, value -> { progressDialog.dismiss(); mtbColt.get().getMtbColr().remove(mtbColrToDelete); }, ex -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index cdfcd833..08ea7b30 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -159,7 +159,7 @@ public class DialogScanOrCreateLU { DialogCommon.showNoULFound(mContext, null); } else if (mtbColtList.size() == 1) { ColliMagazzinoRESTConsumer.getByTestataStatic(mtbColtList.get(0), mShouldCheckResiduo, false, mtbColt -> { - sendMtbColt(mtbColt, progressDialog); + sendMtbColt(mtbColt, progressDialog, false); }, ex -> { UtilityExceptions.defaultException(mContext, ex, progressDialog); BarcodeManager.enable();