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

Fix su sortBy data cons in avantielenco Accettazione / Spedizione

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-06-19 16:49:03 +02:00
parent 715c25b99f
commit 1966acd836
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
View File

@ -21,6 +21,7 @@ import android.widget.Toast;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -188,7 +189,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
List<OrdineAccettazioneGroupedInevasoDTO.Ordine> tmpOrd = Stream.of(ordini) List<OrdineAccettazioneGroupedInevasoDTO.Ordine> tmpOrd = Stream.of(ordini)
.filter(x -> x.getCodAnagOrd().equals(groupedOrdine.codAnagForn)) .filter(x -> x.getCodAnagOrd().equals(groupedOrdine.codAnagForn))
.sortBy(x -> x.getDataConsD()) .sortBy(x -> x.getDataConsD() != null ? x.getDataConsD() : new Date(2000, 01, 01))
.map(x -> { .map(x -> {
OrdineAccettazioneGroupedInevasoDTO.Ordine rigaOrdine = new OrdineAccettazioneGroupedInevasoDTO.Ordine(); OrdineAccettazioneGroupedInevasoDTO.Ordine rigaOrdine = new OrdineAccettazioneGroupedInevasoDTO.Ordine();

3
app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
View File

@ -21,6 +21,7 @@ import android.view.ViewGroup;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -212,7 +213,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
Stream.of(ordini) Stream.of(ordini)
.filter(x -> x.getCodAnagOrd().equalsIgnoreCase(codAnagOrd)) .filter(x -> x.getCodAnagOrd().equalsIgnoreCase(codAnagOrd))
.distinctBy(x -> x.getDataOrdS() + " - " + x.getDataConsS() + " - " + x.getNumOrd()) .distinctBy(x -> x.getDataOrdS() + " - " + x.getDataConsS() + " - " + x.getNumOrd())
.sortBy(OrdineVenditaInevasoDTO::getDataConsD) .sortBy(x -> x.getDataConsD() != null ? x.getDataConsD() : new Date(2000, 01, 01))
.forEach(ord -> { .forEach(ord -> {