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

Aggiunti campi @SerializedName su DTO ed EntityBase

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-06-04 17:55:13 +02:00
parent 20bc5c6da2
commit d32c96818e
35 changed files with 573 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/it/integry/integrywmsnative/core/model/EntityBase.java
View File

@@ -1,11 +1,15 @@
package it.integry.integrywmsnative.core.model;
import android.util.Log;
import com.google.gson.annotations.SerializedName;
public abstract class EntityBase extends BaseRestDTO implements Cloneable{
@SerializedName("operation")
public String operation;
@SerializedName("type")
public String type;
@SerializedName("onlyPkMaster")
public boolean onlyPkMaster = false;
public String getOperation() {

40
app/src/main/java/it/integry/integrywmsnative/core/model/GtbAnag.java
View File

@@ -1,48 +1,88 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.util.Date;
public class GtbAnag extends EntityBase {
@SerializedName("codAnag")
private String codAnag;
@SerializedName("ragSoc")
private String ragSoc;
@SerializedName("indirizzo")
private String indirizzo;
@SerializedName("cap")
private String cap;
@SerializedName("citta")
private String citta;
@SerializedName("prov")
private String prov;
@SerializedName("nazione")
private String nazione;
@SerializedName("telefono")
private String telefono;
@SerializedName("fax")
private String fax;
@SerializedName("partIva")
private String partIva;
@SerializedName("codFisc")
private String codFisc;
@SerializedName("note")
private String note;
@SerializedName("personaRif")
private String personaRif;
@SerializedName("allegato")
private String allegato;
@SerializedName("eMail")
private String eMail;
@SerializedName("eMailPec")
private String eMailPec;
@SerializedName("flagPersonaFg")
private String flagPersonaFg;
@SerializedName("sesso")
private String sesso;
@SerializedName("codCentroAzi")
private String codCentroAzi;
@SerializedName("codRuop")
private String codRuop;
@SerializedName("dataNascita")
private Date dataNascita;
@SerializedName("luogoNascita")
private String luogoNascita;
@SerializedName("provNascita")
private String provNascita;
@SerializedName("nome")
private String nome;
@SerializedName("ragSoc2")
private String ragSoc2;
@SerializedName("classeMerito")
private Integer classeMerito;
@SerializedName("dataIns")
private Date dataIns;
@SerializedName("numCell")
private String numCell;
@SerializedName("cciaa")
private String cciaa;
@SerializedName("tipoAzienda")
private String tipoAzienda;
@SerializedName("cuuPa")
private String cuuPa;
@SerializedName("cognome")
private String cognome;
@SerializedName("diacod")
private String diacod;
@SerializedName("lat")
private BigDecimal lat;
@SerializedName("lng")
private BigDecimal lng;
@SerializedName("flagInformativa")
private String flagInformativa;
@SerializedName("flagConsenso")
private String flagConsenso;
@SerializedName("precode")
private String precode;
@SerializedName("insDestinatario")
private Boolean insDestinatario;
public GtbAnag() {

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

@@ -1,11 +1,18 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
public class JtbComt extends EntityBase {
@SerializedName("codJcom")
private String codJcom;
@SerializedName("codAnag")
private String codAnag;
@SerializedName("codJfas")
private String codJfas;
@SerializedName("codJflav")
private String codJflav;
@SerializedName("descrizione")
private String descrizione;
public JtbComt() {

17
app/src/main/java/it/integry/integrywmsnative/core/model/JtbFasi.java
View File

@@ -2,25 +2,42 @@ package it.integry.integrywmsnative.core.model;
import androidx.annotation.NonNull;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
public class JtbFasi extends EntityBase {
@SerializedName("codJfas")
private String codJfas;
@SerializedName("codJfasParent")
private String codJfasParent;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("descrizEstesa")
private String descrizEstesa;
@SerializedName("codMfas")
private String codMfas;
@SerializedName("pathIcona")
private String pathIcona;
@SerializedName("umAllocazione")
private String umAllocazione;
@SerializedName("maxAllocazione")
private BigDecimal maxAllocazione;
@SerializedName("codJCal")
private String codJCal;
@SerializedName("idJfas")
private String idJfas;
@SerializedName("flagAttivo")
private String flagAttivo;
@SerializedName("flagCheck")
private String flagCheck;
@SerializedName("umProd")
private String umProd;
@SerializedName("prodStd")
private BigDecimal prodStd;
@SerializedName("codMdepLav")
private String codMdepLav;
@SerializedName("tipoProd")
private String tipoProd;
public JtbFasi() {

80
app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java
View File

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -12,85 +13,164 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
public class MtbAart extends EntityBase {
@SerializedName("codMart")
private String codMart;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("untMis")
private String untMis;
@SerializedName("barCode")
private String barCode;
@SerializedName("pesoKg")
private BigDecimal pesoKg;
@SerializedName("qtaCnf")
private BigDecimal qtaCnf;
@SerializedName("codAliq")
private String codAliq;
@SerializedName("codScoArt")
private String codScoArt;
@SerializedName("codTcolUi")
private String codTcolUi;
@SerializedName("codTcolUl")
private String codTcolUl;
@SerializedName("articoloComposto")
private String articoloComposto;
@SerializedName("esposizioneComp")
private String esposizioneComp;
@SerializedName("descrizioneEstesa")
private String descrizioneEstesa;
@SerializedName("codUltForn")
private String codUltForn;
@SerializedName("dataUltCar")
private String dataUltCar;
@SerializedName("valUltCar")
private BigDecimal valUltCar;
@SerializedName("codUltClie")
private String codUltClie;
@SerializedName("dataUltScar")
private String dataUltScar;
@SerializedName("valUltScar")
private BigDecimal valUltScar;
@SerializedName("tipoCodice")
private String tipoCodice;
@SerializedName("note")
private String note;
@SerializedName("posizione")
private String posizione;
@SerializedName("colliPedana")
private BigDecimal colliPedana;
@SerializedName("untMis2")
private String untMis2;
@SerializedName("rapConv2")
private BigDecimal rapConv2;
@SerializedName("flagInclListino")
private String flagInclListino;
@SerializedName("untMis3")
private String untMis3;
@SerializedName("rapConv3")
private BigDecimal rapConv3;
@SerializedName("codMartStat")
private String codMartStat;
@SerializedName("codMcon")
private String codMcon;
@SerializedName("codMgrp")
private String codMgrp;
@SerializedName("codMsfa")
private String codMsfa;
@SerializedName("codMsgr")
private String codMsgr;
@SerializedName("codMstp")
private String codMstp;
@SerializedName("codMtip")
private String codMtip;
@SerializedName("descrizioneStat")
private String descrizioneStat;
@SerializedName("flagStato")
private String flagStato;
@SerializedName("cambioDiviCar")
private BigDecimal cambioDiviCar;
@SerializedName("cambioDiviScar")
private BigDecimal cambioDiviScar;
@SerializedName("ggScadPartita")
private Integer ggScadPartita;
@SerializedName("volumeMc")
private BigDecimal volumeMc;
@SerializedName("flagEsponiPrz")
private String flagEsponiPrz;
@SerializedName("dataUltVar")
private String dataUltVar;
@SerializedName("percSfrido")
private BigDecimal percSfrido;
@SerializedName("codBarreImb")
private String codBarreImb;
@SerializedName("flagCalcPrz")
private String flagCalcPrz;
@SerializedName("esposizioneCompAcq")
private String esposizioneCompAcq;
@SerializedName("flagCalcPrzAcq")
private String flagCalcPrzAcq;
@SerializedName("diacod")
private String diacod;
@SerializedName("plu")
private String plu;
@SerializedName("partIvaProd")
private String partIvaProd;
@SerializedName("ragSocProd")
private String ragSocProd;
@SerializedName("flagRapConvVariabile")
private String flagRapConvVariabile;
@SerializedName("flagMovArtMag")
private String flagMovArtMag;
@SerializedName("flagTracciabilita")
private String flagTracciabilita;
@SerializedName("taraKg")
private BigDecimal taraKg;
@SerializedName("colliStrato")
private BigDecimal colliStrato;
@SerializedName("flagQtaCnfFissa")
private String flagQtaCnfFissa;
@SerializedName("flagColliPedanaFisso")
private String flagColliPedanaFisso;
@SerializedName("codCconCosti")
private String codCconCosti;
@SerializedName("codCconRicavi")
private String codCconRicavi;
@SerializedName("codDgrpArt")
private String codDgrpArt;
@SerializedName("codDiviCar")
private String codDiviCar;
@SerializedName("codDiviScar")
private String codDiviScar;
@SerializedName("codEcrCat")
private String codEcrCat;
@SerializedName("codEcrMcat")
private String codEcrMcat;
@SerializedName("codEcrRep")
private String codEcrRep;
@SerializedName("codEcrStipo")
private String codEcrStipo;
@SerializedName("codEcrTipo")
private String codEcrTipo;
@SerializedName("codGrpBolla")
private String codGrpBolla;
@SerializedName("ingredienti")
private String ingredienti;
@SerializedName("idArtEqui")
private String idArtEqui;
@SerializedName("descrCassa")
private String descrCassa;
@SerializedName("codNcIntracee")
private String codNcIntracee;
@SerializedName("marchio")
private String marchio;
@SerializedName("sezione")
private Integer sezione;
@SerializedName("untMisRifPeso")
private UntMisRifPesoEnum untMisRifPeso;
@SerializedName("qtaEsistente")
private BigDecimal qtaEsistente;
@SerializedName("qtaImpegnata")
private BigDecimal qtaImpegnata;
private BigDecimal numCnfEsistente;
private BigDecimal numCnfImpegnata;

6
app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java
View File

@@ -1,12 +1,18 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
public class MtbAartBarCode extends EntityBase {
@SerializedName("codBarre")
private String codBarre;
@SerializedName("codMart")
private String codMart;
@SerializedName("qtaCnf")
private BigDecimal qtaCnf;
@SerializedName("flagPrimario")
private String flagPrimario;
@SerializedName("tipoCodBarre")
private String tipoCodBarre;
public MtbAartBarCode() {

50
app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java
View File

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
@@ -11,55 +12,102 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
public class MtbColr extends EntityBase {
@SerializedName("gestione")
private String gestione;
@SerializedName("serCollo")
private String serCollo;
@SerializedName("numCollo")
private Integer numCollo;
@SerializedName("dataCollo")
private String dataCollo;
@SerializedName("riga")
private Integer riga;
@SerializedName("rigaOrd")
private Integer rigaOrd;
@SerializedName("codMart")
private String codMart;
@SerializedName("codBarre")
private String codBarre;
@SerializedName("codCol")
private String codCol;
@SerializedName("codTagl")
private String codTagl;
@SerializedName("partitaMag")
private String partitaMag;
@SerializedName("gestioneRif")
private String gestioneRif;
@SerializedName("serColloRif")
private String serColloRif;
@SerializedName("note")
private String note;
@SerializedName("dataOrd")
private LocalDate dataOrd;
@SerializedName("dataColloRif")
private String dataColloRif;
@SerializedName("qtaCnf")
private BigDecimal qtaCnf;
@SerializedName("qtaCol")
private BigDecimal qtaCol;
@SerializedName("numOrd")
private Integer numOrd;
@SerializedName("numEtich")
private Integer numEtich;
@SerializedName("numColloRif")
private Integer numColloRif;
@SerializedName("datetimeRow")
private String datetimeRow;
@SerializedName("codJcom")
private String codJcom;
@SerializedName("numCnf")
private BigDecimal numCnf;
@SerializedName("insPartitaMag")
private String insPartitaMag;
@SerializedName("mtbPartitaMag_descrizione")
private String mtbPartitaMag_descrizione;
@SerializedName("dataScadPartita")
private LocalDate dataScadPartita;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("untMis")
private String untMis;
@SerializedName("causale")
private Integer causale;
@SerializedName("utente")
private String utente;
@SerializedName("codAnagDoc")
private String codAnagDoc;
@SerializedName("codDtipDoc")
private String codDtipDoc;
@SerializedName("dataDoc")
private String dataDoc;
@SerializedName("serDoc")
private String serDoc;
@SerializedName("numDoc")
private Integer numDoc;
@SerializedName("idRigaDoc")
private Integer idRigaDoc;
@SerializedName("pesoNettoKg")
private BigDecimal pesoNettoKg;
@SerializedName("pesoLordoKg")
private BigDecimal pesoLordoKg;
@SerializedName("barcodeUlIn")
private String barcodeUlIn;
@SerializedName("barcodeUlOut")
private String barcodeUlOut;
@SerializedName("codMdepIn")
private String codMdepIn;
@SerializedName("codMdepOut")
private String codMdepOut;
@SerializedName("posizioneIn")
private String posizioneIn;
@SerializedName("posizioneOut")
private String posizioneOut;
@SerializedName("mtbAart")
private MtbAart mtbAart;
@SerializedName("mtbPartitaMag")
private MtbPartitaMag mtbPartitaMag;

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

@@ -7,6 +7,7 @@ import androidx.lifecycle.MutableLiveData;
import com.annimon.stream.Optional;
import com.annimon.stream.Stream;
import com.google.gson.annotations.SerializedName;
import org.jetbrains.annotations.Nullable;
@@ -30,49 +31,88 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
*/
public class MtbColt extends EntityBase {
@SerializedName("gestione")
private String gestione;
@SerializedName("dataCollo")
private String dataCollo;
@SerializedName("serCollo")
private String serCollo;
@SerializedName("numCollo")
private Integer numCollo;
@SerializedName("rifOrd")
private String rifOrd;
@SerializedName("codAnag")
private String codAnag;
@SerializedName("codVdes")
private String codVdes;
@SerializedName("codMdep")
private String codMdep;
@SerializedName("codVlis")
private String codVlis;
@SerializedName("codDtip")
private String codDtip;
@SerializedName("codTcol")
private String codTcol;
@SerializedName("serDoc")
private String serDoc;
@SerializedName("filtroOrdini")
private String filtroOrdini;
@SerializedName("preparatoDa")
private String preparatoDa;
@SerializedName("annotazioni")
private String annotazioni;
@SerializedName("posizione")
private String posizione;
@SerializedName("codDtipProvv")
private String codDtipProvv;
@SerializedName("serDocProvv")
private String serDocProvv;
@SerializedName("codJfas")
private String codJfas;
@SerializedName("dataOrd")
private String dataOrd;
@SerializedName("dataDoc")
private String dataDoc;
@SerializedName("oraInizPrep")
private String oraInizPrep;
@SerializedName("oraFinePrep")
private String oraFinePrep;
@SerializedName("dataDocProvv")
private String dataDocProvv;
@SerializedName("dataVers")
private String dataVers;
@SerializedName("segno")
private Integer segno;
@SerializedName("numOrd")
private Integer numOrd;
@SerializedName("numDoc")
private Integer numDoc;
@SerializedName("numDocProvv")
private Integer numDocProvv;
@SerializedName("pesoKg")
private BigDecimal pesoKg;
@SerializedName("pesoNettoKg")
private BigDecimal pesoNettoKg;
@SerializedName("lunghezzaCm")
private BigDecimal lunghezzaCm;
@SerializedName("larghezzaCm")
private BigDecimal larghezzaCm;
@SerializedName("altezzaCm")
private BigDecimal altezzaCm;
@SerializedName("codJcom")
private String codJcom;
@SerializedName("barcodeUl")
private String barcodeUl;
private final transient MutableLiveData<ObservableMtbTcol> mtbTCol = new MutableLiveData<>();
@SerializedName("disablePrint")
private Boolean disablePrint;
@SerializedName("ragSocCliente")
private String ragSocCliente;
@SerializedName("mtbColr")
private ObservableArrayList<MtbColr> mtbColr = new ObservableArrayList<>();
public ObservableArrayList<MtbColr> getMtbColr() {

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

@@ -1,39 +1,65 @@
package it.integry.integrywmsnative.core.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
public class MtbDepo extends EntityBase {
@SerializedName("codMdep")
private String codMdep;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("flagVal")
private String flagVal;
@SerializedName("codAnag")
private String codAnag;
@SerializedName("percDepo")
private BigDecimal percDepo;
@SerializedName("valDepo")
private BigDecimal valDepo;
@SerializedName("indirizzo")
private String indirizzo;
@SerializedName("cap")
private String cap;
@SerializedName("citta")
private String citta;
@SerializedName("prov")
private String prov;
@SerializedName("tel")
private String tel;
@SerializedName("nazione")
private String nazione;
@SerializedName("fax")
private String fax;
@SerializedName("eMail")
private String eMail;
@SerializedName("sitoWeb")
private String sitoWeb;
@SerializedName("codVdes")
private String codVdes;
@SerializedName("serie")
private String serie;
@SerializedName("flagMovimentabile")
private String flagMovimentabile;
@SerializedName("codJfas")
private String codJfas;
@SerializedName("codVlis")
private String codVlis;
@SerializedName("codCcau")
private String codCcau;
@SerializedName("codCcon")
private String codCcon;
@SerializedName("codDtip")
private String codDtip;
@SerializedName("codDtipFat")
private String codDtipFat;
@SerializedName("flagContoVendita")
private String flagContoVendita;
@SerializedName("flagTipoNegozio")
private String flagTipoNegozio;
@SerializedName("codMdepReso")
private String codMdepReso;

8
app/src/main/java/it/integry/integrywmsnative/core/model/MtbGrup.java
View File

@@ -1,16 +1,24 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.util.ArrayList;
import java.util.List;
public class MtbGrup extends EntityBase {
@SerializedName("codMgrp")
private String codMgrp;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("flagValMag")
private String flagValMag;
@SerializedName("logoWeb")
private String logoWeb;
@SerializedName("criterioVal")
private String criterioVal;
@SerializedName("tipoMgrp")
private String tipoMgrp;
@SerializedName("mtbSgrp")
private List<MtbSgrp> mtbSgrp = new ArrayList<>();
public MtbGrup() {

22
app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvenr.java
View File

@@ -1,31 +1,53 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
public class MtbInvenr extends EntityBase {
@SerializedName("idInventario")
private Long idInventario;
@SerializedName("idRiga")
private Integer idRiga;
@SerializedName("codMdep")
private String codMdep;
@SerializedName("codMart")
private String codMart;
@SerializedName("codCol")
private String codCol;
@SerializedName("codTagl")
private String codTagl;
@SerializedName("qtaInv")
private BigDecimal qtaInv;
@SerializedName("dataOraInv")
private LocalDateTime dataOraInv;
@SerializedName("costoInv")
private BigDecimal costoInv;
@SerializedName("giacenzaConf")
private BigDecimal giacenzaConf;
@SerializedName("giacenzaDb")
private BigDecimal giacenzaDb;
@SerializedName("idDisp")
private String idDisp;
@SerializedName("dataCreate")
private Date dataCreate;
@SerializedName("numConf")
private BigDecimal numConf;
@SerializedName("partitaMag")
private String partitaMag;
@SerializedName("scanCodBarre")
private String scanCodBarre;
@SerializedName("zona")
private String zona;
@SerializedName("dataInventario")
private Date dataInventario;
@SerializedName("regolaCalcoloCosto")
private String regolaCalcoloCosto;
@SerializedName("dataScadPartitaMag")
private Date dataScadPartitaMag;
@SerializedName("mtbPartitaMag")
private MtbPartitaMag mtbPartitaMag;
public MtbInvenr() {

25
app/src/main/java/it/integry/integrywmsnative/core/model/MtbInvent.java
View File

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -7,29 +8,53 @@ import java.util.List;
public class MtbInvent extends EntityBase {
@SerializedName("idInventario")
private Long idInventario;
@SerializedName("codMdep")
private String codMdep;
@SerializedName("dataInventario")
private LocalDate dataInventario;
@SerializedName("dataReg")
private LocalDateTime dataReg;
@SerializedName("dataVer")
private LocalDateTime dataVer;
@SerializedName("filtro")
private String filtro;
@SerializedName("flagStato")
private String flagStato;
@SerializedName("flagOperazione")
private String flagOperazione;
@SerializedName("codAnag")
private String codAnag;
@SerializedName("codDtip")
private String codDtip;
@SerializedName("inseritoDa")
private String inseritoDa;
@SerializedName("registratoDa")
private String registratoDa;
@SerializedName("tipoGiacenza")
private String tipoGiacenza;
@SerializedName("tipoVerifica")
private String tipoVerifica;
@SerializedName("verificatoDa")
private String verificatoDa;
@SerializedName("dataIns")
private Date dataIns;
@SerializedName("dataDoc")
private Date dataDoc;
@SerializedName("serDoc")
private String serDoc;
@SerializedName("numDoc")
private Integer numDoc;
@SerializedName("regolaCalcoloCosto")
private String regolaCalcoloCosto;
@SerializedName("dataOraInizio")
private LocalDateTime dataOraInizio;
@SerializedName("dataOraFine")
private LocalDateTime dataOraFine;
@SerializedName("causale")
private String causale;
@SerializedName("mtbInvenr")
private List<MtbInvenr> mtbInvenr;
public MtbInvent() {

23
app/src/main/java/it/integry/integrywmsnative/core/model/MtbPartitaMag.java
View File

@@ -1,32 +1,55 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
public class MtbPartitaMag extends EntityBase {
@SerializedName("codMart")
private String codMart;
@SerializedName("partitaMag")
private String partitaMag;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("dataIns")
private LocalDateTime dataIns;
@SerializedName("dataScad")
private LocalDate dataScad;
@SerializedName("scelta")
private Integer scelta;
@SerializedName("costoUntUmMag")
private BigDecimal costoUntUmMag;
@SerializedName("valUntUmMag")
private BigDecimal valUntUmMag;
@SerializedName("taraCnfKg")
private BigDecimal taraCnfKg;
@SerializedName("qtaCnf")
private BigDecimal qtaCnf;
@SerializedName("flagImballoArendere")
private String flagImballoArendere;
@SerializedName("flagStato")
private String flagStato;
@SerializedName("codDiviCont")
private String codDiviCont;
@SerializedName("cambioDiviCont")
private BigDecimal cambioDiviCont;
@SerializedName("barcode")
private String barcode;
@SerializedName("note")
private String note;
@SerializedName("rapConv2")
private BigDecimal rapConv2;
@SerializedName("rapConv3")
private BigDecimal rapConv3;
@SerializedName("posizione")
private String posizione;
@SerializedName("dataAggPrz")
private String dataAggPrz;
@SerializedName("partitaMagSec")
private String partitaMagSec;
@SerializedName("qtaAttesa")
private BigDecimal qtaAttesa;
public MtbPartitaMag() {

6
app/src/main/java/it/integry/integrywmsnative/core/model/MtbSfam.java
View File

@@ -1,10 +1,16 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
public class MtbSfam extends EntityBase {
@SerializedName("codMgrp")
private String codMgrp;
@SerializedName("codMsgr")
private String codMsgr;
@SerializedName("codMsfa")
private String codMsfa;
@SerializedName("descrizione")
private String descrizione;
public MtbSfam() {

11
app/src/main/java/it/integry/integrywmsnative/core/model/MtbSgrp.java
View File

@@ -1,19 +1,30 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.util.ArrayList;
import java.util.List;
public class MtbSgrp extends EntityBase {
@SerializedName("codMgrp")
private String codMgrp;
@SerializedName("codMsgr")
private String codMsgr;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("inclInStat")
private String inclInStat;
@SerializedName("contoRimFin")
private String contoRimFin;
@SerializedName("ordinamento")
private Integer ordinamento;
@SerializedName("chkGiacenzaNeg")
private Boolean chkGiacenzaNeg;
@SerializedName("flagReso")
private Boolean flagReso;
@SerializedName("codCconWip")
private String codCconWip;
@SerializedName("mtbSfam")
private List<MtbSfam> mtbSfam = new ArrayList<>();
public MtbSgrp() {

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

@@ -1,14 +1,21 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
public class MtbUntMis extends EntityBase {
@SerializedName("untMis")
private String untMis;
@SerializedName("flagDig")
private String flagDig;
@SerializedName("cifreDec")
private BigDecimal cifreDec;
@SerializedName("tipoUm")
private String tipoUm;
@SerializedName("flagUnitaKg")
private String flagUnitaKg;
@SerializedName("flagAttivo")
private String flagAttivo;
public MtbUntMis() {

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

@@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import org.apache.commons.lang3.StringUtils;
import java.time.LocalDate;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
@@ -13,7 +15,11 @@ public class OrdineInevasoDTO {
@SerializedName("numero")
private Integer numOrd;
@SerializedName("gestione")
private String gestione;
@SerializedName("codMdep")
private String codMdep;
public LocalDate getDataOrd() {
@@ -65,7 +71,7 @@ public class OrdineInevasoDTO {
return getDataOrd().equals(that.getDataOrd()) &&
getNumOrd().equals(that.getNumOrd()) &&
getGestione().equals(that.getGestione()) &&
getCodMdep().equals(that.getCodMdep());
StringUtils.equalsIgnoreCase(getCodMdep(), that.getCodMdep());
}
@Override

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

@@ -1,18 +1,32 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
public class StbGestSetup extends EntityBase{
@SerializedName("gestName")
private String gestName;
@SerializedName("section")
private String section;
@SerializedName("keySection")
private String keySection;
@SerializedName("value")
private String value;
@SerializedName("description")
private String description;
@SerializedName("flagSync")
private String flagSync;
@SerializedName("queryDefault")
private String queryDefault;
@SerializedName("flagUserView")
private String flagUserView;
@SerializedName("dataModifica")
private String dataModifica;
@SerializedName("modificatoDa")
private String modificatoDa;
@SerializedName("flagSetupDepo")
private String flagSetupDepo;
@SerializedName("flagSetupUserWeb")
private String flagSetupUserWeb;
public StbGestSetup() {

20
app/src/main/java/it/integry/integrywmsnative/core/model/StbMenu.java
View File

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.util.ArrayList;
import java.util.List;
@@ -9,24 +10,43 @@ public class StbMenu extends EntityBase {
this.type = "stb_menu";
}
@SerializedName("codOpz")
private String codOpz;
@SerializedName("codParent")
private String codParent;
@SerializedName("tipoAzienda")
private String tipoAzienda;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("descrizioneEstesa")
private String descrizioneEstesa;
@SerializedName("entityName")
private String entityName;
@SerializedName("flagAttivo")
private String flagAttivo;
@SerializedName("flagPrinterSetup")
private String flagPrinterSetup;
@SerializedName("gestName")
private String gestName;
@SerializedName("note")
private String note;
@SerializedName("objectType")
private String objectType;
@SerializedName("openType")
private String openType;
@SerializedName("parameter")
private String parameter;
@SerializedName("pictureMenu")
private String pictureMenu;
@SerializedName("pictureSelect")
private String pictureSelect;
@SerializedName("pos")
private Integer pos;
@SerializedName("posCliente")
private Integer posCliente;
@SerializedName("posTipoAzienda")
private Integer posTipoAzienda;
@SerializedName("urlDescrizione")
private String urlDescrizione;
private final List<StbMenu> stbMenuChildren = new ArrayList<>();

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

@@ -3,6 +3,8 @@ package it.integry.integrywmsnative.core.model;
import android.os.Parcel;
import android.os.Parcelable;
import com.google.gson.annotations.SerializedName;
public class VtbDest extends EntityBase implements Parcelable {
@@ -10,20 +12,28 @@ public class VtbDest extends EntityBase implements Parcelable {
type = "vtb_dest";
}
@SerializedName("codAnag")
private String codAnag;
@SerializedName("codVdes")
private String codVdes;
@SerializedName("destinatario")
private String destinatario;
@SerializedName("indirizzo")
private String indirizzo;
@SerializedName("cap")
private String cap;
@SerializedName("citta")
private String citta;
@SerializedName("prov")
private String prov;
@SerializedName("nazione")
private String nazione;

9
app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java
View File

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
public class VtbVetr extends EntityBase {
@@ -8,13 +9,21 @@ public class VtbVetr extends EntityBase {
type = "vtb_vetr";
}
@SerializedName("codVvet")
private String codVvet;
@SerializedName("codSpes")
private String codSpes;
@SerializedName("idRiga")
private String idRiga;
@SerializedName("daQta")
private BigDecimal daQta;
@SerializedName("aQta")
private BigDecimal aQta;
@SerializedName("impUnt")
private BigDecimal impUnt;
@SerializedName("impFisso")
private BigDecimal impFisso;
@SerializedName("codDivi")
private String codDivi;
public String getCodVvet() {

20
app/src/main/java/it/integry/integrywmsnative/core/model/VtbVett.java
View File

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.util.List;
@@ -9,24 +10,43 @@ public class VtbVett extends EntityBase {
type = "vtb_vett";
}
@SerializedName("codVvet")
private String codVvet;
@SerializedName("codLettVett")
private String codLettVett;
@SerializedName("codAnag")
private String codAnag;
@SerializedName("ragSoc")
private String ragSoc;
@SerializedName("indirizzo")
private String indirizzo;
@SerializedName("cap")
private String cap;
@SerializedName("citta")
private String citta;
@SerializedName("prov")
private String prov;
@SerializedName("nazione")
private String nazione;
@SerializedName("telefono")
private String telefono;
@SerializedName("fax")
private String fax;
@SerializedName("partIva")
private String partIva;
@SerializedName("note")
private String note;
@SerializedName("eMail")
private String eMail;
@SerializedName("modStamp")
private String modStamp;
@SerializedName("coefVol")
private BigDecimal coefVol;
@SerializedName("flagAttivo")
private String flagAttivo;
@SerializedName("numAutoriz")
private String numAutoriz;
@SerializedName("vtbVetr")
private List<VtbVetr> vtbVetr;

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

@@ -1,5 +1,6 @@
package it.integry.integrywmsnative.core.rest.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
@@ -9,42 +10,79 @@ import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
@SerializedName("idViaggio")
private Integer idViaggio;
@SerializedName("listino")
private String listino;
@SerializedName("termCons")
private String termCons;
@SerializedName("codAuto")
private String codAuto;
@SerializedName("descrizioneAuto")
private String descrizioneAuto;
@SerializedName("codVvet")
private String codVvet;
@SerializedName("descrizioneVettore")
private String descrizioneVettore;
@SerializedName("dataInizTrasp")
private LocalDate dataInizTrasp;
@SerializedName("descrizionePaga")
private String descrizionePaga;
@SerializedName("rifOrd")
private String rifOrd;
@SerializedName("codAnagOrd")
private String codAnagOrd;
@SerializedName("codJcom")
private String codJcom;
@SerializedName("descrizioneCom")
private String descrizioneCom;
@SerializedName("ragSocCom")
private String ragSocCom;
@SerializedName("ragSocOrd")
private String ragSocOrd;
@SerializedName("destinatario")
private String destinatario;
@SerializedName("codVdes")
private String codVdes;
@SerializedName("citta")
private String citta;
@SerializedName("provincia")
private String provincia;
@SerializedName("indirizzo")
private String indirizzo;
@SerializedName("pesoTotale")
private BigDecimal pesoTotale;
@SerializedName("numCnfdaEvadere")
private BigDecimal numCnfdaEvadere;
@SerializedName("numCnfDisp")
private BigDecimal numCnfDisp;
@SerializedName("dataCons")
private LocalDate dataCons;
@SerializedName("barcode")
private String barcode;
@SerializedName("numRighe")
private Integer numRighe;
@SerializedName("righeInPartenza")
private Integer righeInPartenza;
@SerializedName("saldoContabile")
private BigDecimal saldoContabile;
@SerializedName("codVzon")
private String codVzon;
@SerializedName("ragSocOrdV")
private String ragSocOrdV;
@SerializedName("colliRiservati")
private int colliRiservati;
private boolean existColloBoolean;
@SerializedName("existCollo")
private boolean existCollo;
@SerializedName("flagEvaso")
private boolean flagEvaso;
@SerializedName("nomeAgente")
private String nomeAgente;
@SerializedName("codJfas")
private String codJfas;
@SerializedName("availableClassMerc")
private List<AvailableClassMerc> availableClassMerc;
@SerializedName("ordTrasf")
private boolean ordTrasf;
public Integer getIdViaggio() {
@@ -317,12 +355,12 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
return this;
}
public boolean isExistColloBoolean() {
return existColloBoolean;
public boolean isExistCollo() {
return existCollo;
}
public OrdineUscitaInevasoDTO setExistColloBoolean(boolean existColloBoolean) {
this.existColloBoolean = existColloBoolean;
public OrdineUscitaInevasoDTO setExistCollo(boolean existCollo) {
this.existCollo = existCollo;
return this;
}
@@ -375,7 +413,9 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
public static class AvailableClassMerc {
@SerializedName("codMgrp")
private String codMgrp;
@SerializedName("codMsgr")
private List<String> codMsgr;
public String getCodMgrp() {
@@ -413,7 +453,7 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
if (!super.equals(o)) return false;
OrdineUscitaInevasoDTO that = (OrdineUscitaInevasoDTO) o;
return getColliRiservati() == that.getColliRiservati() && isExistColloBoolean() == that.isExistColloBoolean() && isFlagEvaso() == that.isFlagEvaso() && isOrdTrasf() == that.isOrdTrasf() && Objects.equals(getIdViaggio(), that.getIdViaggio()) && Objects.equals(getListino(), that.getListino()) && Objects.equals(getTermCons(), that.getTermCons()) && Objects.equals(getCodAuto(), that.getCodAuto()) && Objects.equals(getDescrizioneAuto(), that.getDescrizioneAuto()) && Objects.equals(getCodVvet(), that.getCodVvet()) && Objects.equals(getDescrizioneVettore(), that.getDescrizioneVettore()) && Objects.equals(getDataInizTrasp(), that.getDataInizTrasp()) && Objects.equals(getDescrizionePaga(), that.getDescrizionePaga()) && Objects.equals(getRifOrd(), that.getRifOrd()) && Objects.equals(getCodAnagOrd(), that.getCodAnagOrd()) && Objects.equals(getCodJcom(), that.getCodJcom()) && Objects.equals(getDescrizioneCom(), that.getDescrizioneCom()) && Objects.equals(getRagSocCom(), that.getRagSocCom()) && Objects.equals(getRagSocOrd(), that.getRagSocOrd()) && Objects.equals(getDestinatario(), that.getDestinatario()) && Objects.equals(getCodVdes(), that.getCodVdes()) && Objects.equals(getCitta(), that.getCitta()) && Objects.equals(getProvincia(), that.getProvincia()) && Objects.equals(getIndirizzo(), that.getIndirizzo()) && Objects.equals(getPesoTotale(), that.getPesoTotale()) && Objects.equals(getNumCnfdaEvadere(), that.getNumCnfdaEvadere()) && Objects.equals(getNumCnfDisp(), that.getNumCnfDisp()) && Objects.equals(getDataCons(), that.getDataCons()) && Objects.equals(getBarcode(), that.getBarcode()) && Objects.equals(getNumRighe(), that.getNumRighe()) && Objects.equals(getRigheInPartenza(), that.getRigheInPartenza()) && Objects.equals(getSaldoContabile(), that.getSaldoContabile()) && Objects.equals(getCodVzon(), that.getCodVzon()) && Objects.equals(getRagSocOrdV(), that.getRagSocOrdV()) && Objects.equals(getNomeAgente(), that.getNomeAgente()) && Objects.equals(getCodJfas(), that.getCodJfas()) && Objects.equals(getAvailableClassMerc(), that.getAvailableClassMerc());
return getColliRiservati() == that.getColliRiservati() && isExistCollo() == that.isExistCollo() && isFlagEvaso() == that.isFlagEvaso() && isOrdTrasf() == that.isOrdTrasf() && Objects.equals(getIdViaggio(), that.getIdViaggio()) && Objects.equals(getListino(), that.getListino()) && Objects.equals(getTermCons(), that.getTermCons()) && Objects.equals(getCodAuto(), that.getCodAuto()) && Objects.equals(getDescrizioneAuto(), that.getDescrizioneAuto()) && Objects.equals(getCodVvet(), that.getCodVvet()) && Objects.equals(getDescrizioneVettore(), that.getDescrizioneVettore()) && Objects.equals(getDataInizTrasp(), that.getDataInizTrasp()) && Objects.equals(getDescrizionePaga(), that.getDescrizionePaga()) && Objects.equals(getRifOrd(), that.getRifOrd()) && Objects.equals(getCodAnagOrd(), that.getCodAnagOrd()) && Objects.equals(getCodJcom(), that.getCodJcom()) && Objects.equals(getDescrizioneCom(), that.getDescrizioneCom()) && Objects.equals(getRagSocCom(), that.getRagSocCom()) && Objects.equals(getRagSocOrd(), that.getRagSocOrd()) && Objects.equals(getDestinatario(), that.getDestinatario()) && Objects.equals(getCodVdes(), that.getCodVdes()) && Objects.equals(getCitta(), that.getCitta()) && Objects.equals(getProvincia(), that.getProvincia()) && Objects.equals(getIndirizzo(), that.getIndirizzo()) && Objects.equals(getPesoTotale(), that.getPesoTotale()) && Objects.equals(getNumCnfdaEvadere(), that.getNumCnfdaEvadere()) && Objects.equals(getNumCnfDisp(), that.getNumCnfDisp()) && Objects.equals(getDataCons(), that.getDataCons()) && Objects.equals(getBarcode(), that.getBarcode()) && Objects.equals(getNumRighe(), that.getNumRighe()) && Objects.equals(getRigheInPartenza(), that.getRigheInPartenza()) && Objects.equals(getSaldoContabile(), that.getSaldoContabile()) && Objects.equals(getCodVzon(), that.getCodVzon()) && Objects.equals(getRagSocOrdV(), that.getRagSocOrdV()) && Objects.equals(getNomeAgente(), that.getNomeAgente()) && Objects.equals(getCodJfas(), that.getCodJfas()) && Objects.equals(getAvailableClassMerc(), that.getAvailableClassMerc());
}
@Override
@@ -450,7 +490,7 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
result = 31 * result + Objects.hashCode(getCodVzon());
result = 31 * result + Objects.hashCode(getRagSocOrdV());
result = 31 * result + getColliRiservati();
result = 31 * result + Boolean.hashCode(isExistColloBoolean());
result = 31 * result + Boolean.hashCode(isExistCollo());
result = 31 * result + Boolean.hashCode(isFlagEvaso());
result = 31 * result + Objects.hashCode(getNomeAgente());
result = 31 * result + Objects.hashCode(getCodJfas());

25
app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java
View File

@@ -1,35 +1,60 @@
package it.integry.integrywmsnative.core.rest.model;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.util.HashMap;
public class SitArtOrdDTO {
@SerializedName("codJcom")
private String codJcom;
@SerializedName("codMart")
private String codMart;
@SerializedName("codCol")
private String codCol;
@SerializedName("codTagl")
private String codTagl;
@SerializedName("codAlis")
private String codAlis;
@SerializedName("codArtFor")
private String codArtFor;
@SerializedName("partitaMag")
private String partitaMag;
@SerializedName("qtaOrd")
private BigDecimal qtaOrd;
@SerializedName("numCnfOrd")
private BigDecimal numCnfOrd;
@SerializedName("qtaCnfOrd")
private BigDecimal qtaCnfOrd;
@SerializedName("idViaggio")
private String idViaggio;
@SerializedName("codMdep")
private String codMdep;
@SerializedName("flagEnablePickManuale")
private boolean flagEnablePickManuale;
@SerializedName("flagEnableScanArt")
private boolean flagEnableScanArt;
@SerializedName("codMgrp")
private String codMgrp;
@SerializedName("descrizioneMgrp")
private String descrizioneMgrp;
@SerializedName("codMsgr")
private String codMsgr;
@SerializedName("descrizioneMsgr")
private String descrizioneMsgr;
@SerializedName("codMsfa")
private String codMsfa;
@SerializedName("descrizioneMsfa")
private String descrizioneMsfa;
@SerializedName("untord")
private String untord;
@SerializedName("qtaOmg")
private BigDecimal qtaOmg;
@SerializedName("qtaArrivo")
private BigDecimal qtaArrivo;
@SerializedName("extraInfo")
private final HashMap<String, Object> extraInfo = new HashMap<>();
public String getCodJcom() {

26
app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/ArticoloDTO.java
View File

@@ -1,33 +1,59 @@
package it.integry.integrywmsnative.core.rest.model.articolo;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
public class ArticoloDTO {
@SerializedName("codMart")
private String codMart;
@SerializedName("descrizione")
private String descrizione;
@SerializedName("untMis")
private String untMis;
@SerializedName("barcode")
private String barcode;
@SerializedName("qtaCnf")
private BigDecimal qtaCnf;
@SerializedName("codAliq")
private String codAliq;
@SerializedName("articoloComposto")
private String articoloComposto;
@SerializedName("descrizioneEstesa")
private String descrizioneEstesa;
@SerializedName("note")
private String note;
@SerializedName("posizione")
private String posizione;
@SerializedName("codMgrp")
private String codMgrp;
@SerializedName("codMsfa")
private String codMsfa;
@SerializedName("codMsgr")
private String codMsgr;
@SerializedName("codMstp")
private String codMstp;
@SerializedName("codMtip")
private String codMtip;
@SerializedName("flagStato")
private boolean flagStato;
@SerializedName("barcodeImballo")
private String barcodeImballo;
@SerializedName("diacod")
private String diacod;
@SerializedName("flagQtaCnfFissa")
private boolean flagQtaCnfFissa;
@SerializedName("idArtEqui")
private String idArtEqui;
@SerializedName("flagKit")
private boolean flagKit;
@SerializedName("precode")
private String precode;
@SerializedName("gruppo")
private String gruppo;
@SerializedName("sottoGruppo")
private String sottoGruppo;
@SerializedName("sottoFamiglia")
private String sottoFamiglia;
public String getCodMart() {

2
app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/RetrieveArticoloByCodMartRequestDTO.java
View File

@@ -1,9 +1,11 @@
package it.integry.integrywmsnative.core.rest.model.articolo;
import com.google.gson.annotations.SerializedName;
import java.util.List;
public class RetrieveArticoloByCodMartRequestDTO {
@SerializedName("codMarts")
private List<String> codMarts;
public List<String> getCodMarts() {

3
app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloRequestDTO.java
View File

@@ -1,6 +1,9 @@
package it.integry.integrywmsnative.core.rest.model.articolo;
import com.google.gson.annotations.SerializedName;
public class SaveArticoloRequestDTO {
@SerializedName("artToSave")
private ArticoloDTO artToSave;
public ArticoloDTO getArtToSave() {

3
app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SaveArticoloResponseDTO.java
View File

@@ -1,6 +1,9 @@
package it.integry.integrywmsnative.core.rest.model.articolo;
import com.google.gson.annotations.SerializedName;
public class SaveArticoloResponseDTO {
@SerializedName("codMart")
private String codMart;
public String getCodMart() {

4
app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/SearchArticoloByBarcodeRequestDTO.java
View File

@@ -1,8 +1,12 @@
package it.integry.integrywmsnative.core.rest.model.articolo;
import com.google.gson.annotations.SerializedName;
public class SearchArticoloByBarcodeRequestDTO {
@SerializedName("barcode")
private String barcode;
@SerializedName("onlyActive")
private boolean onlyActive;
public String getBarcode() {

4
app/src/main/java/it/integry/integrywmsnative/core/rest/model/articolo/UpdateBarcodeImballoRequestDTO.java
View File

@@ -1,9 +1,13 @@
package it.integry.integrywmsnative.core.rest.model.articolo;
import com.google.gson.annotations.SerializedName;
public class UpdateBarcodeImballoRequestDTO {
@SerializedName("codMart")
private String codMart;
@SerializedName("newBarcodeImballo")
private String newBarcodeImballo;
public String getCodMart() {

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

@@ -20,7 +20,7 @@ public class OrdiniUscitaElencoDTO extends OrdineUscitaInevasoDTO {
public void initEtichettaStatoColor(Context context) {
if (isFlagEvaso()) {
this.etichettaStatoColor = ResourcesCompat.getColor(context.getResources(), R.color.mainGreen, null);
} else if (isExistColloBoolean()) {
} else if (isExistCollo()) {
this.etichettaStatoColor = ResourcesCompat.getColor(context.getResources(), R.color.colorPrimary, null);
} else {
this.etichettaStatoColor = ResourcesCompat.getColor(context.getResources(), android.R.color.transparent, null);
@@ -62,7 +62,7 @@ public class OrdiniUscitaElencoDTO extends OrdineUscitaInevasoDTO {
.setCodVzon(that.getCodVzon())
.setRagSocOrdV(that.getRagSocOrdV())
.setColliRiservati(that.getColliRiservati())
.setExistColloBoolean(that.isExistColloBoolean())
.setExistCollo(that.isExistCollo())
.setFlagEvaso(that.isFlagEvaso())
.setNomeAgente(that.getNomeAgente())
.setCodJfas(that.getCodJfas())

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

@@ -189,10 +189,8 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
this.initMtbGrupsCache();
this.initJtbComtCache();
handler.post(() -> {
mAppliedFilterViewModel.init(data);
mAppliedFilterViewModel.init(data);
// this.refreshList(data, null);
});
this.onLoadingEnded();
} catch (Exception e) {

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

@@ -44,7 +44,7 @@ public class OrdiniUscitaElencoFiltroViewModel {
public void init(List<OrdiniUscitaElencoDTO> initialList) {
this.initialOrderList = initialList;
this.currentFilteredOrderList.setValue(this.initialOrderList);
this.currentFilteredOrderList.postValue(this.initialOrderList);
}
public MutableLiveData<List<OrdiniUscitaElencoDTO>> getMutableFilteredOrderList() {

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

@@ -2051,7 +2051,7 @@ public class SpedizioneViewModel {
for (MtbColt mtbColt : mtbColtList) {
mTestateOrdini.stream()
.filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrd().isEqual(mtbColt.getDataOrdLD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum())
.forEach(x -> x.setExistColloBoolean(true));
.forEach(x -> x.setExistCollo(true));
}
}

3
app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
View File

@@ -103,8 +103,7 @@
tools:text="Cod Jcom"
app:visibilityWhenNotNull="@{item.codJcom}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/right_descrizione"
app:layout_constraintBaseline_toBaselineOf="@id/sub_descrizione" />
app:layout_constraintTop_toBottomOf="@id/right_descrizione" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>