From 021f6974f190f9575794037096cf08010f2496d5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 3 Jun 2025 09:49:13 +0200 Subject: [PATCH 1/3] Aggiornato Jenkinsfile --- Jenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 938db54e..14deeca5 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -11,7 +11,7 @@ pipeline { environment { // ANDROID_HOME = "/usr/local/android/sdk" // Cambia in base al tuo sistema JAVA_HOME = tool 'JDK 17.0.6 x64' // Nome dello strumento configurato in Jenkins - PATH = "${env.JAVA_HOME}/bin:${env.PATH}" + PATH = "${env.JAVA_HOME}\\bin;${env.PATH}" } stages { From 548cdd562a3b27a22d5db366391dd8b87ded81b1 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 9 Jun 2025 09:46:56 +0200 Subject: [PATCH 2/3] Aggiunti @SerializedName su altri DTO. --- app/build.gradle | 2 +- .../core/model/DtbOrdSteps.java | 70 ++++++ .../integrywmsnative/core/model/DtbOrdt.java | 204 ++++++++++++++++++ .../MtbColrVersamentoMaterialeListModel.java | 90 -------- .../dto/OrdineLavorazioneDTO.java | 53 +++++ 5 files changed, 328 insertions(+), 91 deletions(-) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/MtbColrVersamentoMaterialeListModel.java diff --git a/app/build.gradle b/app/build.gradle index 9efc06c9..54cbe25f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { buildTypes { debug { ext.enableCrashlytics = false - minifyEnabled true // Abilita la minimizzazione del codice +// minifyEnabled true // Abilita la minimizzazione del codice // shrinkResources true // Rimuove risorse non utilizzate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdSteps.java b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdSteps.java index 9b34dad2..18bdc869 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdSteps.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdSteps.java @@ -1,42 +1,112 @@ package it.integry.integrywmsnative.core.model; +import com.google.gson.annotations.SerializedName; + import java.math.BigDecimal; public class DtbOrdSteps extends EntityBase { + + @SerializedName("dataOrd") private String dataOrd; + + @SerializedName("gestione") private String gestione; + + @SerializedName("idRiga") private Integer idRiga; + + @SerializedName("idStep") private Integer idStep; + + @SerializedName("numOrd") private Integer numOrd; + + @SerializedName("activityId") private String activityId; + + @SerializedName("codAnag") private String codAnag; + + @SerializedName("codDtip") private String codDtip; + + @SerializedName("codJfas") private String codJfas; + + @SerializedName("codMdep") private String codMdep; + + @SerializedName("codProdPri") private String codProdPri; + + @SerializedName("dataDoc") private String dataDoc; + + @SerializedName("dataFine") private String dataFine; + + @SerializedName("dataIniz") private String dataIniz; + + @SerializedName("descrizioneAttivita") private String descrizioneAttivita; + + @SerializedName("flagTipoTempo") private String flagTipoTempo; + + @SerializedName("hrNum") private Integer hrNum; + + @SerializedName("hrTime") private BigDecimal hrTime; + + @SerializedName("idRigaDoc") private String idRigaDoc; + + @SerializedName("note") private String note; + + @SerializedName("numDoc") private String numDoc; + + @SerializedName("numFase") private Integer numFase; + + @SerializedName("qtaAllocata") private BigDecimal qtaAllocata; + + @SerializedName("qtaDisp") private BigDecimal qtaDisp; + + @SerializedName("qtaDispImmessa") private BigDecimal qtaDispImmessa; + + @SerializedName("qtaImmesse") private BigDecimal qtaImmesse; + + @SerializedName("qtaInProd") private BigDecimal qtaInProd; + + @SerializedName("qtaLav") private BigDecimal qtaLav; + + @SerializedName("qtaProd") private BigDecimal qtaProd; + + @SerializedName("qtaScartate") private BigDecimal qtaScartate; + + @SerializedName("qtaTrasferite") private BigDecimal qtaTrasferite; + + @SerializedName("rapConvLav") private BigDecimal rapConvLav; + + @SerializedName("serDoc") private String serDoc; + + @SerializedName("untMisLav") private String untMisLav; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdt.java index 2a6310ec..5b40463f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/DtbOrdt.java @@ -1,110 +1,314 @@ package it.integry.integrywmsnative.core.model; +import com.google.gson.annotations.SerializedName; + import java.math.BigDecimal; import java.time.LocalDate; public class DtbOrdt extends EntityBase { + + @SerializedName("dataOrd") private LocalDate dataOrd; + + @SerializedName("gestione") private String gestione; + + @SerializedName("numOrd") private Integer numOrd; + + @SerializedName("acconto") private BigDecimal acconto; + + @SerializedName("activityId") private String activityId; + + @SerializedName("activityTypeId") private String activityTypeId; + + @SerializedName("aspettoBeni") private String aspettoBeni; + + @SerializedName("causaleTrasp") private String causaleTrasp; + + @SerializedName("codAbi") private String codAbi; + + @SerializedName("codAnag") private String codAnag; + + @SerializedName("codAuto") private String codAuto; + + @SerializedName("codBanc") private String codBanc; + + @SerializedName("codBancAzi") private String codBancAzi; + + @SerializedName("codCab") private String codCab; + + @SerializedName("codDgrpArt") private String codDgrpArt; + + @SerializedName("codDivi") private String codDivi; + + @SerializedName("codEtic") private String codEtic; + + @SerializedName("codFornTd") private String codFornTd; + + @SerializedName("codJcom") private String codJcom; + + @SerializedName("codJfas") private String codJfas; + + @SerializedName("codMdep") private String codMdep; + + @SerializedName("codPaga") private String codPaga; + + @SerializedName("codProd") private String codProd; + + @SerializedName("codTcolUi") private String codTcolUi; + + @SerializedName("codTcolUl") private String codTcolUl; + + @SerializedName("codVage") private String codVage; + + @SerializedName("codVage2") private String codVage2; + + @SerializedName("codVdes") private String codVdes; + + @SerializedName("codVvet") private String codVvet; + + @SerializedName("codVvet2") private String codVvet2; + + @SerializedName("codVzon") private String codVzon; + + @SerializedName("colliPedana") private BigDecimal colliPedana; + + @SerializedName("compilatoDa") private String compilatoDa; + + @SerializedName("controllatoDa") private String controllatoDa; + + @SerializedName("dataConsProd") private String dataConsProd; + + @SerializedName("dataConsProdMax") private String dataConsProdMax; + + @SerializedName("dataEsportazione") private String dataEsportazione; + + @SerializedName("dataConferma") private String dataConferma; + + @SerializedName("dataInizProd") private String dataInizProd; + + @SerializedName("dataInizTrasp") private String dataInizTrasp; + + @SerializedName("dataInsOrd") private String dataInsOrd; + + @SerializedName("dataOrdRif") private String dataOrdRif; + + @SerializedName("rifDdataOrd") private String rifDdataOrd; + + @SerializedName("dataRicezione") private String dataRicezione; + + @SerializedName("dataRifScad") private String dataRifScad; + + @SerializedName("dataUltMod") private String dataUltMod; + + @SerializedName("descrEstesaProd") private String descrEstesaProd; + + @SerializedName("descrizionePaga") private String descrizionePaga; + + @SerializedName("descrizioneProd") private String descrizioneProd; + + @SerializedName("eanFidelity") private String eanFidelity; + + @SerializedName("flagAnnulla") private String flagAnnulla; + + @SerializedName("flagEscRoyal") private String flagEscRoyal; + + @SerializedName("flagEvasoForzato") private String flagEvasoForzato; + + @SerializedName("flagEvasoProd") private String flagEvasoProd; + + @SerializedName("flagPrzScontati") private String flagPrzScontati; + + @SerializedName("flagSospeso") private String flagSospeso; + + @SerializedName("flagTipologia") private String flagTipologia; + + @SerializedName("gestioneRif") private String gestioneRif; + + @SerializedName("itemId") private String itemId; + + @SerializedName("listino") private String listino; + + @SerializedName("livello") private Integer livello; + + @SerializedName("mezzo") private String mezzo; + + @SerializedName("modificatoDa") private String modificatoDa; + + @SerializedName("nettoMerce") private BigDecimal nettoMerce; + + @SerializedName("nolo") private BigDecimal nolo; + + @SerializedName("note") private String note; + + @SerializedName("numColli") private String numColli; + + @SerializedName("numCons") private String numCons; + + @SerializedName("numFase") private Integer numFase; + + @SerializedName("numOrdProvv") private Integer numOrdProvv; + + @SerializedName("numOrdRif") private Integer numOrdRif; + + @SerializedName("rifNumOrd") private Integer rifNumOrd; + + @SerializedName("partitaMag") private String partitaMag; + + @SerializedName("percEsclStat") private BigDecimal percEsclStat; + + @SerializedName("personaRif") private String personaRif; + + @SerializedName("peso") private String peso; + + @SerializedName("porto") private String porto; + + @SerializedName("qtaEvasaProd") private BigDecimal qtaEvasaProd; + + @SerializedName("qtaPrenotataRep") private BigDecimal qtaPrenotataRep; + + @SerializedName("qtaProd") private BigDecimal qtaProd; + + @SerializedName("rapConvProd") private BigDecimal rapConvProd; + + @SerializedName("rfid") private String rfid; + + @SerializedName("rifOrd") private String rifOrd; + + @SerializedName("rigaOrdRif") private Integer rigaOrdRif; + + @SerializedName("sconto1") private BigDecimal sconto1; + + @SerializedName("sconto2") private BigDecimal sconto2; + + @SerializedName("sconto3") private BigDecimal sconto3; + + @SerializedName("sconto4") private BigDecimal sconto4; + + @SerializedName("serie") private String serie; + + @SerializedName("termCons") private String termCons; + + @SerializedName("tipoAnag") private String tipoAnag; + + @SerializedName("totFasi") private Integer totFasi; + + @SerializedName("totImponib") private BigDecimal totImponib; + + @SerializedName("totIva") private BigDecimal totIva; + + @SerializedName("totMerce") private BigDecimal totMerce; + + @SerializedName("totOmaggi") private BigDecimal totOmaggi; + + @SerializedName("totProvvig") private BigDecimal totProvvig; + + @SerializedName("untMisProd") private String untMisProd; + + @SerializedName("flagPrzIva") private String flagPrzIva; + + @SerializedName("noteConferma") private String noteConferma; + + @SerializedName("codJflav") private String codJflav; public DtbOrdt() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/MtbColrVersamentoMaterialeListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/MtbColrVersamentoMaterialeListModel.java deleted file mode 100644 index e12088a1..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/MtbColrVersamentoMaterialeListModel.java +++ /dev/null @@ -1,90 +0,0 @@ -package it.integry.integrywmsnative.gest.prod_versamento_materiale.dto; - -import androidx.databinding.ObservableField; - -import java.math.BigDecimal; - -import it.integry.integrywmsnative.core.di.BindableBoolean; -import it.integry.integrywmsnative.core.model.MtbColr; - -public class MtbColrVersamentoMaterialeListModel { - - private String preDescriptionText; - private String descriptionText; - private String subDescriptionText; - - private final ObservableField kgBigDecimal = new ObservableField<>(BigDecimal.ZERO); - private final ObservableField qtaBigDecimal = new ObservableField<>(BigDecimal.ZERO); - - private MtbColr originalMtbColr; - private OrdineLavorazioneDTO originalOrdineLavorazione; - - private BindableBoolean selected = new BindableBoolean(); - - public String getPreDescriptionText() { - return preDescriptionText; - } - - public MtbColrVersamentoMaterialeListModel setPreDescriptionText(String preDescriptionText) { - this.preDescriptionText = preDescriptionText; - return this; - } - - public String getDescriptionText() { - return descriptionText; - } - - public MtbColrVersamentoMaterialeListModel setDescriptionText(String descriptionText) { - this.descriptionText = descriptionText; - return this; - } - - public String getSubDescriptionText() { - return subDescriptionText; - } - - public MtbColrVersamentoMaterialeListModel setSubDescriptionText(String subDescriptionText) { - this.subDescriptionText = subDescriptionText; - return this; - } - - public BigDecimal getKgBigDecimal() { - return kgBigDecimal.get(); - } - - public MtbColrVersamentoMaterialeListModel setKgBigDecimal(BigDecimal kgBigDecimal) { - this.kgBigDecimal.set(kgBigDecimal); - return this; - } - - public BigDecimal getQtaBigDecimal() { - return qtaBigDecimal.get(); - } - - public MtbColrVersamentoMaterialeListModel setQtaBigDecimal(BigDecimal qtaBigDecimal) { - this.qtaBigDecimal.set(qtaBigDecimal); - return this; - } - - public MtbColr getOriginalMtbColr() { - return originalMtbColr; - } - - public MtbColrVersamentoMaterialeListModel setOriginalMtbColr(MtbColr originalMtbColr) { - this.originalMtbColr = originalMtbColr; - return this; - } - - public OrdineLavorazioneDTO getOriginalOrdineLavorazione() { - return originalOrdineLavorazione; - } - - public MtbColrVersamentoMaterialeListModel setOriginalOrdineLavorazione(OrdineLavorazioneDTO originalOrdineLavorazione) { - this.originalOrdineLavorazione = originalOrdineLavorazione; - return this; - } - - public BindableBoolean getSelected() { - return selected; - } -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java index ccc1b636..b7b91f0e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/dto/OrdineLavorazioneDTO.java @@ -1,5 +1,7 @@ package it.integry.integrywmsnative.gest.prod_versamento_materiale.dto; +import com.google.gson.annotations.SerializedName; + import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; @@ -11,102 +13,153 @@ import it.integry.integrywmsnative.core.utility.UtilityDate; public class OrdineLavorazioneDTO { + @SerializedName("dataOrdProd") private LocalDate dataOrdProd; + @SerializedName("numOrdProd") private Integer numOrdProd; + @SerializedName("rigaOrdProd") private Integer rigaOrdProd; + @SerializedName("flagAvviabile") private String flagAvviabile; + @SerializedName("untOrd") private String untOrd; + @SerializedName("rapConv") private BigDecimal rapConv; + @SerializedName("posRiga") private Integer posRiga; + @SerializedName("numPezzi") private BigDecimal numPezzi; + @SerializedName("numCnf") private BigDecimal numCnf; + @SerializedName("qtaCnf") private BigDecimal qtaCnf; + @SerializedName("ggScadPartita") private Integer ggScadPartita; + @SerializedName("colliPedana") private BigDecimal colliPedana; + @SerializedName("numPedane") private BigDecimal numPedane; + @SerializedName("dataOrd") private LocalDate dataOrd; + @SerializedName("flagEvasoProd") private String flagEvasoProd; + @SerializedName("gestione") private String gestione; + @SerializedName("numOrd") private int numOrd; + @SerializedName("descrizioneProd") private String descrizioneProd; + @SerializedName("codJfas") private String codJfas; + @SerializedName("partitaMag") private String partitaMag; + @SerializedName("dataScad") private String dataScad; + @SerializedName("partitaMagSuggested") private String partitaMagSuggested; + @SerializedName("dataScadSuggested") private String dataScadSuggested; + @SerializedName("codProd") private String codProd; + @SerializedName("maxStep") private Integer maxStep; + @SerializedName("dataInizProd") private String dataInizProd; + @SerializedName("dataIniz") private String dataIniz; + @SerializedName("dataFine") private String dataFine; + @SerializedName("qtaProd") private BigDecimal qtaProd; + @SerializedName("qtaTrasferite") private BigDecimal qtaTrasferite; + @SerializedName("stato") private String stato; + @SerializedName("codTcolUl") private String codTcolUl; + @SerializedName("codAnag") private String codAnag; + @SerializedName("ragSocAnag") private String ragSocAnag; + @SerializedName("rifOrd") private String rifOrd; + @SerializedName("codVdes") private String codVdes; + @SerializedName("codMdep") private String codMdep; + @SerializedName("codJcom") private String codJcom; + @SerializedName("noteLav") private String noteLav; + @SerializedName("tempoTrascorso") private BigDecimal tempoTrascorso; + @SerializedName("descCommessa") private String descCommessa; + @SerializedName("dataConsCommessa") private String dataConsCommessa; + @SerializedName("descrizioneAttivita") private String descrizioneAttivita; + @SerializedName("prodStd") private BigDecimal prodStd; + @SerializedName("mtbColtToEdit") private Object mtbColtToEdit; + @SerializedName("hrNum") private int hrNum; + + @SerializedName("availableClassMerc") private List availableClassMerc; + @SerializedName("qtaColVersamento") private BindableFloat qtaColVersamento = new BindableFloat(); + + @SerializedName("numCnfVersamento") private BindableFloat numCnfVersamento = new BindableFloat(); public LocalDate getDataOrdProd() { From 3c337fc1382729498cb5b1b70623eea139de7ee4 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 9 Jun 2025 09:47:57 +0200 Subject: [PATCH 3/3] -> v1.46.21 (509) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dab9bd6a..628acbca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 508 - def appVersionName = '1.46.20' + def appVersionCode = 509 + def appVersionName = '1.46.21' signingConfigs { release {