From 371514157c6d0b57c4b6102a7713dba1d3559217 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 11 Apr 2022 19:16:42 +0200 Subject: [PATCH] Fix su peso tipo collo al posto della tara --- .../order_detail/ProdRientroMerceOrderDetailFragment.java | 2 +- .../view/dialogs/input_lu_prod/DialogInputLUProdView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java index b3d0c409..59c2bef7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java @@ -260,7 +260,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements DialogInputLUProdView - .newInstance(mConnectedBluetoothDevice.toSimpleDeviceInterface(), dialogInputLUProdDTO, resultDTO -> { + .newInstance(mConnectedBluetoothDevice != null ? mConnectedBluetoothDevice.toSimpleDeviceInterface() : null, dialogInputLUProdDTO, resultDTO -> { ProdRientroMerceOrderDetailPickedQuantityDTO pickedQuantityDTO = new ProdRientroMerceOrderDetailPickedQuantityDTO() .setNumCnf(resultDTO.getNumCnf()) .setPesoCollo(resultDTO.getPesoCollo()) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java index 50707e25..28720aa8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java @@ -177,7 +177,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI }); UtilityObservable.addPropertyChanged(this.currentMtbTCol, (value) -> { - this.currentTaraPed.set(value.getOriginalModel().getTaraKg()); + this.currentTaraPed.set(value.getOriginalModel().getPesoKg()); }); UtilityObservable.addPropertyChanged(this.selectedLineaProd, (value) -> {