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

Refactoring: Utilizzato LocalDate al posto di date nei DTO degli ordini uscita inevasi

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-06-03 19:35:12 +02:00
parent ae86a5cde8
commit c2d82d0806
12 changed files with 137 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdt.java
View File

@@ -1,10 +1,11 @@
package it.integry.integrywmsnative.core.model;
import java.math.BigDecimal;
import java.time.LocalDate;
public class DtbOrdt extends EntityBase {
private String dataOrd;
private LocalDate dataOrd;
private String gestione;
private Integer numOrd;
private BigDecimal acconto;
@@ -110,11 +111,11 @@ public class DtbOrdt extends EntityBase {
this.type = "dtb_ordt";
}
public String getDataOrd() {
public LocalDate getDataOrd() {
return dataOrd;
}
public DtbOrdt setDataOrd(String dataOrd) {
public DtbOrdt setDataOrd(LocalDate dataOrd) {
this.dataOrd = dataOrd;
return this;
}

41
app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
View File

@@ -1,14 +1,12 @@
package it.integry.integrywmsnative.core.model;
import java.util.Date;
import it.integry.integrywmsnative.core.utility.UtilityDate;
import java.time.LocalDate;
public class FiltroOrdineDTO {
private String gestioneOrd;
private String dataOrd;
private String dataCons;
private LocalDate dataOrd;
private LocalDate dataCons;
private int numOrd;
public String getGestioneOrd() {
@@ -20,44 +18,25 @@ public class FiltroOrdineDTO {
return this;
}
public String getDataOrdS() {
public LocalDate getDataOrd() {
return dataOrd;
}
public Date getDataOrdD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
}
public FiltroOrdineDTO setDataOrd(String dataOrd) {
public FiltroOrdineDTO setDataOrd(LocalDate dataOrd) {
this.dataOrd = dataOrd;
return this;
}
public FiltroOrdineDTO setDataOrd(Date dataOrd) {
this.dataOrd = UtilityDate.formatDate(dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
return this;
}
public String getDataConsS() {
public LocalDate getDataCons() {
return dataCons;
}
public Date getDataConsD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS());
}
public FiltroOrdineDTO setDataCons(String dataCons) {
public FiltroOrdineDTO setDataCons(LocalDate dataCons) {
this.dataCons = dataCons;
return this;
}
public FiltroOrdineDTO setDataCons(Date dataCons) {
if(dataCons != null) {
this.dataCons = UtilityDate.formatDate(dataCons, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
}
return this;
}
public int getNumOrd() {
return numOrd;
}
@@ -77,8 +56,8 @@ public class FiltroOrdineDTO {
if (getNumOrd() != that.getNumOrd()) return false;
if (getGestioneOrd() != null ? !getGestioneOrd().equals(that.getGestioneOrd()) : that.getGestioneOrd() != null)
return false;
if (dataOrd != null ? !dataOrd.equals(that.dataOrd) : that.dataOrd != null) return false;
return dataCons != null ? dataCons.equals(that.dataCons) : that.dataCons == null;
if (dataOrd != null ? !dataOrd.isEqual(that.dataOrd) : that.dataOrd != null) return false;
return dataCons != null ? dataCons.isEqual(that.dataCons) : that.dataCons == null;
}
@Override

10
app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
View File

@@ -351,6 +351,10 @@ public class MtbColt extends EntityBase {
return UtilityDate.recognizeDateWithExceptionHandler(getDataOrd());
}
public LocalDate getDataOrdLD() {
return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataOrd());
}
public String getDataOrd() {
return dataOrd;
}
@@ -590,12 +594,12 @@ public class MtbColt extends EntityBase {
try {
String condition = (String.format("(d.g = %s AND d.d = %s and d.n = %s",
UtilityDB.valueToString(filtroOrdineDTO.getGestioneOrd()),
UtilityDB.valueToString(UtilityDate.formatDate(filtroOrdineDTO.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
UtilityDB.valueToString(filtroOrdineDTO.getDataOrd()),
UtilityDB.valueToString(filtroOrdineDTO.getNumOrd())));
if (!UtilityString.isNullOrEmpty(filtroOrdineDTO.getDataConsS())) {
if (filtroOrdineDTO.getDataCons() != null) {
condition += (String.format(" AND dr.dc = %s",
UtilityDB.valueToString(UtilityDate.formatDate(filtroOrdineDTO.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
UtilityDB.valueToString(filtroOrdineDTO.getDataCons())));
}
condition += ")";

30
app/src/main/java/it/integry/integrywmsnative/core/model/OrdineInevasoDTO.java
View File

@@ -1,36 +1,36 @@
package it.integry.integrywmsnative.core.model;
import java.util.Date;
import com.google.gson.annotations.SerializedName;
import java.time.LocalDate;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.utility.UtilityDate;
public class OrdineInevasoDTO {
private String data;
private Integer numero;
@SerializedName("data")
private LocalDate dataOrd;
@SerializedName("numero")
private Integer numOrd;
private String gestione;
private String codMdep;
public String getDataOrdS() {
return data;
public LocalDate getDataOrd() {
return dataOrd;
}
public Date getDataOrdD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
}
public OrdineInevasoDTO setData(String data) {
this.data = data;
public OrdineInevasoDTO setDataOrd(LocalDate data) {
this.dataOrd = data;
return this;
}
public Integer getNumOrd() {
return numero;
return numOrd;
}
public OrdineInevasoDTO setNumero(Integer numero) {
this.numero = numero;
public OrdineInevasoDTO setNumOrd(Integer numOrd) {
this.numOrd = numOrd;
return this;
}

4
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java
View File

@@ -147,10 +147,10 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
public void retrieveListaArticoliFromOrdiniUscita(String codMdep, List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
.map(x -> new GetPickingListDTO()
.setData(x.getDataOrdS())
.setData(x.getDataOrd())
.setGestione(x.getGestione())
.setNumero(x.getNumOrd())
.setDataConsegna(x.getDataConsS())
.setDataConsegna(x.getDataCons())
.setIdViaggio(x.getIdViaggio()))
.toList();

14
app/src/main/java/it/integry/integrywmsnative/core/rest/model/GetPickingListDTO.java
View File

@@ -1,19 +1,21 @@
package it.integry.integrywmsnative.core.rest.model;
import java.time.LocalDate;
public class GetPickingListDTO {
private String data;
private LocalDate data;
private Integer numero;
private String gestione;
private String dataConsegna;
private LocalDate dataConsegna;
private Integer idViaggio;
public String getData() {
public LocalDate getData() {
return data;
}
public GetPickingListDTO setData(String data) {
public GetPickingListDTO setData(LocalDate data) {
this.data = data;
return this;
}
@@ -36,11 +38,11 @@ public class GetPickingListDTO {
return this;
}
public String getDataConsegna() {
public LocalDate getDataConsegna() {
return dataConsegna;
}
public GetPickingListDTO setDataConsegna(String dataConsegna) {
public GetPickingListDTO setDataConsegna(LocalDate dataConsegna) {
this.dataConsegna = dataConsegna;
return this;
}

30
app/src/main/java/it/integry/integrywmsnative/core/rest/model/OrdineUscitaInevasoDTO.java
View File

@@ -1,12 +1,10 @@
package it.integry.integrywmsnative.core.rest.model;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.Date;
import java.time.LocalDate;
import java.util.List;
import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
import it.integry.integrywmsnative.core.utility.UtilityDate;
public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
@@ -17,7 +15,7 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
private String descrizioneAuto;
private String codVvet;
private String descrizioneVettore;
private String dataInizTrasp;
private LocalDate dataInizTrasp;
private String descrizionePaga;
private String rifOrd;
private String codAnagOrd;
@@ -33,7 +31,7 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
private BigDecimal pesoTotale;
private BigDecimal numCnfdaEvadere;
private BigDecimal numCnfDisp;
private String dataCons;
private LocalDate dataCons;
private String barcode;
private Integer numRighe;
private Integer righeInPartenza;
@@ -48,7 +46,6 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
private List<AvailableClassMerc> availableClassMerc;
private boolean ordTrasf;
public Integer getIdViaggio() {
return idViaggio;
}
@@ -58,7 +55,6 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
return this;
}
public String getListino() {
return listino;
}
@@ -113,15 +109,11 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
return this;
}
public String getDataInizTraspS() {
public LocalDate getDataInizTrasp() {
return dataInizTrasp;
}
public Date getDataInizTraspD() throws ParseException {
return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS());
}
public OrdineUscitaInevasoDTO setDataInizTrasp(String dataInizTrasp) {
public OrdineUscitaInevasoDTO setDataInizTrasp(LocalDate dataInizTrasp) {
this.dataInizTrasp = dataInizTrasp;
return this;
}
@@ -252,15 +244,11 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
return this;
}
public String getDataConsS() {
public LocalDate getDataCons() {
return dataCons;
}
public Date getDataConsD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS());
}
public OrdineUscitaInevasoDTO setDataCons(String dataCons) {
public OrdineUscitaInevasoDTO setDataCons(LocalDate dataCons) {
this.dataCons = dataCons;
return this;
}
@@ -389,14 +377,14 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
OrdineUscitaInevasoDTO that = (OrdineUscitaInevasoDTO) o;
if (!getDataOrdS().equals(that.getDataOrdS())) return false;
if (!getDataOrd().equals(that.getDataOrd())) return false;
if (!getNumOrd().equals(that.getNumOrd())) return false;
return getGestione().equals(that.getGestione());
}
@Override
public int hashCode() {
int result = getDataOrdS().hashCode();
int result = getDataOrd().hashCode();
result = 31 * result + getNumOrd().hashCode();
result = 31 * result + getGestione().hashCode();
return result;

50
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoDTO.java
View File

@@ -1,16 +1,56 @@
package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
import it.integry.integrywmsnative.core.utility.UtilityReflections;
public class OrdiniUscitaElencoDTO extends OrdineUscitaInevasoDTO {
private boolean hidden = false;
public static OrdiniUscitaElencoDTO fromParent(OrdineUscitaInevasoDTO parent) throws Exception {
OrdiniUscitaElencoDTO child = new OrdiniUscitaElencoDTO();
UtilityReflections.copy(parent, child);
return child;
public static OrdiniUscitaElencoDTO from(OrdineUscitaInevasoDTO that) {
if (that == null) return null;
OrdiniUscitaElencoDTO dto = new OrdiniUscitaElencoDTO();
dto.setIdViaggio(that.getIdViaggio())
.setListino(that.getListino())
.setTermCons(that.getTermCons())
.setCodAuto(that.getCodAuto())
.setDescrizioneAuto(that.getDescrizioneAuto())
.setCodVvet(that.getCodVvet())
.setDescrizioneVettore(that.getDescrizioneVettore())
.setDataInizTrasp(that.getDataInizTrasp())
.setDescrizionePaga(that.getDescrizionePaga())
.setRifOrd(that.getRifOrd())
.setCodAnagOrd(that.getCodAnagOrd())
.setCodJcom(that.getCodJcom())
.setDescrizioneCom(that.getDescrizioneCom())
.setRagSocCom(that.getRagSocCom())
.setRagSocOrd(that.getRagSocOrd())
.setDestinatario(that.getDestinatario())
.setCodVdes(that.getCodVdes())
.setCitta(that.getCitta())
.setProvincia(that.getProvincia())
.setIndirizzo(that.getIndirizzo())
.setPesoTotale(that.getPesoTotale())
.setNumCnfdaEvadere(that.getNumCnfdaEvadere())
.setNumCnfDisp(that.getNumCnfDisp())
.setDataCons(that.getDataCons())
.setBarcode(that.getBarcode())
.setNumRighe(that.getNumRighe())
.setRigheInPartenza(that.getRigheInPartenza())
.setSaldoContabile(that.getSaldoContabile())
.setCodVzon(that.getCodVzon())
.setRagSocOrdV(that.getRagSocOrdV())
.setColliRiservati(that.getColliRiservati())
.setExistColloBoolean(that.isExistColloBoolean())
.setFlagEvaso(that.isFlagEvaso())
.setNomeAgente(that.getNomeAgente())
.setCodJfas(that.getCodJfas())
.setAvailableClassMerc(that.getAvailableClassMerc())
.setOrdTrasf(that.isOrdTrasf());
// Copia anche i campi della super-superclasse se necessario (OrdineInevasoDTO)
dto.setDataOrd(that.getDataOrd())
.setNumOrd(that.getNumOrd())
.setGestione(that.getGestione());
return dto;
}
public boolean isHidden() {

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

@@ -18,9 +18,9 @@ import com.annimon.stream.ComparatorCompat;
import com.annimon.stream.Stream;
import com.google.android.material.datepicker.MaterialDatePicker;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -590,11 +590,16 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
var datePicker =
MaterialDatePicker.Builder.datePicker()
.setTitleText(filterChipDTO.getFilterChipText())
.setSelection(this.mAppliedFilterViewModel.getSelectedDataCons() != null ? this.mAppliedFilterViewModel.getSelectedDataCons().getTime() : null)
.setSelection(this.mAppliedFilterViewModel.getSelectedDataCons() != null ?
this.mAppliedFilterViewModel.getSelectedDataCons().atStartOfDay(java.time.ZoneId.systemDefault()).toInstant().toEpochMilli() :
MaterialDatePicker.todayInUtcMilliseconds())
.build();
datePicker.addOnPositiveButtonClickListener(selection -> {
this.mAppliedFilterViewModel.setDataConsegnaFilter(new Date(selection));
LocalDate selectedDate = LocalDate.ofInstant(
java.time.Instant.ofEpochMilli(selection),
java.time.ZoneId.systemDefault());
this.mAppliedFilterViewModel.setDataConsegnaFilter(selectedDate);
});
datePicker.show(requireActivity().getSupportFragmentManager(), "TAG");
return;
@@ -782,13 +787,13 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
listModel.setGroupTitle(x.getRagSocOrd());
String testataOrdString = String.format(getString(R.string.ord_ven_testata), String.valueOf(x.getNumOrd()), UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
String testataOrdString = String.format(getString(R.string.ord_ven_testata), String.valueOf(x.getNumOrd()), UtilityDate.formatDate(x.getDataOrd(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
listModel.setDescription(testataOrdString);
listModel.setSubDescription(x.getRifOrd());
if (x.getDataConsD() != null) {
String testataDataConsString = String.format(getString(R.string.ord_ven_testata_data_cons), UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
if (x.getDataCons() != null) {
String testataDataConsString = String.format(getString(R.string.ord_ven_testata_data_cons), UtilityDate.formatDate(x.getDataCons(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
listModel.setRightDescription(testataDataConsString);
}

34
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java
View File

@@ -1,12 +1,13 @@
package it.integry.integrywmsnative.gest.ordini_uscita_elenco;
import android.os.Handler;
import androidx.lifecycle.MutableLiveData;
import com.annimon.stream.Stream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ExecutorService;
@@ -40,7 +41,6 @@ public class OrdiniUscitaElencoViewModel {
private final MutableLiveData<List<OrdiniUscitaElencoDTO>> mOrderList = new MutableLiveData<>();
private final android.os.Handler mHandler;
private final ExecutorService executorService;
private final OrdiniRESTConsumer mOrdiniRESTConsumer;
private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
@@ -54,13 +54,12 @@ public class OrdiniUscitaElencoViewModel {
private int mCurrentSegnoCol;
@Inject
public OrdiniUscitaElencoViewModel(android.os.Handler handler,
public OrdiniUscitaElencoViewModel(Handler handler,
ExecutorService executorService,
OrdiniRESTConsumer ordiniRESTConsumer,
ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
BarcodeRESTConsumer barcodeRESTConsumer,
OrdiniUscitaElencoRESTConsumer ordiniUscitaElencoRESTConsumer) {
this.mHandler = handler;
this.executorService = executorService;
this.mOrdiniRESTConsumer = ordiniRESTConsumer;
this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
@@ -83,13 +82,7 @@ public class OrdiniUscitaElencoViewModel {
ordiniLavorazione = this.mOrdiniRESTConsumer.getOrdiniInevasiSynchronized(this.mCurrentCodMdep, mCurrentGestioneOrd);
var orderList = ordiniLavorazione.parallelStream()
.map(x -> {
try {
return OrdiniUscitaElencoDTO.fromParent(x);
} catch (Exception ex) {
return null;
}
})
.map(OrdiniUscitaElencoDTO::from)
.filter(Objects::nonNull)
.collect(Collectors.toList());
@@ -192,21 +185,16 @@ public class OrdiniUscitaElencoViewModel {
int numOrd = Integer.parseInt(UtilityString.mid(barcode, 10));
Date date = null;
try {
date = new SimpleDateFormat("ddMMyyyy")
.parse(UtilityString.mid(barcode, 2, 8));
} catch (ParseException ex) {
this.sendError(ex);
return;
}
LocalDate date = null;
var pattern = DateTimeFormatter.ofPattern("ddMMyyyy");
date = LocalDate.parse(UtilityString.mid(barcode, 2, 8), pattern);
final String finalGestione = gestione;
final Date finalDate = date;
final LocalDate finalDate = date;
List<OrdiniUscitaElencoDTO> foundItem = Stream.of(mOrderList.getValue())
.filter(x -> x.getNumOrd() == numOrd && x.getGestione().equalsIgnoreCase(finalGestione) && x.getDataOrdD().equals(finalDate))
.filter(x -> x.getNumOrd() == numOrd && x.getGestione().equalsIgnoreCase(finalGestione) && x.getDataOrd().isEqual(finalDate))
.toList();
onComplete.run(foundItem);

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

@@ -6,11 +6,9 @@ import androidx.lifecycle.MutableLiveData;
import com.annimon.stream.Stream;
import com.annimon.stream.function.Predicate;
import org.apache.commons.lang3.time.DateUtils;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -38,7 +36,7 @@ public class OrdiniUscitaElencoFiltroViewModel {
private final ObservableField<Predicate<OrdiniUscitaElencoDTO>> currentGruppoMercPredicate = new ObservableField<>();
private final ObservableField<Predicate<OrdiniUscitaElencoDTO>> currentCommessaPredicate = new ObservableField<>();
private Date selectedDataCons = null;
private LocalDate selectedDataCons = null;
private List<MtbGrup> selectedMtbGrup = new ArrayList<>();
private List<OrdiniUscitaElencoDTO> initialOrderList;
@@ -104,12 +102,12 @@ public class OrdiniUscitaElencoFiltroViewModel {
}
}
public void setDataConsegnaFilter(Date dataConsegna) {
public void setDataConsegnaFilter(LocalDate dataConsegna) {
this.selectedDataCons = dataConsegna;
if (dataConsegna == null) currentDataConsPredicate.set(null);
else {
currentDataConsPredicate.set(o -> o.getDataConsD() != null && DateUtils.isSameDay(o.getDataConsD(), dataConsegna));
currentDataConsPredicate.set(o -> o.getDataCons() != null && o.getDataCons().isEqual(dataConsegna));
}
}
@@ -148,7 +146,7 @@ public class OrdiniUscitaElencoFiltroViewModel {
}
public Date getSelectedDataCons() {
public LocalDate getSelectedDataCons() {
return selectedDataCons;
}

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

@@ -313,10 +313,10 @@ public class SpedizioneViewModel {
mTestateOrdini
.forEach(x -> {
var filtro = new FiltroOrdineDTO()
.setDataOrd(x.getDataOrdD())
.setDataOrd(x.getDataOrd())
.setNumOrd(x.getNumOrd())
.setGestioneOrd(x.getGestione())
.setDataCons(x.getDataConsD());
.setDataCons(x.getDataCons());
if (!mDefaultFiltroOrdine.contains(filtro))
mDefaultFiltroOrdine.add(filtro);
@@ -804,8 +804,8 @@ public class SpedizioneViewModel {
if (selectedArts == null) return;
final List<MagazzinoAutomaticoPickOrderRequestDTO> orders = this.mTestateOrdini.stream()
.map(x -> new MagazzinoAutomaticoPickOrderRequestDTO(UtilityDate.toLocalDate(x.getDataOrdD()), x.getGestione(), x.getNumOrd())
.setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null))
.map(x -> new MagazzinoAutomaticoPickOrderRequestDTO(x.getDataOrd(), x.getGestione(), x.getNumOrd())
.setDataCons(x.getDataCons()))
.collect(Collectors.toList());
final List<MagazzinoAutomaticoPickItemRequestDTO> magazzinoAutomaticoPickItemRequestDTOList = new ArrayList<>();
@@ -839,8 +839,8 @@ public class SpedizioneViewModel {
public void executeEmptyMagazzinoAutomaticoRequest(MtbDepoPosizione mtbDepoPosizione) throws Exception {
final List<MagazzinoAutomaticoPickOrderRequestDTO> orders = this.mTestateOrdini.stream()
.map(x -> new MagazzinoAutomaticoPickOrderRequestDTO(UtilityDate.toLocalDate(x.getDataOrdD()), x.getGestione(), x.getNumOrd())
.setDataCons(UtilityDate.toLocalDate(x.getDataConsD())))
.map(x -> new MagazzinoAutomaticoPickOrderRequestDTO(x.getDataOrd(), x.getGestione(), x.getNumOrd())
.setDataCons(x.getDataCons()))
.collect(Collectors.toList());
var magazzinoAutomaticoPickRequest = new MagazzinoAutomaticoPickItemsRequestDTO()
@@ -1489,8 +1489,8 @@ public class SpedizioneViewModel {
final List<CreateUDSRequestOrderDTO> orders = this.mTestateOrdini.stream()
.map(x -> new CreateUDSRequestOrderDTO()
.setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null)
.setDataOrd(UtilityDate.toLocalDate(x.getDataOrdD()))
.setDataCons(x.getDataCons())
.setDataOrd(x.getDataOrd())
.setGestione(x.getGestione())
.setNumOrd(x.getNumOrd()))
.collect(Collectors.toList());
@@ -2050,7 +2050,7 @@ public class SpedizioneViewModel {
if (mTestateOrdini != null) {
for (MtbColt mtbColt : mtbColtList) {
mTestateOrdini.stream()
.filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrdD().equals(mtbColt.getDataOrdD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum())
.filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrd().isEqual(mtbColt.getDataOrdLD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum())
.forEach(x -> x.setExistColloBoolean(true));
}
}
@@ -2136,7 +2136,7 @@ public class SpedizioneViewModel {
List<DtbOrdt> closedOrders = this.mTestateOrdini.parallelStream()
.map(ord -> new DtbOrdt()
.setDataOrd(ord.getDataOrdS())
.setDataOrd(ord.getDataOrd())
.setNumOrd(ord.getNumOrd())
.setGestione(ord.getGestione())
.setCodAnag(ord.getCodAnagOrd())