From 09b984f5d077c192a54ab0aeab8c838dbd308d95 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Thu, 6 Nov 2025 09:49:18 +0100 Subject: [PATCH 1/7] Passato barcode di etichetta anonima in fase di creazione collo --- .../AccettazioneOrdiniPickingViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java index bfffb8af..081b2fa6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java @@ -273,7 +273,7 @@ public class AccettazioneOrdiniPickingViewModel { try { numCollo = UtilityBarcode.getNumColloFromULAnonima(barcodeScanDTO.getStringValue()); this.createNewLU( - null, + barcodeScanDTO.getStringValue(), numCollo, CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE, true, onComplete); } catch (Exception ex) { From 21af5fc0a9a35dc7a6fdbbb2f02e068228bc5037 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 7 Nov 2025 13:28:14 +0100 Subject: [PATCH 2/7] In accettazione aggiunta proposta lotto se presente nell'ordine --- .../core/settings/DBSettingsModel.java | 11 ++++++++++- .../core/settings/SettingsManager.java | 5 +++++ .../accettazione_ordini_elenco/dto/SitArtOrdDTO.java | 10 ++++++++++ .../AccettazioneOrdiniPickingViewModel.java | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 54718eac..1ca83d93 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -100,7 +100,7 @@ public class DBSettingsModel { private boolean flagAccettazioneBollaEditableQtaTot = true; private boolean flagViewSwitchDepoButton = true; private boolean flagProduzioneSkipAskVersamentoAutomatico; - + private boolean flagAccettazioneViewLotto = false; public boolean isFlagSpedizioneEnableFakeGiacenza() { return flagSpedizioneEnableFakeGiacenza; } @@ -843,4 +843,13 @@ public class DBSettingsModel { this.flagProduzioneSkipAskVersamentoAutomatico = flagProduzioneSkipAskVersamentoAutomatico; return this; } + + public boolean isFlagAccettazioneViewLotto() { + return flagAccettazioneViewLotto; + } + + public DBSettingsModel setFlagAccettazioneViewLotto(boolean flagAccettazioneViewLotto) { + this.flagAccettazioneViewLotto = flagAccettazioneViewLotto; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index 66b7cafe..c085d2f1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -254,6 +254,11 @@ public class SettingsManager { .setSection("ACCETTAZIONE") .setKeySection("FLAG_DELETE_ROW_ON_CLOSE") .setSetter(dbSettingsModelIstance::setFlagAccettazioneDeleteRowOnClose)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("ACCETTAZIONE") + .setKeySection("FLAG_VIEW_LOTTO") + .setSetter(dbSettingsModelIstance::setFlagAccettazioneViewLotto)); stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) .setGestName("PICKING") .setSection("SPEDIZIONE") diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java index c748f6bc..7e072d81 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java @@ -36,6 +36,7 @@ public class SitArtOrdDTO { private String descrizioneEstesaArt; private String descrizioneEstesaOrd; private Date dataCons; + private String partitaMag; public String getDescrizioneEstesaOrd() { return descrizioneEstesaOrd; @@ -301,4 +302,13 @@ public class SitArtOrdDTO { this.dataCons = dataCons; return this; } + + public String getPartitaMag() { + return partitaMag; + } + + public SitArtOrdDTO setPartitaMag(String partitaMag) { + this.partitaMag = partitaMag; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java index 081b2fa6..879ddd96 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java @@ -559,6 +559,9 @@ public class AccettazioneOrdiniPickingViewModel { dataScad = dataScad.plusDays(pickingObjectDTO.getMtbAart().getGgScadPartita()); } + if (partitaMag == null && SettingsManager.iDB().isFlagAccettazioneViewLotto()) + partitaMag = pickingObjectDTO.getSitArtOrdDTO().getPartitaMag(); + if (partitaMag == null && dataScad == null) { HistoryMtbAartDTO historyMtbAartDTO = this.getHistoryItemIfExists(pickingObjectDTO.getMtbAart().getCodMart()); From 4d5c0e5509c0c9265608cc38d2b4ea6bebb715e6 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 11 Nov 2025 11:50:01 +0100 Subject: [PATCH 3/7] In DtbDoct sostituite date in localDate --- .../integrywmsnative/core/model/DtbDoct.java | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDoct.java b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDoct.java index 238ce134..5fc1beaa 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDoct.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbDoct.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.core.model; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import java.util.List; public class DtbDoct { @@ -10,7 +10,7 @@ public class DtbDoct { private String codAnag; private String codDtip; - private Date dataDoc; + private LocalDate dataDoc; private Integer numDoc; private String serDoc; private BigDecimal acconto; @@ -41,14 +41,14 @@ public class DtbDoct { private String compilatoDa; private String userName; private String controllatoDa; - private Date dataChkDoc; - private Date dataDocVal; - private Date dataInizTrasp; - private Date dataIns; - private Date dataOrd; - private Date dataReg; - private Date dataRifScad; - private Date dataUltMod; + private LocalDate dataChkDoc; + private LocalDate dataDocVal; + private LocalDate dataInizTrasp; + private LocalDate dataIns; + private LocalDate dataOrd; + private LocalDate dataReg; + private LocalDate dataRifScad; + private LocalDate dataUltMod; private String descrizionePaga; private String flagPrzScontati; private String gestione; @@ -89,7 +89,7 @@ public class DtbDoct { private String targa; private Integer postiPallet; private BigDecimal tempMedia; - private Date dataCons; + private LocalDate dataCons; private BigDecimal nolo; private BigDecimal nolo2; private String conducente; @@ -102,7 +102,7 @@ public class DtbDoct { private String setDataDecorrenza2DataRic; private BigDecimal totSpese; private String chkArtListino; - private Date dataCmov; + private LocalDate dataCmov; private String reso; private Integer numCmovAutofattura; private Object dtbTipi; @@ -141,11 +141,11 @@ public class DtbDoct { return this; } - public Date getDataDoc() { + public LocalDate getDataDoc() { return dataDoc; } - public DtbDoct setDataDoc(Date dataDoc) { + public DtbDoct setDataDoc(LocalDate dataDoc) { this.dataDoc = dataDoc; return this; } @@ -420,74 +420,74 @@ public class DtbDoct { return this; } - public Date getDataChkDoc() { + public LocalDate getDataChkDoc() { return dataChkDoc; } - public DtbDoct setDataChkDoc(Date dataChkDoc) { + public DtbDoct setDataChkDoc(LocalDate dataChkDoc) { this.dataChkDoc = dataChkDoc; return this; } - public Date getDataDocVal() { + public LocalDate getDataDocVal() { return dataDocVal; } - public DtbDoct setDataDocVal(Date dataDocVal) { + public DtbDoct setDataDocVal(LocalDate dataDocVal) { this.dataDocVal = dataDocVal; return this; } - public Date getDataInizTrasp() { + public LocalDate getDataInizTrasp() { return dataInizTrasp; } - public DtbDoct setDataInizTrasp(Date dataInizTrasp) { + public DtbDoct setDataInizTrasp(LocalDate dataInizTrasp) { this.dataInizTrasp = dataInizTrasp; return this; } - public Date getDataIns() { + public LocalDate getDataIns() { return dataIns; } - public DtbDoct setDataIns(Date dataIns) { + public DtbDoct setDataIns(LocalDate dataIns) { this.dataIns = dataIns; return this; } - public Date getDataOrd() { + public LocalDate getDataOrd() { return dataOrd; } - public DtbDoct setDataOrd(Date dataOrd) { + public DtbDoct setDataOrd(LocalDate dataOrd) { this.dataOrd = dataOrd; return this; } - public Date getDataReg() { + public LocalDate getDataReg() { return dataReg; } - public DtbDoct setDataReg(Date dataReg) { + public DtbDoct setDataReg(LocalDate dataReg) { this.dataReg = dataReg; return this; } - public Date getDataRifScad() { + public LocalDate getDataRifScad() { return dataRifScad; } - public DtbDoct setDataRifScad(Date dataRifScad) { + public DtbDoct setDataRifScad(LocalDate dataRifScad) { this.dataRifScad = dataRifScad; return this; } - public Date getDataUltMod() { + public LocalDate getDataUltMod() { return dataUltMod; } - public DtbDoct setDataUltMod(Date dataUltMod) { + public DtbDoct setDataUltMod(LocalDate dataUltMod) { this.dataUltMod = dataUltMod; return this; } @@ -852,11 +852,11 @@ public class DtbDoct { return this; } - public Date getDataCons() { + public LocalDate getDataCons() { return dataCons; } - public DtbDoct setDataCons(Date dataCons) { + public DtbDoct setDataCons(LocalDate dataCons) { this.dataCons = dataCons; return this; } @@ -969,11 +969,11 @@ public class DtbDoct { return this; } - public Date getDataCmov() { + public LocalDate getDataCmov() { return dataCmov; } - public DtbDoct setDataCmov(Date dataCmov) { + public DtbDoct setDataCmov(LocalDate dataCmov) { this.dataCmov = dataCmov; return this; } From 6b65c4a5705bd550cef431113867d1a37f7190ad Mon Sep 17 00:00:00 2001 From: MarcoE Date: Tue, 18 Nov 2025 10:21:46 +0100 Subject: [PATCH 4/7] -> v1.48.00 (540) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 16b44852..3db2a4ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 539 - def appVersionName = '1.47.26' + def appVersionCode = 540 + def appVersionName = '1.48.00' signingConfigs { release { From b0ce11cbf74400779b1fc2685921f088b8aa3fe4 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Wed, 19 Nov 2025 10:58:54 +0100 Subject: [PATCH 5/7] -> v1.48.01 (541) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3db2a4ef..3701fce5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 540 - def appVersionName = '1.48.00' + def appVersionCode = 541 + def appVersionName = '1.48.01' signingConfigs { release { From 0205255f7d8ad886c1077841fa3c6eb6dd2eb9f3 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Thu, 20 Nov 2025 11:43:03 +0100 Subject: [PATCH 6/7] -> v1.48.02 (542) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3701fce5..6a742bb6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 541 - def appVersionName = '1.48.01' + def appVersionCode = 542 + def appVersionName = '1.48.02' signingConfigs { release { From 5ad4fd7821f800c188972d8fecef900d727d4f01 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 21 Nov 2025 13:32:10 +0100 Subject: [PATCH 7/7] -> v1.48.03 (543) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6a742bb6..7ec0fa90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 542 - def appVersionName = '1.48.02' + def appVersionCode = 543 + def appVersionName = '1.48.03' signingConfigs { release {