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

[LICOR]

Browse Source 
aggiunto controllo su dataconsegna null in filtro per data consegna ordini spedizione
This commit is contained in:
Valerio Castellana 2023-07-19 13:13:20 +02:00
parent fa6ad5a150
commit ff128a1de2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ public class VenditaFiltroOrdiniViewModel {
if (dataConsegna == null) currentDataConsPredicate.set(null); if (dataConsegna == null) currentDataConsPredicate.set(null);
else { else {
currentDataConsPredicate.set(o -> DateUtils.isSameDay(o.getDataConsD(), dataConsegna)); currentDataConsPredicate.set(o -> o.getDataConsD() != null && DateUtils.isSameDay(o.getDataConsD(), dataConsegna));
} }
} }
@ -137,8 +137,7 @@ public class VenditaFiltroOrdiniViewModel {
if (mtbGrupList == null || mtbGrupList.isEmpty()) { if (mtbGrupList == null || mtbGrupList.isEmpty()) {
currentGruppoMercPredicate.set(null); currentGruppoMercPredicate.set(null);
this.selectedMtbGrup = new ArrayList<>(); this.selectedMtbGrup = new ArrayList<>();
} } else {
else {
this.selectedMtbGrup = mtbGrupList; this.selectedMtbGrup = mtbGrupList;
var mtbGrups = Stream.of(mtbGrupList).map(MtbGrup::getCodMgrp).toList(); var mtbGrups = Stream.of(mtbGrupList).map(MtbGrup::getCodMgrp).toList();
currentGruppoMercPredicate.set(o -> Stream.of(o.getAvailableClassMerc()) currentGruppoMercPredicate.set(o -> Stream.of(o.getAvailableClassMerc())
@ -693,6 +692,7 @@ public class VenditaFiltroOrdiniViewModel {
.sortBy(JtbComt::getCodJcom) .sortBy(JtbComt::getCodJcom)
.toList(); .toList();
} }
public List<JtbComt> getAvailableCommesse(List<JtbComt> commesseFullList) { public List<JtbComt> getAvailableCommesse(List<JtbComt> commesseFullList) {
if (currentIdViaggioPredicate.get() == null && if (currentIdViaggioPredicate.get() == null &&