diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java index ee68fc23..e136b531 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java @@ -508,6 +508,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo this.openProgress(); onComplete.run(pickedQuantityDTO, shouldCloseLU); + }, () -> { + this.mViewmodel.resetMatchedRows(); }) .show(getSupportFragmentManager(), "tag"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2.java index c8b4c68f..6fd66002 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2.java @@ -38,6 +38,7 @@ public class DialogInputQuantityV2 extends DialogFragment implements DialogInput private DialogInputQuantityV2ViewModel mViewModel; private DialogInputQuantityV2DTO mDialogInputQuantityV2DTO; private RunnableArgss mOnComplete; + private Runnable mOnAbort; public ObservableField currentPartitaMag = new ObservableField<>(); public ObservableField currentDataScad = new ObservableField<>(); @@ -55,13 +56,14 @@ public class DialogInputQuantityV2 extends DialogFragment implements DialogInput private DialogInputQuantityV2Binding mBindings; private boolean mEnableDataCallback = true; - public static DialogInputQuantityV2 newInstance(@NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO, RunnableArgss onComplete) { - return new DialogInputQuantityV2(dialogInputQuantityV2DTO, onComplete); + public static DialogInputQuantityV2 newInstance(@NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO, @NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { + return new DialogInputQuantityV2(dialogInputQuantityV2DTO, onComplete, onAbort); } - private DialogInputQuantityV2(@NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO, RunnableArgss onComplete) { + private DialogInputQuantityV2(@NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO, @NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { this.mDialogInputQuantityV2DTO = dialogInputQuantityV2DTO; this.mOnComplete = onComplete; + this.mOnAbort = onAbort; } @Override @@ -110,6 +112,7 @@ public class DialogInputQuantityV2 extends DialogFragment implements DialogInput public void dismiss() { super.dismiss(); + this.mOnAbort.run(); } public void save() {