diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0248de72..e72614ee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/ServiceRESTResponse.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/model/ServiceRESTResponse.java index e8e8b0bb..1b882bd2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/model/ServiceRESTResponse.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/model/ServiceRESTResponse.java @@ -5,6 +5,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import it.integry.integrywmsnative.core.utility.UtilityDate; + /** * Created by GiuseppeS on 06/03/2018. */ @@ -25,12 +27,7 @@ public class ServiceRESTResponse { } public Date getExecDate() { - try { - return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(execDate); - } catch (Exception e) { - e.printStackTrace(); - } - return null; + return UtilityDate.recognizeDateWithExceptionHandler(execDate); } public String getProfileDB() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDocr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDocr.java index 57a14c49..02cc2c27 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDocr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDocr.java @@ -139,6 +139,8 @@ public class DtbDocr { private int rigaKit; + private MtbAart mtbAart; + public String getCodAnag() { return codAnag; } @@ -736,4 +738,13 @@ public class DtbDocr { this.rigaKit = rigaKit; return this; } + + public MtbAart getMtbAart() { + return mtbAart; + } + + public DtbDocr setMtbAart(MtbAart mtbAart) { + this.mtbAart = mtbAart; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java index 059eeb96..30d23566 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java @@ -4,6 +4,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import it.integry.integrywmsnative.core.utility.UtilityDate; + public class FiltroOrdineDTO { private String gestioneOrd; @@ -24,9 +26,8 @@ public class FiltroOrdineDTO { return dataOrd; } - public Date getDataOrdD() throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDataOrdS()); + public Date getDataOrdD() { + return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS()); } public FiltroOrdineDTO setDataOrd(String dataOrd) { @@ -35,8 +36,7 @@ public class FiltroOrdineDTO { } public FiltroOrdineDTO setDataOrd(Date dataOrd) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataOrd = sdf.format(dataOrd); + this.dataOrd = UtilityDate.formatDate(dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } @@ -44,13 +44,8 @@ public class FiltroOrdineDTO { return dataCons; } - public Date getDataConsD() throws ParseException { - try { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDataConsS()); - } catch (Exception ex) { - return null; - } + public Date getDataConsD() { + return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS()); } public FiltroOrdineDTO setDataCons(String dataCons) { @@ -60,8 +55,7 @@ public class FiltroOrdineDTO { public FiltroOrdineDTO setDataCons(Date dataCons) { if(dataCons != null) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataCons = sdf.format(dataCons); + this.dataCons = UtilityDate.formatDate(dataCons, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); } return this; } 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 ce33c4d3..705ef07c 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 @@ -9,6 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; +import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityString; @@ -266,13 +267,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public Date getDataColloD() { - try{ - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDataColloS()); - } catch (ParseException pex){ - UtilityLogger.errorMe(pex); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS()); } public MtbColr setDataCollo(String dataCollo) { @@ -376,13 +371,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public Date getDataOrdD() { - try{ - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDataOrdS()); - } catch (ParseException pex){ - UtilityLogger.errorMe(pex); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS()); } public MtbColr setDataOrd(String dataOrd) { @@ -391,8 +380,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public MtbColr setDataOrd(Date dataOrd) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataOrd = sdf.format(dataOrd); + this.dataOrd = UtilityDate.formatDate(dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } @@ -401,13 +389,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public Date getDataColloRifD() { - try{ - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDataColloRifS()); - } catch (ParseException pex){ - UtilityLogger.errorMe(pex); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataColloRifS()); } public MtbColr setDataColloRif(String dataColloRif) { @@ -416,8 +398,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public MtbColr setDataColloRif(Date dataColloRif) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataColloRif = sdf.format(dataColloRif); + this.dataColloRif = UtilityDate.formatDate(dataColloRif, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } @@ -473,9 +454,8 @@ public class MtbColr extends EntityBase implements Parcelable { return datetimeRow; } - public Date getDatetimeRowD() throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDatetimeRowS()); + public Date getDatetimeRowD() { + return UtilityDate.recognizeDateWithExceptionHandler(getDatetimeRowS()); } public MtbColr setDatetimeRow(String datetimeRow) { @@ -484,8 +464,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public MtbColr setDatetimeRow(Date datetimeRow) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.datetimeRow = sdf.format(datetimeRow); + this.datetimeRow = UtilityDate.formatDate(datetimeRow, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } @@ -542,15 +521,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public Date getDataScadPartitaD() { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - try { - if(!UtilityString.isNullOrEmpty(getDataScadPartitaS())) - return sdf.parse(getDataScadPartitaS()); - else return null; - } catch (Exception ex) { - UtilityLogger.errorMe(ex); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataScadPartitaS()); } public MtbColr setDataScadPartita(String dataScadPartita) { @@ -559,10 +530,7 @@ public class MtbColr extends EntityBase implements Parcelable { } public MtbColr setDataScadPartita(Date dataScadPartita) { - if(dataScadPartita != null) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataScadPartita = sdf.format(dataScadPartita); - } else this.dataScadPartita = null; + this.dataScadPartita = UtilityDate.formatDate(dataScadPartita, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java index 6b029f90..7704c36c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java @@ -4,6 +4,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import it.integry.integrywmsnative.core.settings.SettingsManager; +import it.integry.integrywmsnative.core.utility.UtilityDate; public class MtbCols extends EntityBase { @@ -22,7 +23,7 @@ public class MtbCols extends EntityBase { type = "mtb_cols"; setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()); setModificatoDa(SettingsManager.i().user.fullname); - setDataMove(new Date()); + setDataMove(UtilityDate.getDateInstance()); } public String getDataCollo() { @@ -89,8 +90,7 @@ public class MtbCols extends EntityBase { } public MtbCols setDataMove(Date dataMove) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataMove = sdf.format(dataMove); + this.dataMove = UtilityDate.formatDate(dataMove, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); 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 ef7a5dc5..9503f75c 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 @@ -76,8 +76,7 @@ public class MtbColt extends EntityBase { Date dateOrd = UtilityDate.recognizeDate(this.dataOrd); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd"); - String dateYMD = sdf.format(dateOrd); + String dateYMD = UtilityDate.formatDate(dateOrd, UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH); this.filtroOrdini = "" + this.gestione + "" + dateYMD + "" + this.numOrd + ""; } @@ -97,14 +96,14 @@ public class MtbColt extends EntityBase { public MtbColt(){ type = "mtb_colt"; - setDataCollo(new Date()); + setDataCollo(UtilityDate.getDateInstance()); setSerCollo("/"); } public void initDefaultFields() { setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()); setPreparatoDa(SettingsManager.i().user.fullname); - setOraInizPrep(new Date()); + setOraInizPrep(UtilityDate.getDateInstance()); setCodAnag(SettingsManager.iDB().getDefaultCodAnag()); } @@ -145,13 +144,7 @@ public class MtbColt extends EntityBase { } public Date getDataColloD() { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - try { - return sdf.parse(getDataColloS()); - } catch (ParseException e) { - UtilityLogger.errorMe(e); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS()); } public MtbColt setDataCollo(String dataCollo) { @@ -160,8 +153,7 @@ public class MtbColt extends EntityBase { } public MtbColt setDataCollo(Date dataCollo) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataCollo = sdf.format(dataCollo); + this.dataCollo = UtilityDate.formatDate(dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } @@ -328,10 +320,7 @@ public class MtbColt extends EntityBase { } public MtbColt setDataOrdD(Date dataOrd) { - if(dataOrd != null) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.dataOrd = sdf.format(dataOrd); - } else this.dataOrd = null; + this.dataOrd = UtilityDate.formatDate(dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } @@ -354,8 +343,7 @@ public class MtbColt extends EntityBase { } public MtbColt setOraInizPrep(Date oraInizPrep) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.oraInizPrep = sdf.format(oraInizPrep); + this.oraInizPrep = UtilityDate.formatDate(oraInizPrep, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } @@ -369,8 +357,7 @@ public class MtbColt extends EntityBase { } public MtbColt setOraFinePrep(Date oraFinePrep) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - this.oraFinePrep = sdf.format(oraFinePrep); + this.oraFinePrep = UtilityDate.formatDate(oraFinePrep, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH); return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index 615ff2e3..88a572ac 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -16,7 +16,7 @@ public class UtilityBarcode { } public static boolean isEtichettaAnonimaOfCurrentYear(String barcode) { - Calendar calendar = Calendar.getInstance(); + Calendar calendar = UtilityDate.getCalendarInstance(); int currentYear = calendar.get(Calendar.YEAR); String fullYear = "20" + UtilityBarcode.getAnnoColloFromULAnonima(barcode); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java index ef3861b9..c80cc30e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDB.java @@ -7,7 +7,6 @@ public class UtilityDB { public static String valueToString(Object value) { String valueString; - SimpleDateFormat dateFormatFile = new SimpleDateFormat("yyyy-MM-dd"); if (value == null) { valueString = "NULL"; @@ -22,7 +21,8 @@ public class UtilityDB { valueString = "'" + valueString.replaceAll("'","''") + "'"; } } else if (value instanceof Date){ - valueString = "'" + dateFormatFile.format(value) + "'"; + + valueString = "'" + UtilityDate.formatDate((Date) value, UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH) + "'"; } else if (value instanceof Integer) { } else { 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 73fc5a39..5aee048c 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 @@ -2,7 +2,10 @@ package it.integry.integrywmsnative.core.utility; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.util.Calendar; import java.util.Date; +import java.util.TimeZone; import it.integry.integrywmsnative.core.exception.DateNotRecognizedException; import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException; @@ -16,8 +19,9 @@ public class UtilityDate { public static class COMMONS_DATE_FORMATS { public static final String DMY_SLASH = "dd/MM/yyyy"; public static final String YMD_SLASH = "yyyy/MM/dd"; - public static final String DMY_TIME_SLASH = DMY_SLASH + " hh:mm"; - public static final String YMD_TIME_SLASH = YMD_SLASH + " hh:mm"; + public static final String YMD_DASH = "yyyy-MM-dd"; + public static final String DMY_TIME_SLASH = DMY_SLASH + " hh:mm:ss"; + public static final String YMD_TIME_SLASH = YMD_SLASH + " hh:mm:ss"; public static final String DM_HUMAN = "dd MMM"; @@ -74,11 +78,27 @@ public class UtilityDate { format = new SimpleDateFormat(dateFormatString); } + format.setTimeZone(TimeZone.getTimeZone("Europe/Rome")); + return format.parse(dateString); } public static String formatDate(Date dateToFormat, String format) { - return new SimpleDateFormat(format).format(dateToFormat); + if(dateToFormat != null) { + SimpleDateFormat sdf = new SimpleDateFormat(format); + sdf.setTimeZone(TimeZone.getTimeZone("Europe/Rome")); + return sdf.format(dateToFormat); + } + else return null; + } + + + public static Date getDateInstance() { + return getCalendarInstance().getTime(); + } + + public static Calendar getCalendarInstance() { + return Calendar.getInstance(TimeZone.getTimeZone("Europe/Rome")); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index 6c379f4d..2e4317d5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -55,8 +55,7 @@ public class UtilityLogger { String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : SettingsManager.i().userSession.profileDB; message = message.replace("#azienda_nome#", currentAzienda); - SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy HH:mm:ss"); - message = message.replace("#current_date#", sdf.format(new Date())); + message = message.replace("#current_date#", UtilityDate.formatDate(UtilityDate.getDateInstance(), UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)); SystemRESTConsumer.sendErrorLogMail(message, onComplete, onFailed); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java index 855b54a2..1dcf6003 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java @@ -13,6 +13,7 @@ import java.util.List; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; +import it.integry.integrywmsnative.core.utility.UtilityDate; /** * Created by GiuseppeS on 06/03/2018. @@ -138,17 +139,12 @@ public class OrdineAccettazioneDTO implements Parcelable { return dataCons; } - public Date getDataOrd() { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - Date dataOrd = null; + public String getDataOrdS() { + return this.dataOrd; + } - try{ - dataOrd = sdf.parse(this.dataOrd); - } catch (Exception ex) { - Log.e("Parsing date", ex.getMessage()); - } - - return dataOrd; + public Date getDataOrdD() { + return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java index b13e0536..87593149 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java @@ -15,6 +15,7 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoListViewModel; @@ -299,8 +300,6 @@ public class AccettazioneOrdineInevasoHelper { BigDecimal currentQtaEvasa = item.getQtaRiservate().add(item.getQtaEvasa()); if(mtbColrs != null) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - List filteredMtbColrs = Stream.of(mtbColrs) .filter(x -> x.getNumOrd() != null) .filter( @@ -308,7 +307,7 @@ public class AccettazioneOrdineInevasoHelper { (x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.codJcom)) && x.getRigaOrd() == item.rigaOrd && x.getNumOrd() == item.numOrd && - x.getDataOrdS().equals(sdf.format(item.getDataOrd()))).toList(); + x.getDataOrdS().equals(UtilityDate.formatDate(item.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH))).toList(); for (MtbColr mtbColr : filteredMtbColrs) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java index a83bc2cc..008aafd9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java @@ -203,7 +203,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC List foundRows = Stream.of(groupedOrdini) .filter(x -> x.getNumOrd() == currentMtbColr.getNumOrd() && x.getRigaOrd() == currentMtbColr.getRigaOrd()&& - x.getDataOrd().equals(currentMtbColr.getDataOrdD())) + x.getDataOrdD().equals(currentMtbColr.getDataOrdD())) .toList(); */ @@ -657,7 +657,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC MtbColt cloneMtbColt = (MtbColt) getColloRef().clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); - cloneMtbColt.setOraFinePrep(new Date()); + cloneMtbColt.setOraFinePrep(UtilityDate.getDateInstance()); ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback() { @@ -792,7 +792,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC x.getMtbAart().getCodMart().equalsIgnoreCase(currentRow.getCodMart()) && x.getCodJcom().equalsIgnoreCase(currentRow.getCodJcom()) && x.getRigaOrd() == currentRow.getRigaOrd() && - x.getDataOrd().equals(currentRow.getDataOrdD()) && + x.getDataOrdD().equals(currentRow.getDataOrdD()) && x.getNumOrd() == currentRow.getNumOrd() ) .forEach(x -> x.setQtaRiservate(x.getQtaRiservate().add(currentRow.getQtaCol()))); @@ -912,7 +912,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC .setQtaCol(quantityDTO.qtaTot.getBigDecimal()) .setDescrizione(item.getDescrizioneEstesa()) .setNumOrd(item.getNumOrd()) - .setDataOrd(item.getDataOrd()) + .setDataOrd(item.getDataOrdD()) .setGestioneRif(gestioneRif) .setCodJcom(item.getCodJcom()) .setRigaOrd(item.getRigaOrd()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 56b49503..1b50d8e6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -545,7 +545,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { .setQtaCol(quantityDTO.qtaTot.getBigDecimal()) .setQtaCnf(quantityDTO.qtaCnf.getBigDecimal()) .setNumCnf(quantityDTO.numCnf.getBigDecimal()) - .setDatetimeRow(new Date()); + .setDatetimeRow(UtilityDate.getDateInstance()); onComplete.run(mtbColr); }, onAbort).show(); @@ -688,7 +688,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { MtbColt cloneMtbColt = (MtbColt) this.mtbColt.get().clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); - cloneMtbColt.setOraFinePrep(new Date()); + cloneMtbColt.setOraFinePrep(UtilityDate.getDateInstance()); ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback() { @@ -741,7 +741,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { mtbColrToDeleteClone .setRiga(null) - .setDatetimeRow(new Date()) + .setDatetimeRow(UtilityDate.getDateInstance()) .setQtaCol(mtbColrToDeleteClone.getQtaCol().multiply(new BigDecimal(-1))) .setOperation(CommonModelConsts.OPERATION.DELETE); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java new file mode 100644 index 00000000..b8142a5f --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -0,0 +1,324 @@ +package it.integry.integrywmsnative.gest.picking_resi; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableField; +import androidx.recyclerview.widget.LinearLayoutManager; + +import android.app.ProgressDialog; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.text.SpannableString; + +import com.annimon.stream.Stream; +import com.tfb.fbtoast.FBToast; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; +import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; +import it.integry.integrywmsnative.core.data_cache.DataCache; +import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; +import it.integry.integrywmsnative.core.model.CommonModelConsts; +import it.integry.integrywmsnative.core.model.DtbDocr; +import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.model.MtbColt; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityProgress; +import it.integry.integrywmsnative.core.utility.UtilityString; +import it.integry.integrywmsnative.databinding.ActivityPickingResiBinding; +import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; +import it.integry.integrywmsnative.gest.picking_resi.core.PickingResiListAdapter; +import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; +import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; + +public class PickingResiActivity extends AppCompatActivity { + + private List mDocumentiResiList; + private List mDtbDocrList; + + private HashMap> mWithdrawRows = new HashMap<>(); + + private ActivityPickingResiBinding mBinding; + + public ObservableField currentMtbColt = new ObservableField<>(); + + private int barcodeScannerIstanceID = -1; + + private String mDefaultGestioneOfUL; + private String mDefaultCodAnagOfUL; + private String mDefaultCodMDepOfUL; + + public static void startActivity(Context context, List documentoResoDTOList) { + String consegneCacheKey = DataCache.addItem(documentoResoDTOList); + + Intent intent = new Intent(context, PickingResiActivity.class); + intent.putExtra("key", consegneCacheKey); + context.startActivity(intent); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mBinding = DataBindingUtil.setContentView(this, R.layout.activity_picking_resi); + mBinding.setViewmodel(this); + + mDocumentiResiList = DataCache.retrieveItem(getIntent().getStringExtra("key")); + + this.initView(); + + + } + + @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + return true; + } + + @Override + public void onBackPressed() { +// if(mArticoliInColloBottomSheetViewModel.isExpanded()){ +// mArticoliInColloBottomSheetViewModel.collapse(); +// } else if(mVenditaOrdineInevasoViewModel.thereIsAnOpenedUL()) { +// mArticoliInColloBottomSheetViewModel.closeCurrentUL(() -> { +// BarcodeManager.removeCallback(barcodeScannerIstanceID); +// super.onBackPressed(); +// }); +// +// } else { + BarcodeManager.removeCallback(barcodeScannerIstanceID); + super.onBackPressed(); +// } + } + + private void initView() { + barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() + .setOnScanSuccessfull(this::onScanSuccessful) + .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false))); + + + setSupportActionBar(this.mBinding.toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + this.mBinding.elevatedToolbar.setRecyclerView(this.mBinding.mainList); + + ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(this); + UltimeConsegneClienteRESTConsumer.loadDocRowFromConsegna(mDocumentiResiList, dtbDocrToPick -> { + progressDialog.dismiss(); + this.mDtbDocrList = dtbDocrToPick; + + try { + this.initDatiPicking(); + } catch (Exception ex) { + this.showErrorDialog(ex.getMessage()); + } + + this.initList(dtbDocrToPick); + }, ex -> { + UtilityExceptions.defaultException(this, ex, progressDialog); + }); + } + + private void initList(List dtbDocrList) { + + PickingResiListAdapter adapter = new PickingResiListAdapter(this, dtbDocrList); + adapter.setOnItemClicked(this::onOrdineRowDispatch); + + this.mBinding.mainList.setLayoutManager(new LinearLayoutManager(this)); + this.mBinding.mainList.setAdapter(adapter); + } + + private void initDatiPicking() throws Exception { + List foundGestioni = Stream.of(this.mDocumentiResiList) + .map(DocumentoResoDTO::getGestione) + .distinct() + .toList(); + + if(foundGestioni.size() > 1) { + throw new Exception("Sono stati caricati documenti con diverse gestioni"); + } else mDefaultGestioneOfUL = foundGestioni.get(0); + + + List foundCodAnags = Stream.of(this.mDocumentiResiList) + .map(DocumentoResoDTO::getCodAnag) + .distinct() + .toList(); + + if(foundCodAnags.size() > 1) { + throw new Exception("Sono stati caricati documenti con diversi codici anagrafici"); + } else mDefaultCodAnagOfUL = foundCodAnags.get(0); + + + List foundCodMdeps = Stream.of(this.mDocumentiResiList) + .map(DocumentoResoDTO::getCodMdep) + .distinct() + .toList(); + + if(foundCodMdeps.size() > 1) { + throw new Exception("Sono stati caricati documenti con diversi codici deposito"); + } else mDefaultCodMDepOfUL = foundCodMdeps.get(0); + + + for (DtbDocr dtbDocr : mDtbDocrList) { + this.mWithdrawRows.put(dtbDocr, new ArrayList<>()); + } + } + + + + + private void onScanSuccessful(BarcodeScanDTO data) { + + } + + public void createNewUL() { + this.createNewUL(null, null, null, false, true, null); + } + + public void createNewUL(Integer customNumCollo, String customSerCollo, ProgressDialog progress, boolean disablePrint, boolean closeProgress, Runnable onComplete) { + this.mBinding.mainFab.close(true); + + if (progress == null){ + progress = UtilityProgress.createDefaultProgressDialog(this); + } + + MtbColt mtbColt = new MtbColt(); + mtbColt.initDefaultFields(); + mtbColt .setGestione(mDefaultGestioneOfUL) + .setSegno(+1) + .setCodAnag(mDefaultCodAnagOfUL) + .setCodMdep(mDefaultCodMDepOfUL) + .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + + + if(customNumCollo != null) { + mtbColt.setNumCollo(customNumCollo); + } + + if(!UtilityString.isNullOrEmpty(customSerCollo)) { + mtbColt.setSerCollo(customSerCollo); + } + + + ProgressDialog finalProgress = progress; + ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> { + + value.setDisablePrint(disablePrint); + + setULToCurrentContext(value); + + if(closeProgress) finalProgress.dismiss(); + + FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + + if(onComplete != null) onComplete.run(); + + }, ex -> { + UtilityExceptions.defaultException(this, ex, finalProgress); + }); + + } + + private void setULToCurrentContext(MtbColt mtbColt){ + if(mtbColt != null && mtbColt.getMtbColr() == null) { + mtbColt.setMtbColr(new ObservableArrayList<>()); + } + + this.currentMtbColt.set(mtbColt); + } + + + + + public void onOrdineRowDispatch(final DtbDocr item) { + if(currentMtbColt.get() != null){ + + List currentMtbColrs = mWithdrawRows.get(item); + + BigDecimal qtaEvasaTotaleInMtbColr = BigDecimal.ZERO; + for (MtbColr mtbColr : currentMtbColrs) { + qtaEvasaTotaleInMtbColr.add(mtbColr.getQtaCol()); + } + + BigDecimal qtaDaEvadere = item.getQtaDoc().subtract(qtaEvasaTotaleInMtbColr); + if(qtaDaEvadere.floatValue() < 0) qtaDaEvadere = BigDecimal.ZERO; + + DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO() + .setBatchLot(item.getPartitaMag()) + .setCodArtFor(item.getCodArtFor()) + .setMtbAart(item.getMtbAart()) + .setQtaDisponibile(qtaDaEvadere) + .setQtaTot(qtaDaEvadere) + .setQtaEvasa(qtaEvasaTotaleInMtbColr) + .setCanPartitaMagBeChanged(false) + .setMaxQta(qtaDaEvadere); + +// if(item.getTempPickData() != null) { +// PickingObjectDTO.PickData tmpPickData = item.getTempPickData(); +// +// if(!UtilityString.isNullOrEmpty(tmpPickData.getBatchLot())) { +// dto.setBatchLot(tmpPickData.getBatchLot()); +// } +// +// if(tmpPickData.getDataScad() != null){ +// dto.setDataScad(tmpPickData.getDataScad()); +// dto.setShouldAskDataScad(true); +// } +// +// boolean useQtaDaEvadere; +// +// if(tmpPickData.getQtaTot() != null) { +// useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa(); +// if(useQtaDaEvadere){ +// dto.setQtaTot(qtaDaEvadere); +// dto.setMaxQta(qtaDaEvadere); +// } else { +// dto.setQtaTot(tmpPickData.getQtaTot()); +// dto.setMaxQta(tmpPickData.getQtaTot()); +// dto.setQtaCnf(tmpPickData.getQtaTot()); +// } +// +// +// if (tmpPickData.getQtaCnf() != null && useQtaDaEvadere) { +// dto.setQtaCnf(tmpPickData.getQtaCnf()); +// } +// } +// +// +// if(dto.getQtaTot() != null && dto.getQtaTot().floatValue() > 0 && dto.getQtaCnf() != null && dto.getQtaCnf().floatValue() > 0) { +// dto.setNumCnf(dto.getQtaTot().divide(dto.getQtaCnf()).intValue()); +// } +// +// +// dto.setCanPartitaMagBeChanged(false); +// dto.setCanDataScadBeChanged(false); +// +// } + + DialogInputQuantity.makeBase(this, dto, false, (quantityDTO, closeUL) -> { + //onOrdineRowDispatched(item, quantityDTO, closeUL); + + }, null).show(); + } + } + + + private void showErrorDialog(String message) { + DialogSimpleMessageHelper.makeErrorDialog( + this, + new SpannableString(message), + null, + null).show(); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente_picking/core/UltimeConsegneClientePickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java similarity index 85% rename from app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente_picking/core/UltimeConsegneClientePickingListAdapter.java rename to app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java index 4c74c88f..f91bf7be 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente_picking/core/UltimeConsegneClientePickingListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java @@ -1,20 +1,20 @@ -package it.integry.integrywmsnative.gest.ultime_consegne_cliente_picking.core; +package it.integry.integrywmsnative.gest.picking_resi.core; import android.content.Context; import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.RecyclerView; import com.annimon.stream.Stream; -import com.google.android.gms.common.internal.service.Common; import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.CommonConst; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbDocr; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityNumber; @@ -22,14 +22,14 @@ import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.UltimeConsegneMainListItemBinding; import it.integry.integrywmsnative.databinding.UltimeConsegneMainListItemHeaderBinding; -public class UltimeConsegneClientePickingListAdapter extends SectionedRecyclerViewAdapter { +public class PickingResiListAdapter extends SectionedRecyclerViewAdapter { private Context mContext; private List mDataset; - private LayoutInflater mInflater; + private RunnableArgs mOnItemClicked; static class SubheaderHolder extends RecyclerView.ViewHolder { @@ -53,14 +53,17 @@ public class UltimeConsegneClientePickingListAdapter extends SectionedRecyclerVi } - public UltimeConsegneClientePickingListAdapter(Context context, List data) { + public PickingResiListAdapter(Context context, List data) { this.mContext = context; - this.mInflater = LayoutInflater.from(context); this.mDataset = Stream.of(data) .sortBy(x -> x.getNumDoc() + " " + x.getDataDocS() + " " + x.getCodDtip() + " " + x.getSerDoc() + " " + x.getCodAnag()) .toList(); } + public void setOnItemClicked(RunnableArgs onItemClicked) { + this.mOnItemClicked = onItemClicked; + } + @Override public SingleItemViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) { UltimeConsegneMainListItemBinding binding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.ultime_consegne_main_list__item, parent, false); @@ -82,6 +85,10 @@ public class UltimeConsegneClientePickingListAdapter extends SectionedRecyclerVi holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(dtbDocr.getQtaDoc())); holder.mBinding.descrizione.setText(UtilityString.isNullOrEmpty(dtbDocr.getDescrizioneEstesa()) ? dtbDocr.getDescrizioneEstesa() : dtbDocr.getDescrizione()); + holder.mBinding.getRoot().setOnClickListener(v -> { + if(this.mOnItemClicked != null) this.mOnItemClicked.run(dtbDocr); + }); + } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index c215370b..d3375d0c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -623,7 +623,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColrToEditClone .setRiga(null) - .setDatetimeRow(new Date()) + .setDatetimeRow(UtilityDate.getDateInstance()) .setQtaCol(value.qtaTot.getBigDecimal().subtract(mtbColrToEditClone.getQtaCol())) .setOperation(CommonModelConsts.OPERATION.INSERT); @@ -658,7 +658,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColrToDeleteClone .setRiga(null) - .setDatetimeRow(new Date()) + .setDatetimeRow(UtilityDate.getDateInstance()) .setQtaCol(mtbColrToDeleteClone.getQtaCol().multiply(new BigDecimal(-1))) .setOperation(CommonModelConsts.OPERATION.INSERT); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java index 79640073..2ddb85a3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java @@ -1,23 +1,25 @@ package it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest; +import com.annimon.stream.Stream; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; +import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbDocr; +import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; -import it.integry.integrywmsnative.core.utility.UtilityString; -import it.integry.integrywmsnative.gest.vendita.rest.model.ConsegnaClienteDTO; +import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; public class UltimeConsegneClienteRESTConsumer { - public static void getUltimeConsegneClienti(String codMdep, String codAnag, String codMart, RunnableArgs> onComplete, RunnableArgs onFailed) { + public static void getUltimeConsegneClienti(String codMdep, String codAnag, String codMart, RunnableArgs> onComplete, RunnableArgs onFailed) { int numberOfConsegnePerCli = 10; int numberOfDayToAnalyze = 90; @@ -35,10 +37,10 @@ public class UltimeConsegneClienteRESTConsumer { " counter_consegna "; - Type typeOfObjectsList = new TypeToken>() {}.getType(); - SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback>() { + Type typeOfObjectsList = new TypeToken>() {}.getType(); + SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback>() { @Override - public void onSuccess(ArrayList value) { + public void onSuccess(ArrayList value) { if(onComplete != null) onComplete.run(value); } @@ -51,7 +53,7 @@ public class UltimeConsegneClienteRESTConsumer { - public static void loadDocRowFromConsegna(List consegne, RunnableArgs> onComplete, RunnableArgs onFailed) { + public static void loadDocRowFromConsegna(List consegne, RunnableArgs> onComplete, RunnableArgs onFailed) { StringBuilder sbWhereCond = new StringBuilder(); for(int i = 0; i < consegne.size(); i++) { @@ -81,8 +83,41 @@ public class UltimeConsegneClienteRESTConsumer { Type typeOfObjectsList = new TypeToken>() {}.getType(); SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback>() { @Override - public void onSuccess(ArrayList value) { - if(onComplete != null) onComplete.run(value); + public void onSuccess(ArrayList values) { + + if(values != null && values.size() > 0){ + List codMarts = Stream.of(values) + .map(DtbDocr::getCodMart) + .withoutNulls() + .distinct() + .toList(); + + ArticoloRESTConsumer.getByCodMart(codMarts, arts -> { + + if(arts != null && arts.size() > 0) { + for (DtbDocr value : values) { + + MtbAart foundMtbAart = null; + + List mtbAartStream = Stream.of(arts) + .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList(); + + if(mtbAartStream != null && mtbAartStream.size() > 0){ + foundMtbAart = mtbAartStream.get(0); + } + + value.setMtbAart(foundMtbAart); + } + + + if(onComplete != null) onComplete.run(values); + } + + }, onFailed); + + } else { + if(onComplete != null) onComplete.run(values); + } } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index 9cfc4e24..abc966a5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -15,15 +15,15 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteBinding; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; -import it.integry.integrywmsnative.gest.ultime_consegne_cliente_picking.UltimeConsegneClientePickingActivity; -import it.integry.integrywmsnative.gest.vendita.rest.model.ConsegnaClienteDTO; +import it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity; +import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; public class UltimeConsegneClienteViewModel { private Context mContext; private FragmentMainUltimeConsegneClienteBinding mBinding; - private List mItems; + private List mItems; public UltimeConsegneClienteViewModel(Context context, FragmentMainUltimeConsegneClienteBinding binding) { this.mContext = context; @@ -56,7 +56,7 @@ public class UltimeConsegneClienteViewModel { }); } - private void initDataAdapter(ArrayList dataset) { + private void initDataAdapter(ArrayList dataset) { UltimeConsegneMainListAdapter adapter = new UltimeConsegneMainListAdapter(mContext, dataset); adapter.setOnSelectionChanged(this::onSingleSelectionChanged); @@ -68,8 +68,8 @@ public class UltimeConsegneClienteViewModel { } - private void onSingleSelectionChanged(ConsegnaClienteDTO dto) { - List selectedOrders = getSelectedItems(); + private void onSingleSelectionChanged(DocumentoResoDTO dto) { + List selectedOrders = getSelectedItems(); if(dto.isSelected()) { Stream.of(selectedOrders) @@ -85,17 +85,17 @@ public class UltimeConsegneClienteViewModel { } } - private List getSelectedItems() { + private List getSelectedItems() { return Stream.of(this.mItems) - .filter(ConsegnaClienteDTO::isSelected) + .filter(DocumentoResoDTO::isSelected) .toList(); } private void dispatchConsegne() { - List selectedConsegne = getSelectedItems(); + List selectedConsegne = getSelectedItems(); - UltimeConsegneClientePickingActivity.startActivity(mContext, selectedConsegne); + PickingResiActivity.startActivity(mContext, selectedConsegne); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java index 5aa3e53a..44e0ec0f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java @@ -17,7 +17,6 @@ import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import java.util.TimeZone; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; @@ -26,16 +25,16 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListHeaderBinding; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListSingleItemBinding; -import it.integry.integrywmsnative.gest.vendita.rest.model.ConsegnaClienteDTO; +import it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider; public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { private Context mContext; - private List mDataset; + private List mDataset; private ArrayList mSectionTitleItems; - private RunnableArgs mOnSelectionChanged; + private RunnableArgs mOnSelectionChanged; private TextDrawable.IShapeBuilder smallIconBuilder; private TextDrawable.IShapeBuilder mediumIconBuilder; @@ -71,19 +70,19 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter< - public UltimeConsegneMainListAdapter(Context context, ArrayList dataset) { + public UltimeConsegneMainListAdapter(Context context, ArrayList dataset) { super(); this.mContext = context; this.mDataset = new ArrayList<>(); this.mSectionTitleItems = new ArrayList<>(); this.mDataset = Stream.of(dataset) - .sortBy(ConsegnaClienteDTO::getRagSoc) + .sortBy(DocumentoResoDTO::getRagSoc) .toList(); Stream.of(mDataset) - .map(ConsegnaClienteDTO::getRagSoc) + .map(DocumentoResoDTO::getRagSoc) .distinct() .forEach(x -> { this.mSectionTitleItems.add(String.valueOf(x.charAt(0))); @@ -142,7 +141,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter< @Override public void onBindItemViewHolder(final SingleItemViewHolder holder, final int position) { - final ConsegnaClienteDTO consegna = this.mDataset.get(position); + final DocumentoResoDTO consegna = this.mDataset.get(position); holder.mBinding.setConsegna(consegna); @@ -163,8 +162,8 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter< } try { - Calendar calendarNow = Calendar.getInstance(TimeZone.getDefault()); - Calendar calendarDataDoc = Calendar.getInstance(TimeZone.getDefault()); + Calendar calendarNow = UtilityDate.getCalendarInstance(); + Calendar calendarDataDoc = UtilityDate.getCalendarInstance(); calendarDataDoc.setTime(consegna.getDataDocD()); String dataDocString = ""; @@ -214,7 +213,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter< } - public void setOnSelectionChanged(RunnableArgs mSelectionChanged) { + public void setOnSelectionChanged(RunnableArgs mSelectionChanged) { this.mOnSelectionChanged = mSelectionChanged; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente_picking/UltimeConsegneClientePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente_picking/UltimeConsegneClientePickingActivity.java deleted file mode 100644 index 6efac956..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente_picking/UltimeConsegneClientePickingActivity.java +++ /dev/null @@ -1,194 +0,0 @@ -package it.integry.integrywmsnative.gest.ultime_consegne_cliente_picking; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; -import androidx.databinding.ObservableArrayList; -import androidx.databinding.ObservableField; -import androidx.recyclerview.widget.LinearLayoutManager; - -import android.app.ProgressDialog; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.LayoutInflater; - -import com.tfb.fbtoast.FBToast; - -import java.util.List; - -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; -import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; -import it.integry.integrywmsnative.core.data_cache.DataCache; -import it.integry.integrywmsnative.core.model.CommonModelConsts; -import it.integry.integrywmsnative.core.model.DtbDocr; -import it.integry.integrywmsnative.core.model.MtbColr; -import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityProgress; -import it.integry.integrywmsnative.databinding.ActivityUltimeConsegneClientePickingBinding; -import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; -import it.integry.integrywmsnative.gest.ultime_consegne_cliente_picking.core.UltimeConsegneClientePickingListAdapter; -import it.integry.integrywmsnative.gest.vendita.rest.model.ConsegnaClienteDTO; -import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; - -public class UltimeConsegneClientePickingActivity extends AppCompatActivity { - - private List consegneToPick; - private List mDtbDocrList; - - private ActivityUltimeConsegneClientePickingBinding mBinding; - - public ObservableField currentMtbColt; - - private int barcodeScannerIstanceID = -1; - - public static void startActivity(Context context, List consegnaClienteDTOList) { - String consegneCacheKey = DataCache.addItem(consegnaClienteDTOList); - - Intent intent = new Intent(context, UltimeConsegneClientePickingActivity.class); - intent.putExtra("key", consegneCacheKey); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mBinding = DataBindingUtil.setContentView(this, R.layout.activity_ultime_consegne_cliente_picking); - mBinding.setViewmodel(this); - - consegneToPick = DataCache.retrieveItem(getIntent().getStringExtra("key")); - - this.initView(); - - this.initDatiPicking(); - - - } - - @Override - public boolean onSupportNavigateUp() { - onBackPressed(); - return true; - } - - @Override - public void onBackPressed() { -// if(mArticoliInColloBottomSheetViewModel.isExpanded()){ -// mArticoliInColloBottomSheetViewModel.collapse(); -// } else if(mVenditaOrdineInevasoViewModel.thereIsAnOpenedUL()) { -// mArticoliInColloBottomSheetViewModel.closeCurrentUL(() -> { -// BarcodeManager.removeCallback(barcodeScannerIstanceID); -// super.onBackPressed(); -// }); -// -// } else { - BarcodeManager.removeCallback(barcodeScannerIstanceID); - super.onBackPressed(); -// } - } - - private void initView() { - barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() - .setOnScanSuccessfull(this::onScanSuccessful) - .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false))); - - - setSupportActionBar(this.mBinding.toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - this.mBinding.elevatedToolbar.setRecyclerView(this.mBinding.mainList); - - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(this); - UltimeConsegneClienteRESTConsumer.loadDocRowFromConsegna(consegneToPick, dtbDocrToPick -> { - progressDialog.dismiss(); - this.initList(dtbDocrToPick); - }, ex -> { - UtilityExceptions.defaultException(this, ex, progressDialog); - }); - } - - private void initList(List dtbDocrList) { - this.mDtbDocrList = dtbDocrList; - - UltimeConsegneClientePickingListAdapter adapter = new UltimeConsegneClientePickingListAdapter(this, dtbDocrList); - - this.mBinding.mainList.setLayoutManager(new LinearLayoutManager(this)); - this.mBinding.mainList.setAdapter(adapter); - } - - private void initDatiPicking() { - - } - - - - - private void onScanSuccessful(BarcodeScanDTO data) { - - } - - public void createNewUL() { - this.createNewUL(null, null, null, false, true, null); - } - - public void createNewUL(Integer customNumCollo, String customSerCollo, ProgressDialog progress, boolean disablePrint, boolean closeProgress, Runnable onComplete) { - this.mBinding.mainFab.close(true); - - if (progress == null){ - progress = UtilityProgress.createDefaultProgressDialog(this); - } - - MtbColt mtbColt = new MtbColt(); - mtbColt.initDefaultFields(); -// mtbColt .setGestione(defaultGestioneOfUL) -// .setSegno(-1) -// .setRifOrd(defaultRifOrdOfUL) -// .setNumOrd(defaultNumOrdOfUL) -// .setDataOrdD(defaultDataOrdOfUL) -// .setCodAnag(defaultCodAnagOfUL) -// .setCodMdep(defaultCodMdepOfUL) -// .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); -// -// if(defaultGestioneOfUL == GestioneEnum.LAVORAZIONE) { -// mtbColt.setPosizione(defaultCodJFasOfUL); -// } -// -// if(customNumCollo != null) { -// mtbColt.setNumCollo(customNumCollo); -// } -// -// if(!UtilityString.isNullOrEmpty(customSerCollo)) { -// mtbColt.setSerCollo(customSerCollo); -// } -// -// mtbColt.generaFiltroOrdineFromDTO(defaultFiltroOrdine); -// -// ProgressDialog finalProgress = progress; -// ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> { -// -// mtbColt -// .setNumCollo(value.getNumCollo()) -// .setDataCollo(value.getDataColloS()); -// mtbColtSessionID = ColliDataRecover.startNewSession(mtbColt); -// -// value -// .setDisablePrint(disablePrint) -// .setMtbColr(new ObservableArrayList<>()); -// -// setULToCurrentContext(value); -// -// if(closeProgress) finalProgress.dismiss(); -// -// FBToast.successToast(this, getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); -// -// if(onComplete != null) onComplete.run(); -// -// }, ex -> { -// UtilityExceptions.defaultException(mActivity, ex, finalProgress); -// }); - - } - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java index 273f074e..f905969e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java @@ -134,7 +134,7 @@ public class DialogVenditaFiltroAvanzato { IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getIstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA); bindings.filledExposedDropdownDataCons.setOnClickListener(view -> { - Calendar c = Calendar.getInstance(); + Calendar c = UtilityDate.getCalendarInstance(); if(viewModel.dataConsegnaDate != null) { c.setTime(viewModel.dataConsegnaDate); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java index e7482603..f880877d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java @@ -10,6 +10,7 @@ import java.util.Date; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; +import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityLogger; public class OrdineVenditaInevasoDTO implements Parcelable { @@ -194,13 +195,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable { } public Date getDataOrdD() { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - try { - return sdf.parse(getDataOrdS()); - } catch (ParseException e) { - UtilityLogger.errorMe(e); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS()); } public OrdineVenditaInevasoDTO setData(String data) { @@ -308,8 +303,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable { } public Date getDataInizTraspD() throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDataInizTraspS()); + return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS()); } public OrdineVenditaInevasoDTO setDataInizTrasp(String dataInizTrasp) { @@ -448,13 +442,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable { } public Date getDataConsD() { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - try { - return sdf.parse(getDataConsS()); - } catch (ParseException e) { - UtilityLogger.errorMe(e); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS()); } public OrdineVenditaInevasoDTO setDataCons(String dataCons) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java index 35609717..0a1d0563 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java @@ -288,13 +288,7 @@ public class PickingObjectDTO implements Parcelable { } public Date getDataColloD() { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - try { - return sdf.parse(getDataColloS()); - } catch (ParseException e) { - UtilityLogger.errorMe(e); - return null; - } + return UtilityDate.recognizeDateWithExceptionHandler(getDataColloS()); } public String getDataColloHuman() { @@ -346,9 +340,8 @@ public class PickingObjectDTO implements Parcelable { return dataScad; } - public Date getDataScadD() throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - return sdf.parse(getDataScadS()); + public Date getDataScadD() { + return UtilityDate.recognizeDateWithExceptionHandler(getDataScadS()); } public PickingObjectDTO setDataScad(String dataScad) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/ConsegnaClienteDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/DocumentoResoDTO.java similarity index 69% rename from app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/ConsegnaClienteDTO.java rename to app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/DocumentoResoDTO.java index 66457a4e..53998af7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/ConsegnaClienteDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/DocumentoResoDTO.java @@ -1,16 +1,11 @@ package it.integry.integrywmsnative.gest.vendita.rest.model; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; import it.integry.integrywmsnative.core.di.BindableBoolean; -import it.integry.integrywmsnative.core.exception.DateNotRecognizedException; -import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException; import it.integry.integrywmsnative.core.utility.UtilityDate; -import it.integry.integrywmsnative.core.utility.UtilityLogger; -public class ConsegnaClienteDTO { +public class DocumentoResoDTO { private String codAnag; private int counterConsegna; @@ -26,11 +21,13 @@ public class ConsegnaClienteDTO { private String dataOrd; private Integer numOrd; private String dataInizTrasp; + private String gestione; + private String codMdep; public BindableBoolean selected; - public ConsegnaClienteDTO() { + public DocumentoResoDTO() { this.selected = new BindableBoolean(false); } @@ -39,7 +36,7 @@ public class ConsegnaClienteDTO { return codAnag; } - public ConsegnaClienteDTO setCodAnag(String codAnag) { + public DocumentoResoDTO setCodAnag(String codAnag) { this.codAnag = codAnag; return this; } @@ -48,7 +45,7 @@ public class ConsegnaClienteDTO { return counterConsegna; } - public ConsegnaClienteDTO setCounterConsegna(int counterConsegna) { + public DocumentoResoDTO setCounterConsegna(int counterConsegna) { this.counterConsegna = counterConsegna; return this; } @@ -57,7 +54,7 @@ public class ConsegnaClienteDTO { return codDtip; } - public ConsegnaClienteDTO setCodDtip(String codDtip) { + public DocumentoResoDTO setCodDtip(String codDtip) { this.codDtip = codDtip; return this; } @@ -70,7 +67,7 @@ public class ConsegnaClienteDTO { return UtilityDate.recognizeDateWithExceptionHandler(getDataDocS()); } - public ConsegnaClienteDTO setDataDoc(String dataDoc) { + public DocumentoResoDTO setDataDoc(String dataDoc) { this.dataDoc = dataDoc; return this; } @@ -79,7 +76,7 @@ public class ConsegnaClienteDTO { return serDoc; } - public ConsegnaClienteDTO setSerDoc(String serDoc) { + public DocumentoResoDTO setSerDoc(String serDoc) { this.serDoc = serDoc; return this; } @@ -88,7 +85,7 @@ public class ConsegnaClienteDTO { return numDoc; } - public ConsegnaClienteDTO setNumDoc(int numDoc) { + public DocumentoResoDTO setNumDoc(int numDoc) { this.numDoc = numDoc; return this; } @@ -97,7 +94,7 @@ public class ConsegnaClienteDTO { return destinatario; } - public ConsegnaClienteDTO setDestinatario(String destinatario) { + public DocumentoResoDTO setDestinatario(String destinatario) { this.destinatario = destinatario; return this; } @@ -106,7 +103,7 @@ public class ConsegnaClienteDTO { return indirizzo; } - public ConsegnaClienteDTO setIndirizzo(String indirizzo) { + public DocumentoResoDTO setIndirizzo(String indirizzo) { this.indirizzo = indirizzo; return this; } @@ -115,7 +112,7 @@ public class ConsegnaClienteDTO { return ragSoc; } - public ConsegnaClienteDTO setRagSoc(String ragSoc) { + public DocumentoResoDTO setRagSoc(String ragSoc) { this.ragSoc = ragSoc; return this; } @@ -124,7 +121,7 @@ public class ConsegnaClienteDTO { return compilatoDa; } - public ConsegnaClienteDTO setCompilatoDa(String compilatoDa) { + public DocumentoResoDTO setCompilatoDa(String compilatoDa) { this.compilatoDa = compilatoDa; return this; } @@ -133,7 +130,7 @@ public class ConsegnaClienteDTO { return rifOrd; } - public ConsegnaClienteDTO setRifOrd(String rifOrd) { + public DocumentoResoDTO setRifOrd(String rifOrd) { this.rifOrd = rifOrd; return this; } @@ -147,7 +144,7 @@ public class ConsegnaClienteDTO { } - public ConsegnaClienteDTO setDataOrd(String dataOrd) { + public DocumentoResoDTO setDataOrd(String dataOrd) { this.dataOrd = dataOrd; return this; } @@ -156,7 +153,7 @@ public class ConsegnaClienteDTO { return numOrd; } - public ConsegnaClienteDTO setNumOrd(Integer numOrd) { + public DocumentoResoDTO setNumOrd(Integer numOrd) { this.numOrd = numOrd; return this; } @@ -169,7 +166,7 @@ public class ConsegnaClienteDTO { return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS()); } - public ConsegnaClienteDTO setDataInizTrasp(String dataInizTrasp) { + public DocumentoResoDTO setDataInizTrasp(String dataInizTrasp) { this.dataInizTrasp = dataInizTrasp; return this; } @@ -182,8 +179,26 @@ public class ConsegnaClienteDTO { return this.selected.get(); } - public ConsegnaClienteDTO setSelected(boolean selected) { + public DocumentoResoDTO setSelected(boolean selected) { this.selected.set(selected); return this; } + + public String getGestione() { + return gestione; + } + + public DocumentoResoDTO setGestione(String gestione) { + this.gestione = gestione; + return this; + } + + public String getCodMdep() { + return codMdep; + } + + public DocumentoResoDTO setCodMdep(String codMdep) { + this.codMdep = codMdep; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 3de66558..f2fb22f5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -341,7 +341,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO // List foundRows = Stream.of(groupedOrdini) // .filter(x -> x.getNumOrd() == currentMtbColr.getNumOrd() && // x.getRigaOrd() == currentMtbColr.getRigaOrd()&& -// x.getDataOrd().equals(currentMtbColr.getDataOrdD())) +// x.getDataOrdD().equals(currentMtbColr.getDataOrdD())) // .toList(); // // if(foundRows != null && foundRows.size() > 0){ @@ -903,7 +903,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO MtbColt cloneMtbColt = (MtbColt) mArticoliInColloBottomSheetViewModel.mtbColt.get().clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); - cloneMtbColt.setOraFinePrep(new Date()); + cloneMtbColt.setOraFinePrep(UtilityDate.getDateInstance()); ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback() { @@ -1193,7 +1193,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO .setQtaCnf(quantityDTO.qtaCnf.getBigDecimal()) .setNumCnf(quantityDTO.numCnf.getBigDecimal()) .setDescrizione(item.getDescrizioneEstesa()) - .setDatetimeRow(new Date()); + .setDatetimeRow(UtilityDate.getDateInstance()); if(item.getTempPickData() != null && item.getTempPickData().getSourceMtbColt() != null) { MtbColt sourceMtbColt = item.getTempPickData().getSourceMtbColt(); @@ -1337,7 +1337,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO .setQtaCnf(quantityDTO.qtaCnf.getBigDecimal()) .setNumCnf(quantityDTO.numCnf.getBigDecimal()) .setDescrizione(item.getDescrizioneEstesa()) - .setDatetimeRow(new Date()); + .setDatetimeRow(UtilityDate.getDateInstance()); mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index e15b0796..7d4a3363 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -30,6 +30,7 @@ import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; +import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityPosizione; import it.integry.integrywmsnative.core.utility.UtilityProgress; @@ -364,7 +365,7 @@ public class VersamentoMerceViewModel { .setQtaCol(quantityDTO.qtaTot.getBigDecimal()) .setQtaCnf(quantityDTO.qtaCnf.getBigDecimal()) .setNumCnf(quantityDTO.numCnf.getBigDecimal()) - .setDatetimeRow(new Date()); + .setDatetimeRow(UtilityDate.getDateInstance()); onComplete.run(mtbColr); }, onAbort).show(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 190a6064..0c6b21c7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -367,7 +367,7 @@ public class DialogInputQuantity { } if(quantityDTO.expireDate == null && dto.mtbAart.getGgScadPartita() != null && dto.mtbAart.getGgScadPartita() > 0) { - Calendar c = Calendar.getInstance(); + Calendar c = UtilityDate.getCalendarInstance(); c.add(Calendar.DATE, dto.mtbAart.getGgScadPartita()); // number of days to add quantityDTO.expireDate = c.getTime(); @@ -610,7 +610,7 @@ public class DialogInputQuantity { Runnable onTextClicked = () -> { // Get Current Date - Calendar c = Calendar.getInstance(); + Calendar c = UtilityDate.getCalendarInstance(); if(quantityDTO.expireDate != null) { c.setTime(quantityDTO.expireDate); diff --git a/app/src/main/res/layout/activity_ultime_consegne_cliente_picking.xml b/app/src/main/res/layout/activity_picking_resi.xml similarity index 94% rename from app/src/main/res/layout/activity_ultime_consegne_cliente_picking.xml rename to app/src/main/res/layout/activity_picking_resi.xml index 09cacaec..cf0fcbf3 100644 --- a/app/src/main/res/layout/activity_ultime_consegne_cliente_picking.xml +++ b/app/src/main/res/layout/activity_picking_resi.xml @@ -5,7 +5,7 @@ + type="it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity" /> + tools:context=".gest.picking_resi.PickingResiActivity"> diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml index 1d003715..0a3a97c4 100644 --- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml +++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml @@ -5,7 +5,7 @@ + type="it.integry.integrywmsnative.gest.vendita.rest.model.DocumentoResoDTO" />