From 20602cadb5e536222fb80f4b8bf19538f01afb5f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 20 Jan 2025 12:54:54 +0100 Subject: [PATCH 1/3] Fix sulla descrizione durante il salvataggio di un nuovo articolo --- .../dialogs/create_new_art/DialogCreateNewArtViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java index 1b0a2ace..9312c1ea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/create_new_art/DialogCreateNewArtViewModel.java @@ -155,7 +155,7 @@ public class DialogCreateNewArtViewModel { barcodeProdotto.validate() ) { ArticoloDTO articoloToSave = new ArticoloDTO() - .setDescrizione(descrizione.get()) + .setDescrizione(descrizione.get() != null ? descrizione.get().substring(0, Math.min(40, descrizione.get().length())) : null) .setDescrizioneEstesa(descrizione.get()) .setNote(UtilityString.empty2null(noteAggiuntive.get())) .setCodMgrp(selectedMtbGrup.get().getCodMgrp()) From ddc441e76eef7959e16e94fd36eb9c8ae0ed3a32 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 20 Jan 2025 17:57:05 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Refactoring=20UI=20di=20ContenutoBancale.?= =?UTF-8?q?=20Refactoring=20del=20model=20MtbTcol,=20adesso=20=C3=A8=20com?= =?UTF-8?q?pletamente=20observable.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainApplicationModule.java | 4 +- .../integrywmsnative/SplashActivity.java | 4 +- .../core/di/BindableBigDecimal.java | 2 +- .../integrywmsnative/core/di/Converters.java | 41 +- .../core/helper/GestioneToTextConverter.java | 16 + .../integrywmsnative/core/model/MtbColt.java | 26 +- .../integrywmsnative/core/model/MtbTCol.java | 10 +- .../core/model/mapper/MtbTcolMapper.java | 29 + .../model/observable/ObservableMtbTcol.java | 127 ++ .../rest/consumers/ImballiRESTConsumer.java | 13 +- .../consumers/ImballiRESTConsumerService.java | 2 +- .../core/settings/DBSettingsModel.java | 14 + .../core/settings/SettingsManager.java | 29 +- .../AccettazioneBollaPickingActivity.java | 22 +- .../AccettazioneBollaPickingViewModel.java | 15 +- .../AccettazioneOrdiniPickingActivity.java | 14 +- .../AccettazioneOrdiniPickingViewModel.java | 13 +- .../OrdiniUscitaElencoFragment.java | 5 +- .../picking_resi/PickingResiActivity.java | 14 +- .../picking_resi/PickingResiViewModel.java | 14 +- ...ntroMerceOrderDetailPickedQuantityDTO.java | 8 +- .../gest/spedizione/SpedizioneActivity.java | 16 +- .../gest/spedizione/SpedizioneViewModel.java | 30 +- ...ttomSheetFragmentLUContentListAdapter.java | 7 +- ...BottomSheetFragmentLUContentViewModel.java | 12 +- .../DialogInfoAggiuntiveLUModule.java | 5 +- .../DialogInfoAggiuntiveLUView.java | 44 +- .../DialogInfoAggiuntiveLUViewModel.java | 23 +- .../DialogInputLUProdResultDTO.java | 8 +- .../input_lu_prod/DialogInputLUProdView.java | 4 +- .../DialogInputLUProdViewModel.java | 11 +- .../DialogInputLUProdTipoColloAdapter.java | 19 +- .../DialogInputLUProdTipoColloListModel.java | 8 +- .../input_peso_lu/DialogInputPesoLUView.java | 42 +- .../DialogTracciamentoImballiModule.java | 5 +- .../DialogTracciamentoImballiViewModel.java | 22 +- ...gTracciamentoImballi_TipoColloAdapter.java | 10 +- .../main/res/drawable/circle_background.xml | 5 + .../res/drawable/ic_round_business_24.xml | 5 + .../bottom_sheet_fragment__lu_content.xml | 1263 +++++++++++------ ..._sheet_fragment__lu_content__list_item.xml | 208 +-- .../res/layout/dialog_info_aggiuntive_lu.xml | 3 +- .../layout/fragment_main_ordini_uscita.xml | 6 +- app/src/main/res/values/config.xml | 1 + 44 files changed, 1400 insertions(+), 779 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java create mode 100644 app/src/main/res/drawable/circle_background.xml create mode 100644 app/src/main/res/drawable/ic_round_business_24.xml diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java index a8d6cc90..3d6504ac 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java @@ -82,8 +82,8 @@ public class MainApplicationModule { @Provides @Singleton - public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) { - return new SettingsManager(mApplication, systemRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer); + public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, ImballiRESTConsumer imballiRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) { + return new SettingsManager(mApplication, systemRESTConsumer, imballiRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer); } @Provides diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java index e38e3df1..608dad3a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java @@ -103,12 +103,12 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener @Override public void onDBDataLoading(String item) { - mBinding.loadingInfoTextview.setText("Caricamento " + item); + runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item)); } @Override public void onMenuLoading() { - mBinding.loadingInfoTextview.setText("Caricamento menù"); + runOnUiThread(() -> mBinding.loadingInfoTextview.setText("Caricamento menù")); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java index 4c4c7487..0fb287b9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBigDecimal.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -public class BindableBigDecimal implements Observable { +public class BindableBigDecimal implements Observable { BigDecimal mValue; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java index 0fdf8ca2..b33fedd6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java @@ -105,7 +105,7 @@ public class Converters { view.setTag(R.id.bound_observable, new Pair<>(observableField, watcher)); view.addTextChangedListener(watcher); } - String newValue = observableField.get(); + String newValue = observableField != null ? observableField.get() : ""; if (!view.getText().toString().equals(newValue)) { view.setText(newValue); } @@ -819,6 +819,45 @@ public class Converters { } + @BindingAdapter("visibilityWhenNotNull") + public static void bindViewVisibilityWhenNotNull(View view, ObservableField bindableObject) { + if(bindableObject == null) return; + + if (view.getTag(R.id.bound_observable) != bindableObject) { + view.setTag(R.id.bound_observable, bindableObject); + } + + bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() { + @Override + public void onPropertyChanged(Observable sender, int propertyId) { + view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE); + } + }); + + view.setVisibility(bindableObject.get() == null ? View.GONE : View.VISIBLE); + } + + + @BindingAdapter("visibilityWhenNull") + public static void bindViewVisibilityWhenNull(View view, ObservableField bindableObject) { + + if (view.getTag(R.id.bound_observable_visibility) != bindableObject) { + view.setTag(R.id.bound_observable_visibility, bindableObject); + } + + view.setVisibility(bindableObject == null || bindableObject.get() == null ? View.VISIBLE : View.GONE); + + if(bindableObject == null) return; + + bindableObject.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() { + @Override + public void onPropertyChanged(Observable sender, int propertyId) { + view.setVisibility(bindableObject.get() == null ? View.VISIBLE : View.GONE); + } + }); + } + + @BindingAdapter({"reverse_visibility"}) public static void bindViewReverseVisibility(View view, final BindableBoolean bindableBoolean) { if (view.getTag(R.id.bound_reverse_visibility) != bindableBoolean) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java b/app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java new file mode 100644 index 00000000..c9325cf4 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/helper/GestioneToTextConverter.java @@ -0,0 +1,16 @@ +package it.integry.integrywmsnative.core.helper; + +import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; + +public final class GestioneToTextConverter { + + public static String convert(GestioneEnum gestioneEnum) { + return switch (gestioneEnum) { + case ACQUISTO -> "Acquisto"; + case PRODUZIONE -> "Produzione"; + case LAVORAZIONE -> "Lavorazione"; + case VENDITA -> "Vendita"; + }; + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 6d2dacf5..8fe74188 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.model; import android.text.TextUtils; import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableField; import com.annimon.stream.Optional; import com.annimon.stream.Stream; @@ -16,6 +17,7 @@ import java.util.Date; import java.util.List; import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDB; @@ -64,7 +66,7 @@ public class MtbColt extends EntityBase { private BigDecimal altezzaCm; private String codJcom; - private MtbTCol mtbTCol; + private final ObservableField mtbTCol = new ObservableField<>(); private Boolean disablePrint; private String ragSocCliente; @@ -258,6 +260,16 @@ public class MtbColt extends EntityBase { public MtbColt setCodTcol(String codTcol) { this.codTcol = codTcol; + + if(!UtilityString.isNullOrEmpty(codTcol)) { + var fountMtbTcolObservable = SettingsManager.iDB().getInternalImballi().stream() + .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol)) + .findFirst() + .orElse(null); + this.setMtbTCol(fountMtbTcolObservable); + } else + this.setMtbTCol(null); + return this; } @@ -532,15 +544,19 @@ public class MtbColt extends EntityBase { return this; } - public MtbTCol getMtbTCol() { - return mtbTCol; + public ObservableMtbTcol getMtbTCol() { + return mtbTCol.get(); } - public MtbColt setMtbTCol(MtbTCol mtbTCol) { - this.mtbTCol = mtbTCol; + public MtbColt setMtbTCol(ObservableMtbTcol mtbTCol) { + this.mtbTCol.set(mtbTCol); return this; } + public ObservableField mtbTcolProperty() { + return mtbTCol; + } + public void generaFiltroOrdineFromDTO(List filtroOrdineDtos) { String xmlPrefix = "{\"whereCond\": \""; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java index 990a1d02..99824340 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java @@ -15,7 +15,7 @@ public class MtbTCol { private BigDecimal taraKg; private String descrizione; private String codMart; - private FlagUiUlEnum flagUIUL; + private FlagUiUlEnum flagUiUl; private String circuito; public String getCodTcol() { @@ -90,12 +90,12 @@ public class MtbTCol { return this; } - public FlagUiUlEnum getFlagUIUL() { - return flagUIUL; + public FlagUiUlEnum getFlagUiUl() { + return flagUiUl; } - public void setFlagUIUL(FlagUiUlEnum flagUIUL) { - this.flagUIUL = flagUIUL; + public void setFlagUiUl(FlagUiUlEnum flagUiUl) { + this.flagUiUl = flagUiUl; } public String getCircuito() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java b/app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java new file mode 100644 index 00000000..3d5d2220 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/mapper/MtbTcolMapper.java @@ -0,0 +1,29 @@ +package it.integry.integrywmsnative.core.model.mapper; + +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; + +import java.util.List; +import java.util.stream.Collectors; + +import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; + +public class MtbTcolMapper { + + public static ObservableMtbTcol fromDTO(MtbTCol dto) { + ObservableMtbTcol mtbTcol = new ObservableMtbTcol(); + mtbTcol.updateFromDTO(dto); + return mtbTcol; + } + + public static ObservableList fromDTOList(List dto) { + ObservableList mtbTCols = new ObservableArrayList<>(); + + mtbTCols.addAll(dto.stream().map(MtbTcolMapper::fromDTO) + .collect(Collectors.toUnmodifiableList())); + + return mtbTCols; + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java b/app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java new file mode 100644 index 00000000..a161df0b --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/observable/ObservableMtbTcol.java @@ -0,0 +1,127 @@ +package it.integry.integrywmsnative.core.model.observable; + +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; +import androidx.databinding.ObservableField; + +import java.math.BigDecimal; + +import it.integry.integrywmsnative.core.model.MtbTCol; + +public class ObservableMtbTcol extends BaseObservable { + + private final ObservableField codTcol = new ObservableField<>(); + private final ObservableField pesoKg = new ObservableField<>(); + private final ObservableField lunghezzaCm = new ObservableField<>(); + private final ObservableField larghezzaCm = new ObservableField<>(); + private final ObservableField altezzaCm = new ObservableField<>(); + private final ObservableField taraKg = new ObservableField<>(); + private final ObservableField descrizione = new ObservableField<>(); + private final ObservableField codMart = new ObservableField<>(); + private final ObservableField flagUIUL = new ObservableField<>(); + private final ObservableField circuito = new ObservableField<>(); + + @Bindable + public String getCodTcol() { + return codTcol.get(); + } + + @Bindable + public BigDecimal getPesoKg() { + return pesoKg.get(); + } + + @Bindable + public BigDecimal getLunghezzaCm() { + return lunghezzaCm.get(); + } + + @Bindable + public BigDecimal getLarghezzaCm() { + return larghezzaCm.get(); + } + + @Bindable + public BigDecimal getAltezzaCm() { + return altezzaCm.get(); + } + + @Bindable + public BigDecimal getTaraKg() { + return taraKg.get(); + } + + @Bindable + public String getDescrizione() { + return descrizione.get(); + } + + @Bindable + public String getCodMart() { + return codMart.get(); + } + + @Bindable + public MtbTCol.FlagUiUlEnum getFlagUIUL() { + return flagUIUL.get(); + } + + @Bindable + public String getCircuito() { + return circuito.get(); + } + + + public ObservableField codTcolProperty() { + return codTcol; + } + + public ObservableField pesoKgProperty() { + return pesoKg; + } + + public ObservableField lunghezzaCmProperty() { + return lunghezzaCm; + } + + public ObservableField larghezzaCmProperty() { + return larghezzaCm; + } + + public ObservableField altezzaCmProperty() { + return altezzaCm; + } + + public ObservableField taraKgProperty() { + return taraKg; + } + + public ObservableField descrizioneProperty() { + return descrizione; + } + + public ObservableField codMartProperty() { + return codMart; + } + + public ObservableField flagUIULProperty() { + return flagUIUL; + } + + public ObservableField circuitoProperty() { + return circuito; + } + + public void updateFromDTO(MtbTCol mtbTCol) { + codTcol.set(mtbTCol.getCodTcol()); + pesoKg.set(mtbTCol.getPesoKg()); + lunghezzaCm.set(mtbTCol.getLunghezzaCm()); + larghezzaCm.set(mtbTCol.getLarghezzaCm()); + altezzaCm.set(mtbTCol.getAltezzaCm()); + taraKg.set(mtbTCol.getTaraKg()); + descrizione.set(mtbTCol.getDescrizione()); + codMart.set(mtbTCol.getCodMart()); + flagUIUL.set(mtbTCol.getFlagUiUl()); + circuito.set(mtbTCol.getCircuito()); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java index 5c899ef4..c789f5ce 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java @@ -7,6 +7,8 @@ import javax.inject.Singleton; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.mapper.MtbTcolMapper; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.rest.RESTBuilder; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO; @@ -24,18 +26,19 @@ public class ImballiRESTConsumer extends _BaseRESTConsumer { } - public List retrieveTipiColloSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception { + public List retrieveImballiSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception { ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class); - Response>> response = service.retrieveTipiCollo(tipoImballo) + Response>> response = service.retrieveImballi(tipoImballo) .execute(); - return analyzeAnswer(response, "retrieveTipiCollo"); + List retrieveTipiCollo = analyzeAnswer(response, "retrieveTipiCollo"); + return MtbTcolMapper.fromDTOList(retrieveTipiCollo); } - public void retrieveTipiCollo(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs> onComplete, RunnableArgs onFailed) { + public void retrieveImballi(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs> onComplete, RunnableArgs onFailed) { executorService.execute(() -> { try { - var response = retrieveTipiColloSyncronized(tipoImballo); + var response = retrieveImballiSyncronized(tipoImballo); if (onComplete != null) onComplete.run(response); } catch (Exception ex) { if (onFailed != null) onFailed.run(ex); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java index 5b88224b..294bb66b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java @@ -16,7 +16,7 @@ public interface ImballiRESTConsumerService { @GET("wms/imballi/retrieve/{tipo}") - Call>> retrieveTipiCollo(@Path("tipo") MtbTCol.FlagUiUlEnum tipo); + Call>> retrieveImballi(@Path("tipo") MtbTCol.FlagUiUlEnum tipo); @POST("wms/imballi/registraCarico") Call> registraCarico(@Body RegistraCaricoImballiRequestDTO registraCaricoImballiRequest); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 1606cc9c..3c804c7c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -1,11 +1,15 @@ package it.integry.integrywmsnative.core.settings; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; + import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.core.model.Azienda; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; public class DBSettingsModel { @@ -16,6 +20,7 @@ public class DBSettingsModel { private Azienda datiAzienda = null; private List internalCodAnags = null; + private ObservableList internalImballi = new ObservableArrayList<>(); private boolean enableCheckPartitaMagCheckPickingV; private boolean flagMultiClienteOrdV; @@ -132,6 +137,15 @@ public class DBSettingsModel { return this; } + public ObservableList getInternalImballi() { + return internalImballi; + } + + public DBSettingsModel setInternalImballi(ObservableList internalImballi) { + this.internalImballi = internalImballi; + return this; + } + public List getAvailableCodMdep() { return availableCodMdep; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index 1a4f4bd9..f5671261 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.settings; import android.content.Context; +import androidx.databinding.ObservableArrayList; + import com.google.firebase.perf.metrics.Trace; import com.google.gson.reflect.TypeToken; @@ -16,9 +18,12 @@ import javax.inject.Singleton; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; @@ -38,17 +43,20 @@ public class SettingsManager { private static Context mContext; private static SystemRESTConsumer mSystemRESTConsumer; + private static ImballiRESTConsumer mImballiRESTConsumer; private static AziendaRESTConsumer mAziendaRESTConsumer; private static GestSetupRESTConsumer mGestSetupRESTConsumer; private static PosizioniRESTConsumer mPosizioniRESTConsumer; public SettingsManager(Context context, SystemRESTConsumer systemRESTConsumer, + ImballiRESTConsumer imballiRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer) { mContext = context; mSystemRESTConsumer = systemRESTConsumer; + mImballiRESTConsumer = imballiRESTConsumer; mAziendaRESTConsumer = aziendaRESTConsumer; mGestSetupRESTConsumer = gestSetupRESTConsumer; mPosizioniRESTConsumer = posizioniRESTConsumer; @@ -124,12 +132,31 @@ public class SettingsManager { loadGestSetupValues(() -> { onProgress.run("dati azienda"); - loadDatiAzienda(tmpOnComplete, tmpOnFailed); + loadDatiAzienda(() -> { + + loadTipiCollo(tmpOnComplete, tmpOnFailed); + + }, tmpOnFailed); }, tmpOnFailed); }, tmpOnFailed); }, tmpOnFailed); } + private static void loadTipiCollo(Runnable onComplete, RunnableArgs onFailed) { + mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UL, tipiColloUl -> { + mImballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UI, tipiColloUi -> { + + var imballiList = new ObservableArrayList(); + imballiList.addAll(tipiColloUi); + imballiList.addAll(tipiColloUl); + + SettingsManager.iDB().setInternalImballi(imballiList); + onComplete.run(); + }, onFailed); + }, onFailed); + + } + private static void loadDatiAzienda(Runnable onComplete, RunnableArgs onFailed) { mAziendaRESTConsumer.retrieveAzienda(datiAzienda -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java index 31572319..10d5a499 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java @@ -41,8 +41,8 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.report.ReportManager; import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO; @@ -89,9 +89,9 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac private ActivityAccettazioneBollaPickingBinding mBindings; private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel; - + private final AccettazioneBollaPickingFilterViewModel mAppliedFilterViewModel = new AccettazioneBollaPickingFilterViewModel(); - + private final ObservableArrayList mAccettazioneMutableData = new ObservableArrayList<>(); public BindableBoolean noItemsToPick = new BindableBoolean(false); @@ -231,7 +231,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac refreshList(); } }; - + mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged); List filterList = Stream.of(AccettazioneBollaPickingBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList(); @@ -327,7 +327,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac mAppliedFilterViewModel.applyAllTests(); tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue(); } else { - tmpList = mViewModel.getPickingList().getValue(); + tmpList = mViewModel.getPickingList().getValue(); } var list = convertDataModelToListModel(tmpList); @@ -546,6 +546,16 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac this.mViewModel.deleteRow(mtbColr); } + @Override + public void onRequestChangeMtbTcol(MtbColt mtbColt) { + DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> { + onLoadingStarted(); + mViewModel.updateTipoUl(mtbTcol, this::onLoadingEnded); + }, () -> { + }) + .show(getSupportFragmentManager(), "dialog-note-aggiuntive"); + } + @Override public void onBottomSheetLUClose() { this.mViewModel.closeLU(); @@ -560,7 +570,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac } @Override - public void onInfoAggiuntiveRequest(RunnableArgss onComplete) { + public void onInfoAggiuntiveRequest(RunnableArgss onComplete) { DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded) .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java index 0e94d5e8..aec586ae 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java @@ -30,9 +30,9 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO; import it.integry.integrywmsnative.core.model.dto.PickDataDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; @@ -409,7 +409,7 @@ public class AccettazioneBollaPickingViewModel { }); } - private void manageInfoAggiuntiveRequest(RunnableArgss onComplete) { + private void manageInfoAggiuntiveRequest(RunnableArgss onComplete) { if (!SettingsManager.iDB().isFlagAccettazioneBollaAskTipoCollo()) { onComplete.run(null, null); return; @@ -888,6 +888,13 @@ public class AccettazioneBollaPickingViewModel { this.mPickingList.postValue(this.mPickingList.getValue()); } + public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) { + mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> { + mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol()); + onComplete.run(); + }, this::sendError); + } + private void addHistoryItem(@NonNull MtbColr mtbColr) { Optional optional = Stream.of(this.mHistoryUsedAarts) .filter(x -> (x.getCodMart() != null && x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())) || @@ -935,7 +942,7 @@ public class AccettazioneBollaPickingViewModel { if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete); } - private void sendOnInfoAggiuntiveRequest(RunnableArgss onComplete) { + private void sendOnInfoAggiuntiveRequest(RunnableArgss onComplete) { if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete); } @@ -1037,7 +1044,7 @@ public class AccettazioneBollaPickingViewModel { void onVersamentoAutomaticoULRequest(RunnableArgs onComplete); - void onInfoAggiuntiveRequest(RunnableArgss onComplete); + void onInfoAggiuntiveRequest(RunnableArgss onComplete); void onError(Exception ex); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java index 78f42a9e..99ef94a5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java @@ -44,8 +44,8 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.report.ReportManager; import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO; @@ -714,6 +714,16 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A this.mViewModel.deleteRow(mtbColr); } + @Override + public void onRequestChangeMtbTcol(MtbColt mtbColt) { + DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> { + onLoadingStarted(); + mViewModel.updateTipoUl(mtbTcol, this::onLoadingEnded); + }, () -> { + }) + .show(getSupportFragmentManager(), "dialog-note-aggiuntive"); + } + @Override public void onBottomSheetLUClose() { this.mViewModel.closeLU(); @@ -725,7 +735,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A } @Override - public void onInfoAggiuntiveRequest(RunnableArgss onComplete) { + public void onInfoAggiuntiveRequest(RunnableArgss onComplete) { DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded).show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java index 68bff77b..657299dc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java @@ -32,9 +32,9 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO; import it.integry.integrywmsnative.core.model.dto.PickDataDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; @@ -878,6 +878,13 @@ public class AccettazioneOrdiniPickingViewModel { this.mPickingList.postValue(this.mPickingList.getValue()); } + public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) { + mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> { + mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol()); + onComplete.run(); + }, this::sendError); + } + private void addHistoryItem(@NonNull MtbColr mtbColr) { Optional optional = Stream.of(this.mHistoryUsedAarts) .filter(x -> x.getCodMart().equalsIgnoreCase(mtbColr.getCodMart())) @@ -931,7 +938,7 @@ public class AccettazioneOrdiniPickingViewModel { if (this.mListener != null) this.mListener.onVersamentoAutomaticoULRequest(onComplete); } - private void sendOnInfoAggiuntiveRequest(RunnableArgss onComplete) { + private void sendOnInfoAggiuntiveRequest(RunnableArgss onComplete) { if (this.mListener != null) this.mListener.onInfoAggiuntiveRequest(onComplete); } @@ -1031,7 +1038,7 @@ public class AccettazioneOrdiniPickingViewModel { void onVersamentoAutomaticoULRequest(RunnableArgs onComplete); - void onInfoAggiuntiveRequest(RunnableArgss onComplete); + void onInfoAggiuntiveRequest(RunnableArgss onComplete); void onError(Exception ex); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 04534562..abcfb925 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -9,7 +9,6 @@ import android.view.ViewGroup; import androidx.appcompat.widget.AppCompatTextView; import androidx.core.content.res.ResourcesCompat; -import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.recyclerview.widget.LinearLayoutManager; @@ -60,7 +59,6 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterAutom import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterClienteLayoutView; import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterDepositoLayoutView; import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterGruppoMercLayoutView; -import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView; import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterPaeseLayoutView; import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterTermConsLayoutView; import it.integry.integrywmsnative.gest.ordini_uscita_elenco.filters.FilterVettoreLayoutView; @@ -74,6 +72,7 @@ import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRo import it.integry.integrywmsnative.ui.ElevatedToolbar; import it.integry.integrywmsnative.ui.filter_chips.FilterChipDTO; import it.integry.integrywmsnative.ui.filter_chips.FilterChipView; +import it.integry.integrywmsnative.ui.filter_chips.filters.FilterNumeroOrdineLayoutView; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, OrdiniUscitaElencoViewModel.Listener { @@ -150,7 +149,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main_ordini_uscita, container, false); + mBindings = FragmentMainOrdiniUscitaBinding.inflate(inflater, container, false); MainApplication.appComponent .prodOrdineLavorazioneElencoComponent() diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 5a6bd055..186e2915 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -33,7 +33,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; @@ -270,13 +270,23 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag this.mViewmodel.deleteRow(mtbColr); } + @Override + public void onRequestChangeMtbTcol(MtbColt mtbColt) { + DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> { + onLoadingStarted(); + mViewmodel.updateTipoUl(mtbTcol, this::onLoadingEnded); + }, () -> { + }) + .show(getSupportFragmentManager(), "dialog-note-aggiuntive"); + } + @Override public void onBottomSheetLUClose() { this.mViewmodel.closeLU(true); } @Override - public void onInfoAggiuntiveRequired(RunnableArgss onComplete) { + public void onInfoAggiuntiveRequired(RunnableArgss onComplete) { DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded) .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java index e1fa61b4..c3675d75 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiViewModel.java @@ -28,8 +28,8 @@ import it.integry.integrywmsnative.core.model.CommonModelConsts; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.dto.PickDataDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; @@ -716,6 +716,13 @@ public class PickingResiViewModel { }); } + public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) { + mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> { + mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol()); + onComplete.run(); + }, this::sendError); + } + public void resetMatchedRows() { for (WithdrawableDtbDocr pickingObjectDTO : this.mPickingList.getValue()) { pickingObjectDTO @@ -732,7 +739,7 @@ public class PickingResiViewModel { return mPickingList; } - private void sendOnInfoAggiuntiveRequired(RunnableArgss onComplete) { + private void sendOnInfoAggiuntiveRequired(RunnableArgss onComplete) { if (this.mListener != null) this.mListener.onInfoAggiuntiveRequired(onComplete); } @@ -808,9 +815,10 @@ public class PickingResiViewModel { return this; } + public interface Listener extends ILUPrintListener, ILoadingListener, ILUBaseOperationsListener { - void onInfoAggiuntiveRequired(RunnableArgss onComplete); + void onInfoAggiuntiveRequired(RunnableArgss onComplete); void onError(Exception ex); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java index 950d8dec..47745eea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java @@ -3,7 +3,7 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail; import java.math.BigDecimal; import it.integry.integrywmsnative.core.model.JtbFasi; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; public class ProdRientroMerceOrderDetailPickedQuantityDTO { @@ -14,7 +14,7 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO { private BigDecimal taraCol; private BigDecimal pesoLordo; - private MtbTCol mtbTCol; + private ObservableMtbTcol mtbTCol; private JtbFasi jtbFasi; public BigDecimal getNumCnf() { @@ -71,11 +71,11 @@ public class ProdRientroMerceOrderDetailPickedQuantityDTO { return this; } - public MtbTCol getMtbTCol() { + public ObservableMtbTcol getMtbTCol() { return mtbTCol; } - public ProdRientroMerceOrderDetailPickedQuantityDTO setMtbTCol(MtbTCol mtbTCol) { + public ProdRientroMerceOrderDetailPickedQuantityDTO setMtbTCol(ObservableMtbTcol mtbTCol) { this.mtbTCol = mtbTCol; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index b001f6de..c799dec5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -44,7 +44,7 @@ import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.MtbPartitaMag; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; @@ -1049,6 +1049,16 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); } + @Override + public void onRequestChangeMtbTcol(MtbColt mtbColt) { + DialogInfoAggiuntiveLUView.newInstance(mtbColt, false, true, (note, mtbTcol) -> { + onLoadingStarted(); + mViewmodel.updateTipoUl(mtbTcol, this::onLoadingEnded); + }, () -> { + }) + .show(getSupportFragmentManager(), "dialog-note-aggiuntive"); + } + @Override public void onBottomSheetLUClose() { this.mViewmodel.requestCloseLU(true); @@ -1081,8 +1091,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo } @Override - public void onInfoAggiuntiveRequired(MtbColt mtbColt, RunnableArgss onComplete) { - DialogInfoAggiuntiveLUView.newInstance(mtbColt, onComplete, this::onLoadingEnded) + public void onInfoAggiuntiveRequired(MtbColt mtbColt, RunnableArgss onComplete) { + DialogInfoAggiuntiveLUView.newInstance(mtbColt, true, true, onComplete, this::onLoadingEnded) .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index db57f139..f6ebc061 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -43,10 +43,10 @@ import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.MtbPartitaMag; -import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.VtbVett; import it.integry.integrywmsnative.core.model.dto.PickDataDTO; import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; @@ -1497,14 +1497,28 @@ public class SpedizioneViewModel { mCurrentMtbColt.getMtbColr().isEmpty(); String newTipoUL = shouldChangeCodTcol ? refMtbColt.getCodTcol() : null; - if (shouldChangeCodTcol) { - mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL, () -> { - mCurrentMtbColt.setCodTcol(newTipoUL); - onComplete.run(); - }, this::sendError); + ObservableMtbTcol newMtbTcol = SettingsManager.iDB().getInternalImballi().stream().filter(x -> x.getCodTcol().equalsIgnoreCase(newTipoUL)) + .findFirst() + .orElse(null); + + if(!UtilityString.isNullOrEmpty(newTipoUL) && newMtbTcol == null) { + this.sendError(new Exception("Impossibile riconoscere il tipo UL " + newTipoUL)); + onComplete.run(); + return; + } + + if (shouldChangeCodTcol && newMtbTcol != null) { + updateTipoUl(newMtbTcol, onComplete); } else onComplete.run(); } + public void updateTipoUl(ObservableMtbTcol newTipoUL, Runnable onComplete) { + mColliMagazzinoRESTConsumer.updateTipoUL(mCurrentMtbColt, newTipoUL.getCodTcol(), () -> { + mCurrentMtbColt.setCodTcol(newTipoUL.getCodTcol()); + onComplete.run(); + }, this::sendError); + } + private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, LocalDate dataScad, boolean shouldCloseLU) { this.sendOnLoadingStarted(); @@ -1763,7 +1777,7 @@ public class SpedizioneViewModel { } private void askInfoAggiuntive(Runnable onComplete) { - if (!SettingsManager.iDB().isFlagAskInfoAggiuntiveSpedizione()) { + if (mDefaultSegnoCol != -1 || !SettingsManager.iDB().isFlagAskInfoAggiuntiveSpedizione()) { onComplete.run(); return; } @@ -2093,7 +2107,7 @@ public class SpedizioneViewModel { void onFullItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canOverflowOrderQuantity, boolean canBatchLotBeChanged, RunnableArgss onComplete); - void onInfoAggiuntiveRequired(MtbColt currentMtbColt, RunnableArgss onComplete); + void onInfoAggiuntiveRequired(MtbColt currentMtbColt, RunnableArgss onComplete); void onLUPositionChangeRequest(RunnableArgss onComplete); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java index dcd00bbe..201e6f69 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java @@ -5,7 +5,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableList; import androidx.recyclerview.widget.RecyclerView; @@ -24,8 +23,8 @@ import it.integry.integrywmsnative.databinding.BottomSheetFragmentLuContentListI public class BottomSheetFragmentLUContentListAdapter extends RecyclerView.Adapter { - private Context mContext; - private ArrayList mDataset; + private final Context mContext; + private final ArrayList mDataset; private OnItemClickListener mOnItemClickListener; @@ -60,7 +59,7 @@ public class BottomSheetFragmentLUContentListAdapter extends RecyclerView.Adapte @Override public BottomSheetFragmentLUContentListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { // create a new view - BottomSheetFragmentLuContentListItemBinding viewDataBinding = DataBindingUtil.inflate(LayoutInflater.from(parent.getContext()), R.layout.bottom_sheet_fragment__lu_content__list_item, parent, false); + BottomSheetFragmentLuContentListItemBinding viewDataBinding = BottomSheetFragmentLuContentListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false); return new BottomSheetFragmentLUContentListAdapter.ViewHolder(viewDataBinding); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java index 8ff3a4c6..61a8f461 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java @@ -8,10 +8,12 @@ import java.math.RoundingMode; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; public class BottomSheetFragmentLUContentViewModel { + + public ObservableField mtbColt = new ObservableField<>(); public ObservableField pesoKg = new ObservableField<>(); public ObservableField pesoNettoKg = new ObservableField<>(); @@ -22,6 +24,10 @@ public class BottomSheetFragmentLUContentViewModel { if (this.mListener != null) this.mListener.onBottomSheetLUClose(); } + public void requestChangeMtbTcol() { + if (this.mListener != null) this.mListener.onRequestChangeMtbTcol(mtbColt.get()); + } + public BottomSheetFragmentLUContentViewModel setMtbColt(MtbColt mtbColt) { this.mtbColt.set(mtbColt); return this; @@ -45,7 +51,7 @@ public class BottomSheetFragmentLUContentViewModel { MtbColt collo = this.mtbColt.get(); if (collo == null) return; - MtbTCol tipoPedana = collo.getMtbTCol(); + ObservableMtbTcol tipoPedana = collo.getMtbTCol(); BigDecimal taraPedana = tipoPedana != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO; BigDecimal pesoNetto = BigDecimal.ZERO; @@ -67,6 +73,8 @@ public class BottomSheetFragmentLUContentViewModel { } public interface Listener { + void onRequestChangeMtbTcol(MtbColt mtbColt); + void onBottomSheetLUClose(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java index 27bb2a77..50f815b9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java @@ -2,14 +2,13 @@ package it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu; import dagger.Module; import dagger.Provides; -import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; @Module(subcomponents = DialogInfoAggiuntiveLUComponent.class) public class DialogInfoAggiuntiveLUModule { @Provides - DialogInfoAggiuntiveLUViewModel providesDialogInfoAggiuntiveLUViewModel(ImballiRESTConsumer imballiRESTConsumer) { - return new DialogInfoAggiuntiveLUViewModel(imballiRESTConsumer); + DialogInfoAggiuntiveLUViewModel providesDialogInfoAggiuntiveLUViewModel() { + return new DialogInfoAggiuntiveLUViewModel(); } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java index 3adbb8f6..75e95647 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java @@ -24,7 +24,7 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.utility.UtilityObservable; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogInfoAggiuntiveLuBinding; @@ -46,26 +46,38 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di private Context mContext; - private final RunnableArgss mOnComplete; + private final boolean askNotes; + private final boolean askTipoUl; + private final RunnableArgss mOnComplete; private final Runnable mOnAbort; private final MtbColt currentMtbColt; - public static DialogInfoAggiuntiveLUView newInstance(@NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { - return new DialogInfoAggiuntiveLUView(null, onComplete, onAbort); + public static DialogInfoAggiuntiveLUView newInstance(@NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { + return new DialogInfoAggiuntiveLUView(null, true, true, onComplete, onAbort); } - public static DialogInfoAggiuntiveLUView newInstance(MtbColt mtbColt, @NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { - return new DialogInfoAggiuntiveLUView(mtbColt, onComplete, onAbort); + public static DialogInfoAggiuntiveLUView newInstance(MtbColt mtbColt, boolean askNotes, boolean askTipoUl, @NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { + return new DialogInfoAggiuntiveLUView(mtbColt, askNotes, askTipoUl, onComplete, onAbort); } - private DialogInfoAggiuntiveLUView(MtbColt mtbColt, @NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { + private DialogInfoAggiuntiveLUView(MtbColt mtbColt, boolean askNotes, boolean askTipoUl, @NotNull RunnableArgss onComplete, @NotNull Runnable onAbort) { super(); this.mOnComplete = onComplete; this.mOnAbort = onAbort; this.currentMtbColt = mtbColt; + + this.askNotes = askNotes; + this.askTipoUl = askTipoUl; } + public boolean isAskNotes() { + return askNotes; + } + + public boolean isAskTipoUl() { + return askTipoUl; + } @NonNull @Override @@ -109,8 +121,8 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di public void onInit(DialogInterface dialogInterface) { super.onInit(dialogInterface); - this.init(); this.mViewModel.init(); + this.init(); } private void init() { @@ -123,15 +135,12 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter); - this.mViewModel.getTipiCollo().observe(this, tipiCollo -> { - - if (currentMtbColt != null && !UtilityString.isNullOrEmpty(currentMtbColt.getCodTcol()) && UtilityString.isNullOrEmpty(this.selectedMtbTcol.get())) { - tipiCollo.stream() - .filter(x -> x.getCodTcol().equalsIgnoreCase(currentMtbColt.getCodTcol())) - .findFirst() - .ifPresent(tipoPedana -> this.selectedMtbTcol.set(tipoPedana.getCodTcol() + " - " + tipoPedana.getDescrizione())); - } - }); + if (currentMtbColt != null && !UtilityString.isNullOrEmpty(currentMtbColt.getCodTcol()) && UtilityString.isNullOrEmpty(this.selectedMtbTcol.get())) { + mViewModel.getTipiCollo().getValue().stream() + .filter(x -> x.getCodTcol().equalsIgnoreCase(currentMtbColt.getCodTcol())) + .findFirst() + .ifPresent(tipoPedana -> this.selectedMtbTcol.set(tipoPedana.getCodTcol() + " - " + tipoPedana.getDescrizione())); + } UtilityObservable.addPropertyChanged(this.selectedMtbTcol, (value) -> { @@ -160,6 +169,5 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di }); - } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java index 08710e40..29a255d8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java @@ -2,38 +2,35 @@ package it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu; import androidx.lifecycle.MutableLiveData; -import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import javax.inject.Inject; import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener; import it.integry.integrywmsnative.core.model.MtbTCol; -import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; +import it.integry.integrywmsnative.core.settings.SettingsManager; public class DialogInfoAggiuntiveLUViewModel { - private final MutableLiveData> tipiCollo = new MutableLiveData<>(); + private final MutableLiveData> tipiCollo = new MutableLiveData<>(); private Listener mListener; - private final ImballiRESTConsumer imballiRESTConsumer; @Inject - public DialogInfoAggiuntiveLUViewModel(ImballiRESTConsumer imballiRESTConsumer) { - this.imballiRESTConsumer = imballiRESTConsumer; + public DialogInfoAggiuntiveLUViewModel() { } public void init() { - this.sendOnLoadingStarted(); - - imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> { - this.tipiCollo.postValue(tipiCollo == null ? new ArrayList<>() : tipiCollo); - this.sendOnLoadingEnded(); - }, this::sendError); + var imballiList = SettingsManager.iDB().getInternalImballi().stream() + .filter(x -> x.getFlagUIUL() == MtbTCol.FlagUiUlEnum.UL) + .collect(Collectors.toUnmodifiableList()); + this.tipiCollo.setValue(imballiList); } - public MutableLiveData> getTipiCollo() { + public MutableLiveData> getTipiCollo() { return tipiCollo; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java index 4f60b0d9..820216d4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdResultDTO.java @@ -3,7 +3,7 @@ package it.integry.integrywmsnative.view.dialogs.input_lu_prod; import java.math.BigDecimal; import it.integry.integrywmsnative.core.model.JtbFasi; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; public class DialogInputLUProdResultDTO { @@ -14,7 +14,7 @@ public class DialogInputLUProdResultDTO { private BigDecimal taraCol; private BigDecimal pesoLordo; - private MtbTCol mtbTCol; + private ObservableMtbTcol mtbTCol; private JtbFasi jtbFasi; @@ -72,11 +72,11 @@ public class DialogInputLUProdResultDTO { return this; } - public MtbTCol getMtbTCol() { + public ObservableMtbTcol getMtbTCol() { return mtbTCol; } - public DialogInputLUProdResultDTO setMtbTCol(MtbTCol mtbTCol) { + public DialogInputLUProdResultDTO setMtbTCol(ObservableMtbTcol mtbTCol) { this.mtbTCol = mtbTCol; return this; } 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 a3dcd637..7c265541 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 @@ -40,7 +40,7 @@ import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.JtbFasi; import it.integry.integrywmsnative.core.model.MtbAart; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.utility.UtilityObservable; import it.integry.integrywmsnative.databinding.DialogInputLuProdBinding; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; @@ -335,7 +335,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI if (mDialogInputLUProdDTO.getCodTcol() != null) { - Optional optTCol = Stream.of(tipiCollo) + java.util.Optional optTCol = tipiCollo.stream() .filter(x -> x.getCodTcol().equalsIgnoreCase(mDialogInputLUProdDTO.getCodTcol())) .findFirst(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java index 4f198759..df7c4b0f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java @@ -12,6 +12,7 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL import it.integry.integrywmsnative.core.model.JtbFasi; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; @@ -30,7 +31,7 @@ public class DialogInputLUProdViewModel { public ObservableField blockedTaraCol = new ObservableField<>(false); public ObservableField blockedPesoLordo = new ObservableField<>(false); - private final MutableLiveData> mTipiColloLiveData = new MutableLiveData<>(); + private final MutableLiveData> mTipiColloLiveData = new MutableLiveData<>(); private final MutableLiveData> mLineeProdLiveData = new MutableLiveData<>(); private BigDecimal initialNumCnf; @@ -43,7 +44,7 @@ public class DialogInputLUProdViewModel { private BigDecimal internalTaraCol; private BigDecimal internalPesoLordo; - private MtbTCol internalTipoPed; + private ObservableMtbTcol internalTipoPed; private JtbFasi internalLineaProd; private boolean isLineeProdRequired; @@ -62,7 +63,7 @@ public class DialogInputLUProdViewModel { public void init(String codJfasParent) { this.sendOnLoadingStarted(); - imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> { + imballiRESTConsumer.retrieveImballi(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> { this.mTipiColloLiveData.postValue(tipiCollo); mMesRESTConsumer.getLineeProduzione(codJfasParent, jtbFasi -> { @@ -76,7 +77,7 @@ public class DialogInputLUProdViewModel { }, this::sendError); } - public MutableLiveData> getTipiCollo() { + public MutableLiveData> getTipiCollo() { return this.mTipiColloLiveData; } @@ -200,7 +201,7 @@ public class DialogInputLUProdViewModel { this.mListener.onDataChanged(); } - public DialogInputLUProdViewModel setInternalTipoPed(MtbTCol internalTipoPed) { + public DialogInputLUProdViewModel setInternalTipoPed(ObservableMtbTcol internalTipoPed) { this.internalTipoPed = internalTipoPed; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java index c5e85b6e..4c0f3507 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java @@ -6,35 +6,40 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; import androidx.lifecycle.MutableLiveData; -import com.annimon.stream.Stream; - import java.util.List; +import java.util.stream.Collectors; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; public class DialogInputLUProdTipoColloAdapter extends ArrayAdapter { private List mDataset; - public DialogInputLUProdTipoColloAdapter(@NonNull Context context, int resource, @NonNull MutableLiveData> inputData) { + public DialogInputLUProdTipoColloAdapter(@NonNull Context context, int resource, @NonNull MutableLiveData> inputData) { super(context, resource); inputData.observeForever(data -> { - mDataset = Stream.of(data) + mDataset = data.stream() .map(x -> new DialogInputLUProdTipoColloListModel() .setOriginalModel(x)) - .toList(); + .collect(Collectors.toList()); clear(); addAll(mDataset); }); + + if (inputData.getValue() != null) + mDataset = inputData.getValue().stream() + .map(x -> new DialogInputLUProdTipoColloListModel() + .setOriginalModel(x)) + .collect(Collectors.toList()); } public List getDataset() { return this.mDataset; } - public MtbTCol getOriginalModelItem(int position) { + public ObservableMtbTcol getOriginalModelItem(int position) { return mDataset.get(position).getOriginalModel(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java index c6bb6ce9..4328b7e2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloListModel.java @@ -2,17 +2,17 @@ package it.integry.integrywmsnative.view.dialogs.input_lu_prod.adapter; import org.jetbrains.annotations.NotNull; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; public class DialogInputLUProdTipoColloListModel { - private MtbTCol originalModel; + private ObservableMtbTcol originalModel; - public MtbTCol getOriginalModel() { + public ObservableMtbTcol getOriginalModel() { return originalModel; } - public DialogInputLUProdTipoColloListModel setOriginalModel(MtbTCol originalModel) { + public DialogInputLUProdTipoColloListModel setOriginalModel(ObservableMtbTcol originalModel) { this.originalModel = originalModel; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java index da86ff71..ebbeb88f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java @@ -9,12 +9,13 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.annimon.stream.Optional; import com.annimon.stream.Stream; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.math.BigDecimal; import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; import javax.inject.Inject; @@ -24,7 +25,9 @@ import it.integry.integrywmsnative.core.di.BindableString; import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.RunnableArgsss; import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding; @@ -47,7 +50,7 @@ public class DialogInputPesoLUView extends BaseDialogFragment { public BindableString grossWeight = new BindableString(); - private List codTcolList = null; + private List codTcolList = null; private ArrayAdapter codTcolArrayAdapter = null; @@ -95,34 +98,31 @@ public class DialogInputPesoLUView extends BaseDialogFragment { } - private void init() { - imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, codTcols -> { - this.codTcolList = codTcols; + this.codTcolList = SettingsManager.iDB().getInternalImballi().stream() + .filter(x -> x.getFlagUIUL() == MtbTCol.FlagUiUlEnum.UL) + .collect(Collectors.toUnmodifiableList()); - List codTcolDescriptions = Stream.of(codTcols) + List codTcolDescriptions = codTcolList.stream() + .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione()) + .toList(); + + if (codTcol.get() != null) { + Optional newCodTcol = this.codTcolList.stream() + .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol.get())) .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione()) - .toList(); + .findFirst(); - if(codTcol.get() != null) { - Optional newCodTcol = Stream.of(codTcols) - .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol.get())) - .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione()) - .findSingle(); + if (newCodTcol.isPresent()) codTcol.set(newCodTcol.get()); + } - if(newCodTcol.isPresent()) codTcol.set(newCodTcol.get()); - } - - codTcolArrayAdapter = new ArrayAdapter(requireContext(), R.layout.array_adapter_single_item); - codTcolArrayAdapter.addAll(codTcolDescriptions); - mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter); + codTcolArrayAdapter = new ArrayAdapter<>(requireContext(), R.layout.array_adapter_single_item); + codTcolArrayAdapter.addAll(codTcolDescriptions); + mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter); // progressDialog.dismiss(); - }, ex -> { - UtilityExceptions.defaultException(requireContext(), ex); - }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java index 37e35e76..d01ee5ad 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java @@ -2,14 +2,13 @@ package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi; import dagger.Module; import dagger.Provides; -import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; @Module(subcomponents = DialogTracciamentoImballiComponent.class) public class DialogTracciamentoImballiModule { @Provides - DialogTracciamentoImballiViewModel providesDialogTracciamentoImballiViewModel(ImballiRESTConsumer imballiRESTConsumer) { - return new DialogTracciamentoImballiViewModel(imballiRESTConsumer); + DialogTracciamentoImballiViewModel providesDialogTracciamentoImballiViewModel() { + return new DialogTracciamentoImballiViewModel(); } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java index dcfdb4aa..e27a6d53 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java @@ -7,33 +7,29 @@ import androidx.lifecycle.MutableLiveData; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener; import it.integry.integrywmsnative.core.model.MtbTCol; -import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; +import it.integry.integrywmsnative.core.settings.SettingsManager; public class DialogTracciamentoImballiViewModel { - private final ImballiRESTConsumer imballiRESTConsumer; - private final MutableLiveData> imballiRegistrati = new MutableLiveData<>(new ArrayList<>()); - private final ObservableArrayList imballiDisponibili = new ObservableArrayList<>(); + private final ObservableArrayList imballiDisponibili = new ObservableArrayList<>(); private Listener mListener; - public DialogTracciamentoImballiViewModel(ImballiRESTConsumer imballiRESTConsumer) { - this.imballiRESTConsumer = imballiRESTConsumer; + public DialogTracciamentoImballiViewModel() { } public void init() { - this.imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UI, tipiCollo -> { + imballiDisponibili.addAll(SettingsManager.iDB().getInternalImballi().stream() + .filter(x -> x.getFlagUIUL() == MtbTCol.FlagUiUlEnum.UI) + .collect(Collectors.toUnmodifiableList())); - if (tipiCollo == null || tipiCollo.isEmpty()) - return; - - imballiDisponibili.addAll(tipiCollo); - }, this::sendError); } @@ -41,7 +37,7 @@ public class DialogTracciamentoImballiViewModel { return imballiRegistrati; } - public ObservableArrayList getImballiDisponibili() { + public ObservableArrayList getImballiDisponibili() { return imballiDisponibili; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java index a01e93e4..d0784fa4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java @@ -9,11 +9,11 @@ import com.annimon.stream.Stream; import java.util.List; -import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; public class DialogTracciamentoImballi_TipoColloAdapter extends ArrayAdapter { - public DialogTracciamentoImballi_TipoColloAdapter(@NonNull Context context, int resource, List inputData) { + public DialogTracciamentoImballi_TipoColloAdapter(@NonNull Context context, int resource, List inputData) { super(context, resource); if(inputData == null) return; @@ -28,12 +28,12 @@ public class DialogTracciamentoImballi_TipoColloAdapter extends ArrayAdapter + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_round_business_24.xml b/app/src/main/res/drawable/ic_round_business_24.xml new file mode 100644 index 00000000..c3b55a22 --- /dev/null +++ b/app/src/main/res/drawable/ic_round_business_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml index 5b594e49..77dcc4cb 100644 --- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml +++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml @@ -24,509 +24,874 @@ - + app:cardCornerRadius="8dp" + app:cardElevation="4dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + - + android:layout_height="66dp" + android:background="@color/colorAccent" + android:paddingStart="16dp" + android:paddingTop="8dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp"> - + + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/indicator_view"> - - - - + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_box" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/weight_card"> + + + + + + + + + android:layout_marginStart="10dp" + android:layout_marginTop="10dp" + android:text="@string/details_text" + android:textAllCaps="true" + android:textColor="@android:color/black" + android:textStyle="bold" /> - + android:orientation="vertical" + android:padding="15dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - + + + android:orientation="vertical" + android:paddingTop="14dp"> - - - + android:padding="16dp" + android:visibility="@{viewModel.mtbColt == null || viewModel.mtbColt.mtbColr.size() == 0 ? View.VISIBLE : View.GONE}"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="@string/empty_rows_in_mtbcolt" + android:textColor="@color/empty_view_gray" + android:textSize="20sp" /> - - - - - + - + - + - + - + - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml index 86e9c332..7fa714e0 100644 --- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml +++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml @@ -7,6 +7,8 @@ + + @@ -137,187 +139,73 @@ - - + app:layout_constraintTop_toBottomOf="@id/art_detail" + app:cardElevation="0dp" + app:strokeWidth="0dp"> + android:padding="12dp"> + + + android:layout_gravity="center_vertical" + android:layout_marginStart="12dp" + android:layout_weight="1" + android:orientation="vertical"> - + android:text="@{"#" + mtbColr.numColloRif + " (" + mtbColr.serCollo + ")"}" + android:textAppearance="@style/TextAppearance.Material3.TitleMedium" + android:singleLine="true" + android:ellipsize="end" + tools:text="#5230 (/)" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml index 9ff6a54d..a619be5a 100644 --- a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml +++ b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml @@ -53,7 +53,7 @@ android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="@id/title_text" app:layout_constraintBottom_toTopOf="@id/level_number_layout" - android:visibility="@{viewModel.tipiCollo == null || viewModel.tipiCollo.empty ? View.GONE : View.VISIBLE}" + app:visibility="@{view.askTipoUl}" android:hint="@string/lu_type"> + android:background="@android:color/white"> + android:scrollbars="none"> + From 8e0b05b6afd140f110ad60b96b0af2ab27de2500 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 20 Jan 2025 17:57:54 +0100 Subject: [PATCH 3/3] -> v1.43.00 (465) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a41dbf6d..1d2a9a68 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 464 - def appVersionName = '1.42.04' + def appVersionCode = 465 + def appVersionName = '1.43.00' signingConfigs { release {