diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index 165b7bca..6d95b46f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -8,7 +8,9 @@ import com.annimon.stream.Stream; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; import javax.inject.Inject; @@ -513,6 +515,14 @@ public class AccettazionePickingViewModel { initialQtaTot = initialNumCnf.multiply(initialQtaCnf); } + if(dataScad == null && pickingObjectDTO.getMtbAart().getGgScadPartita() != null && pickingObjectDTO.getMtbAart().getGgScadPartita() > 0) { + dataScad = UtilityDate.getDateInstance(); + Calendar c = new GregorianCalendar(); + c.setTime(dataScad); + c.add(Calendar.DATE, pickingObjectDTO.getMtbAart().getGgScadPartita()); + dataScad = c.getTime(); + } + this.sendOnItemDispatched( pickingObjectDTO, pickingObjectDTO.getMtbAart(), diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java index ed26ed57..0fd5c744 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -258,6 +258,8 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, @Override public void onLUOpened(MtbColt mtbColt) { + mToolbarTitleText.setText(String.format(getActivity().getText(R.string.lu_number_text).toString(), mtbColt.getNumCollo())); + initAdapter(); thereIsAnOpenedUL.set(true); @@ -275,6 +277,7 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, @Override public void onLUClosed() { + mToolbarTitleText.setText(getActivity().getText(R.string.free_picking_title_fragment).toString()); destroyAdapter(); thereIsAnyRowInUL.set(false); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 82b46947..a00103cc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -6,7 +6,9 @@ import com.annimon.stream.Stream; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.Iterator; import java.util.List;