Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gestione filtri in Spedizione

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-06-20 18:15:30 +02:00
parent 3ade0879f5
commit aa1c3b877d
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
View File

@@ -189,9 +189,9 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
this.initMtbGrupsCache(); this.initMtbGrupsCache();
this.initJtbComtCache(); this.initJtbComtCache();
mAppliedFilterViewModel.init(data); handler.post(() -> {
mAppliedFilterViewModel.init(data);
// this.refreshList(data, null); });
this.onLoadingEnded(); this.onLoadingEnded();
} catch (Exception e) { } catch (Exception e) {

4
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
View File

@@ -44,7 +44,7 @@ public class OrdiniUscitaElencoFiltroViewModel {
public void init(List<OrdiniUscitaElencoDTO> initialList) { public void init(List<OrdiniUscitaElencoDTO> initialList) {
this.initialOrderList = initialList; this.initialOrderList = initialList;
this.currentFilteredOrderList.postValue(this.initialOrderList); applyAllTests();
} }
public MutableLiveData<List<OrdiniUscitaElencoDTO>> getMutableFilteredOrderList() { public MutableLiveData<List<OrdiniUscitaElencoDTO>> getMutableFilteredOrderList() {
@@ -173,7 +173,7 @@ public class OrdiniUscitaElencoFiltroViewModel {
) { ) {
returnList = this.initialOrderList; returnList = this.initialOrderList;
} else { } else {
Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(this.initialOrderList) java.util.stream.Stream<OrdiniUscitaElencoDTO> tmpStream = this.initialOrderList.stream()
.filter(x -> .filter(x ->
(currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))) && (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))) &&
(currentClientePredicate.get() == null || (currentClientePredicate.get().test(x))) && (currentClientePredicate.get() == null || (currentClientePredicate.get().test(x))) &&

7
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@@ -1761,7 +1761,7 @@ public class SpedizioneViewModel {
var duplicatedMtbColts = this.validateTheUdsToBeDuplicated(generatedMtbColts); var duplicatedMtbColts = this.validateTheUdsToBeDuplicated(generatedMtbColts);
if (duplicatedMtbColts != null) { if (duplicatedMtbColts != null && !duplicatedMtbColts.isEmpty()) {
generatedMtbColts.addAll(duplicatedMtbColts); generatedMtbColts.addAll(duplicatedMtbColts);
} }
@@ -2047,7 +2047,10 @@ public class SpedizioneViewModel {
if (mTestateOrdini != null) { if (mTestateOrdini != null) {
for (MtbColt mtbColt : mtbColtList) { for (MtbColt mtbColt : mtbColtList) {
mTestateOrdini.stream() mTestateOrdini.stream()
.filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrd().isEqual(mtbColt.getDataOrdLD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum()) .filter(x ->
x.getNumOrd().equals(mtbColt.getNumOrd()) &&
x.getDataOrd().isEqual(mtbColt.getDataOrdLD()) &&
x.getGestioneEnum() == mtbColt.getGestioneEnum())
.forEach(x -> x.setExistCollo(true)); .forEach(x -> x.setExistCollo(true));
} }
} }