diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverDTO.java index e87e4b53..e69f932f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverDTO.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.core.data_recover; +import java.time.LocalDate; import java.util.List; import it.integry.integrywmsnative.core.model.MtbColt; @@ -10,7 +11,7 @@ public class ColliDataRecoverDTO { private int id; private int numCollo; private String serCollo; - private String dataCollo; + private LocalDate dataCollo; private String gestioneCollo; private String filtro; @@ -43,11 +44,11 @@ public class ColliDataRecoverDTO { return this; } - public String getDataCollo() { + public LocalDate getDataCollo() { return dataCollo; } - public ColliDataRecoverDTO setDataCollo(String dataCollo) { + public ColliDataRecoverDTO setDataCollo(LocalDate dataCollo) { this.dataCollo = dataCollo; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java index ed791a05..a1906cf4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.data_recover; import android.content.Context; -import com.annimon.stream.Optional; import com.annimon.stream.Stream; import com.google.android.gms.common.util.IOUtils; import com.google.gson.Gson; @@ -14,6 +13,7 @@ import java.io.InputStream; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.Random; import javax.inject.Inject; @@ -65,9 +65,9 @@ public class ColliDataRecoverService { } private ColliDataRecoverDTO getIfExists(int id) { - Optional recoverDTOOptional = Stream.of(mtbColtsSessions) + Optional recoverDTOOptional = mtbColtsSessions.stream() .filter(x -> x.getId() == id) - .findSingle(); + .findFirst(); return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null; @@ -85,7 +85,7 @@ public class ColliDataRecoverService { ColliDataRecoverDTO recoverDTO = new ColliDataRecoverDTO() .setId(newId) - .setDataCollo(mtbColtSession.getDataColloS()) + .setDataCollo(mtbColtSession.getDataColloLD()) .setNumCollo(mtbColtSession.getNumCollo()) .setSerCollo(mtbColtSession.getSerCollo()) .setGestioneCollo(mtbColtSession.getGestione()) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index dec4ae35..61a6f416 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java @@ -15,7 +15,7 @@ public class MtbColr extends EntityBase { private String gestione; private String serCollo; private Integer numCollo; - private String dataCollo; + private LocalDate dataCollo; private Integer riga; private Integer rigaOrd; private String codMart; @@ -27,7 +27,7 @@ public class MtbColr extends EntityBase { private String serColloRif; private String note; private LocalDate dataOrd; - private String dataColloRif; + private LocalDate dataColloRif; private BigDecimal qtaCnf; private BigDecimal qtaCol; private Integer numOrd; @@ -164,21 +164,18 @@ public class MtbColr extends EntityBase { return this; } - public String getDataColloS() { + + public LocalDate getDataColloLD() { return dataCollo; } - public Date getDataColloD() { - return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS()); - } - public MtbColr setDataCollo(String dataCollo) { - this.dataCollo = dataCollo; + this.dataCollo = UtilityDate.recognizeLocalDateWithExceptionHandler(dataCollo); return this; } - public MtbColr setDataCollo(Date dataCollo) { - setDataCollo(UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)); + public MtbColr setDataCollo(LocalDate dataCollo) { + this.dataCollo = dataCollo; return this; } @@ -287,25 +284,24 @@ public class MtbColr extends EntityBase { } public String getDataColloRifS() { - return dataColloRif; + return dataColloRif != null ? UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_SLASHED_FORMATTER.format(dataColloRif) : null; } public Date getDataColloRifD() { return UtilityDate.recognizeDateWithExceptionHandler(getDataColloRifS()); } - public MtbColr setDataColloRif(String dataColloRif) { - this.dataColloRif = dataColloRif; - return this; + public LocalDate getDataColloRifLD() { + return dataColloRif; } - public MtbColr setDataColloRif(Date dataColloRif) { - this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); + public MtbColr setDataColloRif(String dataColloRif) { + this.dataColloRif = UtilityDate.recognizeLocalDateWithExceptionHandler(dataColloRif); return this; } public MtbColr setDataColloRif(LocalDate dataColloRif) { - this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH); + this.dataColloRif = dataColloRif; return this; } 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 dfad9b2d..199fadff 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 @@ -22,7 +22,6 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; -import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityString; /** @@ -31,7 +30,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString; public class MtbColt extends EntityBase { private String gestione; - private String dataCollo; + private LocalDate dataCollo; private String serCollo; private Integer numCollo; private String rifOrd; @@ -86,7 +85,7 @@ public class MtbColt extends EntityBase { public MtbColt() { type = "mtb_colt"; - setDataCollo(UtilityDate.getDateInstance()); + setDataCollo(LocalDate.now()); setSerCollo("/"); if (SettingsManager.i().isUserLoggedIn()) { @@ -145,20 +144,13 @@ public class MtbColt extends EntityBase { } public String getDataColloHumanLong() { - Date dataColloD = null; - try { - dataColloD = getDataColloD(); - } catch (Exception ex) { - UtilityLogger.error(ex); - } - - if (dataColloD != null) { - return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN_LONG); + if (dataCollo != null) { + return UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_HUMAN_FORMATTER.format(dataCollo); } else return null; } public String getDataColloS() { - return dataCollo; + return dataCollo != null ? UtilityDate.COMMONS_DATE_FORMATS.DATE_DMY_SLASHED_FORMATTER.format(dataCollo) : null; } public Date getDataColloD() { @@ -166,21 +158,16 @@ public class MtbColt extends EntityBase { } public LocalDate getDataColloLD() { - return UtilityDate.recognizeLocalDateWithExceptionHandler(getDataColloS()); + return dataCollo; } public MtbColt setDataCollo(String dataCollo) { - this.dataCollo = dataCollo; - return this; - } - - public MtbColt setDataCollo(Date dataCollo) { - this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); + this.dataCollo = UtilityDate.recognizeLocalDateWithExceptionHandler(dataCollo); return this; } public MtbColt setDataCollo(LocalDate dataCollo) { - this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH); + this.dataCollo = dataCollo; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java index 51ad1be9..13d0b37c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java @@ -4,7 +4,6 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.util.Date; -import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.core.utility.UtilityString; @@ -306,7 +305,7 @@ public class MvwSitArtUdcDetInventario { return new MtbColr() .setCodJcom(getCodJcom()) .setCodMart(getCodMart()) - .setDataCollo(UtilityDate.toDate(getDataCollo())) + .setDataCollo(getDataCollo()) .setNumCollo(getNumCollo()) .setSerCollo(getSerCollo()) .setGestione(getGestione()) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index 9ff820df..0a50b960 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -11,6 +11,7 @@ import org.jetbrains.annotations.NotNull; import java.lang.reflect.Type; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -160,11 +161,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { mtbColrClone .setNumCollo(null) - .setDataCollo((String) null) + .setDataCollo((LocalDate) null) .setRiga(null) .setGestione(GestioneEnum.LAVORAZIONE) - .setDataColloRif(sourceMtbColt.getDataColloD()) + .setDataColloRif(sourceMtbColt.getDataColloLD()) .setNumColloRif(sourceMtbColt.getNumCollo()) .setGestioneRif(sourceMtbColt.getGestione()) .setSerColloRif(sourceMtbColt.getSerCollo()) @@ -214,10 +215,10 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { MtbColr mtbColrClone = new MtbColr(); mtbColrClone .setNumCollo(null) - .setDataCollo((String) null) + .setDataCollo((LocalDate) null) .setRiga(null) .setGestione(GestioneEnum.LAVORAZIONE) - .setDataColloRif(sourceMtbColt.getDataColloD()) + .setDataColloRif(sourceMtbColt.getDataColloLD()) .setNumColloRif(sourceMtbColt.getNumCollo()) .setGestioneRif(sourceMtbColt.getGestione()) .setSerColloRif(sourceMtbColt.getSerCollo()) @@ -372,7 +373,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { mtbColr.setGestione(mtbColt.getGestione()); mtbColr.setSerCollo(mtbColt.getSerCollo()); mtbColr.setNumCollo(mtbColt.getNumCollo()); - mtbColr.setDataCollo(mtbColt.getDataColloS()); + mtbColr.setDataCollo(mtbColt.getDataColloLD()); } } @@ -408,7 +409,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { } } - public MtbColt getByChiaveColloSynchronized(GestioneEnum gestione, int numCollo, String dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull) throws Exception { + public MtbColt getByChiaveColloSynchronized(GestioneEnum gestione, int numCollo, LocalDate dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull) throws Exception { MtbColt mtbColtToRetrieve = new MtbColt() .setGestione(gestione) .setNumCollo(numCollo) @@ -418,7 +419,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { return getByTestataSynchronized(mtbColtToRetrieve, onlyResiduo, throwExcIfNull); } - public void getByChiaveCollo(GestioneEnum gestione, int numCollo, String dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs onComplete, RunnableArgs onFailed) { + public void getByChiaveCollo(GestioneEnum gestione, int numCollo, LocalDate dataCollo, String serCollo, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs onComplete, RunnableArgs onFailed) { MtbColt mtbColtToRetrieve = new MtbColt() .setGestione(gestione) .setNumCollo(numCollo) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/services/inventario/InventarioService.java b/app/src/main/java/it/integry/integrywmsnative/core/services/inventario/InventarioService.java index 55402a93..587147a6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/services/inventario/InventarioService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/services/inventario/InventarioService.java @@ -16,7 +16,6 @@ import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario; import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer; -import it.integry.integrywmsnative.core.utility.UtilityDate; @Singleton public class InventarioService { @@ -48,7 +47,7 @@ public class InventarioService { MtbColt mtbColt = new MtbColt(); mtbColt.setGestione(inventario.getGestione()); - mtbColt.setDataCollo(UtilityDate.toDate(inventario.getDataCollo())); + mtbColt.setDataCollo(inventario.getDataCollo()); mtbColt.setSerCollo(inventario.getSerCollo()); mtbColt.setNumCollo(inventario.getNumCollo()); mtbColt.setSegno(inventario.getSegno()); @@ -71,7 +70,7 @@ public class InventarioService { MtbColr mtbColr = new MtbColr(); mtbColr.setGestione(inventario.getGestione()); - mtbColr.setDataCollo(UtilityDate.toDate(inventario.getDataCollo())); + mtbColr.setDataCollo(inventario.getDataCollo()); mtbColr.setSerCollo(inventario.getSerCollo()); mtbColr.setNumCollo(inventario.getNumCollo()); mtbColr.setCodMart(inventario.getCodMart()); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java index 20ff7fc9..376b2d78 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java @@ -41,6 +41,19 @@ public class UtilityDate { public static final String DM_HUMAN = "dd MMM"; public static final String DMY_HUMAN = "dd MMM yyyy"; public static final String DMY_HUMAN_LONG = "dd MMMM yyyy"; + + + + + public static final DateTimeFormatter DATE_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(DMY_SLASH) + .withZone(ZoneId.systemDefault()); + + + public static final DateTimeFormatter DATETIME_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(DMY_TIME_SLASH) + .withZone(ZoneId.systemDefault()); + + public static final DateTimeFormatter DATE_DMY_HUMAN_FORMATTER = DateTimeFormatter.ofPattern(DMY_HUMAN_LONG) + .withZone(ZoneId.systemDefault()); } public static Date recognizeDateWithExceptionHandler(String dateString) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index e6fd8d5e..64a971cb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -575,7 +575,7 @@ public class PickingLiberoViewModel { MtbColt sourceMtbColt = new MtbColt() .setNumCollo(mtbColr.getNumCollo()) .setGestione(mtbColr.getGestione()) - .setDataCollo(mtbColr.getDataColloD()) + .setDataCollo(mtbColr.getDataColloLD()) .setSerCollo(mtbColr.getSerCollo()) .setMtbColr(new ObservableArrayList<>()); @@ -695,7 +695,7 @@ public class PickingLiberoViewModel { MtbColt mtbColt = mColliMagazzinoRESTConsumer.getByChiaveColloSynchronized( mtbColr.getGestioneRifEnum(), mtbColr.getNumColloRif(), - mtbColr.getDataColloRifS(), + mtbColr.getDataColloRifLD(), mtbColr.getSerColloRif(), true, false); 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 908b6d88..3f1b1670 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 @@ -565,7 +565,7 @@ public class PickingResiViewModel { .setSerColloRif(UtilityString.empty2null(mtbColrToDispatch.getSerCollo())) .setNumColloRif(mtbColrToDispatch.getNumCollo()) .setGestioneRif(UtilityString.empty2null(mtbColrToDispatch.getGestione())) - .setDataColloRif(UtilityString.empty2null(mtbColrToDispatch.getDataColloS())); + .setDataColloRif(mtbColrToDispatch.getDataColloLD()); if (mtbColrToDispatch.getPesoNettoKg() != null) { @@ -608,7 +608,7 @@ public class PickingResiViewModel { this.mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> { mtbColr - .setDataCollo(value.getDataColloS()) + .setDataCollo(value.getDataColloLD()) .setNumCollo(value.getNumCollo()) .setGestione(value.getGestione()) .setSerCollo(value.getSerCollo()) @@ -634,7 +634,7 @@ public class PickingResiViewModel { MtbColt mtbColt = new MtbColt() .setNumCollo(mtbColrToUpdate.getNumCollo()) - .setDataCollo(mtbColrToUpdate.getDataColloS()) + .setDataCollo(mtbColrToUpdate.getDataColloLD()) .setSerCollo(mtbColrToUpdate.getSerCollo()) .setGestione(mtbColrToUpdate.getGestione()) .setMtbColr(new ObservableArrayList<>()); @@ -682,7 +682,7 @@ public class PickingResiViewModel { MtbColt mtbColt = new MtbColt() .setNumCollo(mtbColrToDelete.getNumCollo()) - .setDataCollo(mtbColrToDelete.getDataColloS()) + .setDataCollo(mtbColrToDelete.getDataColloLD()) .setSerCollo(mtbColrToDelete.getSerCollo()) .setGestione(mtbColrToDelete.getGestione()) .setMtbColr(new ObservableArrayList<>()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java index 592f3282..1f117c12 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java @@ -371,7 +371,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements public void deleteMtbColr(MtbColr mtbColr) { MtbColt mtbColt = new MtbColt() .setGestione(mtbColr.getGestione()) - .setDataCollo(mtbColr.getDataColloS()) + .setDataCollo(mtbColr.getDataColloLD()) .setSerCollo(mtbColr.getSerCollo()) .setNumCollo(mtbColr.getNumCollo()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java index 33d9b1cd..3ec93243 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/rest/ProdRientroMerceOrderDetailRESTConsumer.java @@ -68,7 +68,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer { mtbColrList) { HashMap parm = new HashMap<>(); - parm.put("data_collo", mtbcolr.getDataColloD()); + parm.put("data_collo", mtbcolr.getDataColloLD()); parm.put("gestione", mtbcolr.getGestione()); parm.put("ser_collo", mtbcolr.getSerCollo()); parm.put("num_collo", mtbcolr.getNumCollo()); @@ -90,7 +90,7 @@ public class ProdRientroMerceOrderDetailRESTConsumer extends _BaseRESTConsumer { ObservableArrayList mtbColrsRoAdd = new ObservableArrayList<>(); mtbColrsRoAdd.addAll(Stream.of(mtbColrList) .filter(x -> x.getNumCollo().equals(mtbColt.getNumCollo()) && - x.getDataColloD().compareTo(mtbColt.getDataColloD()) == 0 && + x.getDataColloLD().isEqual(mtbColt.getDataColloLD()) && x.getGestione().equals(mtbColt.getGestione()) && x.getSerCollo().equals(mtbColt.getSerCollo())) .toList()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index 36cc1223..55cf838a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -366,7 +366,7 @@ public class RettificaGiacenzeViewModel { mtbColr .setQtaCol(BigDecimal.ZERO) .setNumCnf(BigDecimal.ZERO) - .setDataCollo(mCurrentMtbColt.getDataColloS()) + .setDataCollo(mCurrentMtbColt.getDataColloLD()) .setNumCollo(mCurrentMtbColt.getNumCollo()) .setGestione(mCurrentMtbColt.getGestione()) .setSerCollo(mCurrentMtbColt.getSerCollo()); 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 ef5e82aa..a133cffc 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 @@ -860,7 +860,7 @@ public class SpedizioneViewModel { if (pickingObjectDTO.getMtbColts().stream() .anyMatch(x -> Objects.equals(x.getNumCollo(), scannedUL.getNumCollo()) && - x.getDataColloS().equals(scannedUL.getDataColloS()) && + x.getDataColloLD().isEqual(scannedUL.getDataColloLD()) && x.getSerCollo().equalsIgnoreCase(scannedUL.getSerCollo()) && (scannedUL.getGestioneEnum() == GestioneEnum.ACQUISTO || scannedUL.getGestioneEnum() == GestioneEnum.LAVORAZIONE))) { @@ -874,7 +874,10 @@ public class SpedizioneViewModel { for (PickingObjectDTO pickingObject : pickingList) { //Da verificare se il controllo per partita deve essere sempre effettuato - if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) && UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) && (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) { + if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) && + UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) && + UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) && + (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) { if (!matchPickingObject.contains(pickingObject)) { matchPickingObject.add(pickingObject); @@ -1467,7 +1470,7 @@ public class SpedizioneViewModel { private MtbColt loadRifULFromMtbColr(MtbColr mtbColr) throws Exception { //Se ho dei riferimenti ad una UL devo leggere la QTA ancora disponibile sulla Ul if (mtbColr != null && !UtilityString.isNullOrEmpty(mtbColr.getGestioneRif()) && !UtilityString.isNullOrEmpty(mtbColr.getSerColloRif()) && !UtilityString.isNullOrEmpty(mtbColr.getDataColloRifS()) && mtbColr.getNumColloRif() != null) { - return mColliMagazzinoRESTConsumer.getByChiaveColloSynchronized(mtbColr.getGestioneRifEnum(), mtbColr.getNumColloRif(), mtbColr.getDataColloRifS(), mtbColr.getSerColloRif(), true, false); + return mColliMagazzinoRESTConsumer.getByChiaveColloSynchronized(mtbColr.getGestioneRifEnum(), mtbColr.getNumColloRif(), mtbColr.getDataColloRifLD(), mtbColr.getSerColloRif(), true, false); } return null; } @@ -1581,7 +1584,7 @@ public class SpedizioneViewModel { } refMtbColr.setNumCollo(refMtbColt.getNumCollo()) - .setDataCollo(refMtbColt.getDataColloS()) + .setDataCollo(refMtbColt.getDataColloLD()) .setSerCollo(refMtbColt.getSerCollo()) .setGestione(refMtbColt.getGestione()); } @@ -2021,7 +2024,7 @@ public class SpedizioneViewModel { cloneMtbColr.setRiga(null) .setNumCollo(null) .setGestione((String) null) - .setDataCollo((String) null) + .setDataCollo((LocalDate) null) .setSerCollo(null) .setCausale(MtbColr.Causale.VERSAMENTO); @@ -2080,7 +2083,7 @@ public class SpedizioneViewModel { Optional optionalMtbColrReference = pickingObjectDTO.getMtbColts().stream() .filter(y -> withdrawMtbColr.getRefMtbColr() != null && withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) && - withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) && + withdrawMtbColr.getRefMtbColr().getDataColloLD().isEqual(y.getDataColloLD()) && withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) && withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) && UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && !y.getMtbColr().isEmpty() ? y.getMtbColr().get(0).getCodMart() : null) &&