From afd7ae25f3ce48678ad7c83cecac8baccaa5b45e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 6 Jun 2025 17:42:22 +0200 Subject: [PATCH] Allineata UI di qta_layout. Aggiunti @SerializedName su altri DTO. --- app/build.gradle | 2 +- app/proguard-rules.pro | 24 +- .../ObservableArrayListDataTypeAdapter.java | 87 ++++++ .../integrywmsnative/core/model/MtbAart.java | 10 +- .../core/model/MtbAartBarCode.java | 17 ++ .../core/model/MtbUntMis.java | 28 +- .../deserializer/MtbColrListDeserializer.java | 1 + .../core/utility/UtilityGson.java | 4 + .../core/utility/data/MtbColrUtils.java | 25 ++ .../core/utility/{ => data}/UntMisUtils.java | 2 +- .../AccettazioneBollaPickingActivity.java | 2 +- .../gest/contab_doc_interni/dto/ArtDTO.java | 16 ++ .../dto/CheckFornitoreDTO.java | 6 + .../gest/contab_doc_interni/dto/ColloDTO.java | 28 ++ .../dto/DocInterniSetupDTO.java | 5 + .../contab_doc_interni/dto/DocSetupDTO.java | 4 - .../contab_doc_interni/dto/FornitoreDTO.java | 8 + .../dto/GrigliaAcquistiChildDTO.java | 34 +++ .../dto/GrigliaArticoliDTO.java | 36 --- .../dto/GruppoArticoloDTO.java | 6 + .../contab_doc_interni/dto/InventarioDTO.java | 4 + .../contab_doc_interni/dto/OrdineDTO.java | 7 + .../dto/PropostaOrdineDTO.java | 98 ------- .../dto/RetrieveLottiDTO.java | 8 + .../gest/contab_doc_interni/dto/SaveDTO.java | 26 ++ .../contab_doc_interni/dto/TipoDocDTO.java | 17 +- .../ui/ContenutoBancaleListAdapter.java | 32 --- .../ui/PickingLiberoListAdapter.java | 18 -- .../dto/ArticoloFornitoreDTO.java | 32 --- .../rettifica_giacenze/dto/FornitoreDTO.java | 6 + ...hArticoloByBarcodeOrCodMartRequestDTO.java | 3 + ...ArticoloByBarcodeOrCodMartResponseDTO.java | 12 + ...loByCodArtFornOrDescrizioneRequestDTO.java | 4 + ...oByCodArtFornOrDescrizioneResponseDTO.java | 4 + .../ui/RettificaGiacenzeMainListAdapter.java | 17 -- .../gest/spedizione/SpedizioneActivity.java | 2 +- .../gest/spedizione/SpedizioneViewModel.java | 2 +- .../DialogBasketLU_Page2_ListAdapter.java | 17 -- ..._sheet_fragment__lu_content__list_item.xml | 51 ++-- .../dialog_basket_lu__mtb_colr_model.xml | 86 +++--- ...se_arts_from_mtb_colr_list__item_model.xml | 59 ++-- .../layout/dialog_info_giacenza_list_item.xml | 216 ++++++++------- ...alog_info_giacenza_situazione_articolo.xml | 2 +- ...ituazione_articolo_available_list_item.xml | 256 ++++++++++-------- ...situazione_articolo_incoming_list_item.xml | 48 ++-- .../res/layout/fragment_picking_libero.xml | 8 +- .../lista_contenuto_bancale_list_model.xml | 52 ++-- .../lista_picking_libero_list_model.xml | 175 ++++++------ .../layout/lista_rettifica_giacenze_model.xml | 83 +++--- .../prod_recupero_materiale_list_item.xml | 7 +- barcode_base_android_library/build.gradle | 6 +- honeywellscannerlibrary/build.gradle | 3 + keyobardemulatorscannerlibrary/build.gradle | 3 + pointmobilescannerlibrary/build.gradle | 3 + zebrascannerlibrary/build.gradle | 3 + 55 files changed, 978 insertions(+), 737 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/di/ObservableArrayListDataTypeAdapter.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbColrListDeserializer.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/utility/data/MtbColrUtils.java rename app/src/main/java/it/integry/integrywmsnative/core/utility/{ => data}/UntMisUtils.java (86%) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocSetupDTO.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/PropostaOrdineDTO.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/ArticoloFornitoreDTO.java diff --git a/app/build.gradle b/app/build.gradle index 54cbe25f..9efc06c9 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/proguard-rules.pro b/app/proguard-rules.pro index 244f8ecf..3f1288d2 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,14 +18,17 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile +-renamesourcefileattribute SourceFile # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) +-dontwarn android.os.ServiceManager + + -keep class io.jsonwebtoken.** { *; } -dontwarn io.jsonwebtoken.** @@ -43,4 +46,19 @@ -keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken -keep class it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; } --keep class * extends it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; } \ No newline at end of file +-keep class * extends it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; } +-keep class * extends it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView { *; } +-keep class * implements it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface { *; } + +# Regole ProGuard per Gson e classi modello +-keepattributes Signature +-keepattributes InnerClasses + +# Se usi ObservableArrayList o altre classi specifiche di AndroidX Data Binding con Gson, +# potresti aver bisogno di mantenerle esplicitamente se non sono coperte sopra. +-keep class androidx.databinding.ObservableArrayList { *; } +-keepclassmembers class androidx.databinding.ObservableArrayList { *; } + + + +-keep class * implements it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.IDialogAskClienteViewModel { *; } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/ObservableArrayListDataTypeAdapter.java b/app/src/main/java/it/integry/integrywmsnative/core/di/ObservableArrayListDataTypeAdapter.java new file mode 100644 index 00000000..0dc740b5 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/ObservableArrayListDataTypeAdapter.java @@ -0,0 +1,87 @@ +package it.integry.integrywmsnative.core.di; + +import android.os.Handler; +import android.os.Looper; + +import androidx.databinding.ObservableArrayList; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; + +/** + * Classe che gestisce la serializzazione e deserializzazione di MutableListLiveData con Gson + * + * @param tipo degli elementi nella lista + */ +public class ObservableArrayListDataTypeAdapter implements JsonSerializer>, JsonDeserializer> { + + private final Handler handler = new Handler(Looper.getMainLooper()); + + /** + * Serializza un oggetto MutableListLiveData in un JsonElement + */ + @Override + public JsonElement serialize(ObservableArrayList src, Type typeOfSrc, JsonSerializationContext context) { + // Ottiene la lista interna da MutableListLiveData e la serializza + ArrayList list = new ArrayList<>(src); + return context.serialize(list); + } + + /** + * Deserializza un JsonElement in un oggetto MutableListLiveData + */ + @Override + public ObservableArrayList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + // Determina il tipo degli elementi nella lista + Type listType = getListType(typeOfT); + + // Deserializza il JsonElement in una lista + List list = context.deserialize(json, listType); + if (list == null) { + list = new ArrayList<>(); + } + + // Crea una nuova istanza di MutableListLiveData e aggiunge tutti gli elementi + ObservableArrayList result = new ObservableArrayList<>(); + + result.addAll(list); + return result; + } + + /** + * Estrae il tipo della lista da un tipo parametrizzato di MutableListLiveData + */ + private Type getListType(Type mutableListLiveDataType) { + if (mutableListLiveDataType instanceof ParameterizedType) { + ParameterizedType parameterizedType = (ParameterizedType) mutableListLiveDataType; + Type[] typeArguments = parameterizedType.getActualTypeArguments(); + if (typeArguments.length > 0) { + // Crea un tipo di List usando il parametro di tipo T + return TypeToken.getParameterized(List.class, typeArguments[0]).getType(); + } + } + + // Fallback per List se non riusciamo a determinare il tipo + return TypeToken.getParameterized(List.class, Object.class).getType(); + } + + /** + * Crea un'istanza del TypeAdapter per MutableListLiveData + * + * @param elementType il tipo T degli elementi nella lista + * @return un'istanza del TypeAdapter + */ + public static ObservableArrayListDataTypeAdapter create(Type elementType) { + return new ObservableArrayListDataTypeAdapter<>(); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java index 080a0094..c65d42ce 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java @@ -180,8 +180,10 @@ public class MtbAart extends EntityBase { @SerializedName("numCnfImpegnata") private BigDecimal numCnfImpegnata; + @SerializedName("mtbUntMis") private List mtbUntMis; + @SerializedName("mtbAartBarCode") private List mtbAartBarCode; @@ -286,7 +288,13 @@ public class MtbAart extends EntityBase { if (other.mtbUntMis != null) { this.mtbUntMis = new ArrayList<>(); for (MtbUntMis untMis : other.mtbUntMis) { - this.mtbUntMis.add(new MtbUntMis(untMis)); // Assicurati che MtbUntMis abbia un costruttore di copia + this.mtbUntMis.add(untMis.clone()); // Assicurati che MtbUntMis abbia un costruttore di copia + } + } + if (other.mtbAartBarCode != null) { + this.mtbAartBarCode = new ArrayList<>(); + for (MtbAartBarCode mtbAartBarCode : other.mtbAartBarCode) { + this.mtbAartBarCode.add(mtbAartBarCode.clone()); // Assicurati che MtbUntMis abbia un costruttore di copia } } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java index 4310cd53..7ece8f40 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java @@ -19,6 +19,8 @@ public class MtbAartBarCode extends EntityBase { this.type = "mtb_aart_bar_code"; } + + public String getCodBarre() { return codBarre; } @@ -58,4 +60,19 @@ public class MtbAartBarCode extends EntityBase { public void setTipoCodBarre(String tipoCodBarre) { this.tipoCodBarre = tipoCodBarre; } + + /** + * Crea una copia dell'oggetto MtbAartBarCode corrente + * @return Una nuova istanza di MtbAartBarCode con gli stessi valori + */ + @Override + public MtbAartBarCode clone() { + MtbAartBarCode clone = new MtbAartBarCode(); + clone.setCodBarre(this.codBarre); + clone.setCodMart(this.codMart); + clone.setQtaCnf(this.qtaCnf != null ? new BigDecimal(this.qtaCnf.toString()) : null); + clone.setFlagPrimario(this.flagPrimario); + clone.setTipoCodBarre(this.tipoCodBarre); + return clone; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbUntMis.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbUntMis.java index 8aa5ea74..8914d689 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbUntMis.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbUntMis.java @@ -27,18 +27,6 @@ public class MtbUntMis extends EntityBase { this.type = "mtb_unt_mis"; } - // Costruttore di copia - public MtbUntMis(MtbUntMis other) { - this(); - - this.untMis = other.untMis; - this.flagDig = other.flagDig; - this.cifreDec = other.cifreDec; // BigDecimal รจ immutabile - this.tipoUm = other.tipoUm; - this.flagUnitaKg = other.flagUnitaKg; - this.flagAttivo = other.flagAttivo; - } - public String getUntMis() { return untMis; } @@ -97,4 +85,20 @@ public class MtbUntMis extends EntityBase { this.flagAttivo = flagAttivo; return this; } + + /** + * Crea una copia dell'oggetto MtbUntMis corrente + * @return Una nuova istanza di MtbUntMis con gli stessi valori + */ + @Override + public MtbUntMis clone() { + MtbUntMis clone = new MtbUntMis(); + clone.setUntMis(this.untMis); + clone.setFlagDig(this.flagDig); + clone.setCifreDec(this.cifreDec); + clone.setTipoUm(this.tipoUm); + clone.setFlagUnitaKg(this.flagUnitaKg); + clone.setFlagAttivo(this.flagAttivo); + return clone; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbColrListDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbColrListDeserializer.java new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbColrListDeserializer.java @@ -0,0 +1 @@ + diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java index be6d70fe..649b2b46 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.core.utility; +import androidx.databinding.ObservableArrayList; import androidx.lifecycle.MutableLiveData; import com.google.gson.Gson; @@ -11,6 +12,7 @@ import java.time.LocalDateTime; import it.integry.integrywmsnative.core.di.MutableListLiveData; import it.integry.integrywmsnative.core.di.MutableListLiveDataTypeAdapter; +import it.integry.integrywmsnative.core.di.ObservableArrayListDataTypeAdapter; import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag; import it.integry.integrywmsnative.core.rest.deserializer.LocalDateDeserializer; @@ -30,6 +32,7 @@ public class UtilityGson { return new GsonBuilder() .setDateFormat("dd/MM/yyyy HH:mm:ss") .excludeFieldsWithModifiers(Modifier.TRANSIENT) + .registerTypeAdapter(ObservableArrayList.class, new ObservableArrayListDataTypeAdapter<>()) .registerTypeAdapter(MutableListLiveData.class, new MutableListLiveDataTypeAdapter<>()) .registerTypeAdapter(MutableLiveData.class, new MutableLiveDataDeserializer()) .registerTypeAdapter(MutableLiveData.class, new MutableLiveDataSerializer()) @@ -45,3 +48,4 @@ public class UtilityGson { } } + diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/data/MtbColrUtils.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/data/MtbColrUtils.java new file mode 100644 index 00000000..50200e8f --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/data/MtbColrUtils.java @@ -0,0 +1,25 @@ +package it.integry.integrywmsnative.core.utility.data; + +import android.content.Context; + +import androidx.core.content.ContextCompat; + +import java.math.BigDecimal; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.model.MtbAart; +import it.integry.integrywmsnative.core.utility.UtilityNumber; + +public class MtbColrUtils { + + public static String getQtaToShow(Context context, BigDecimal qta, BigDecimal numCnf, MtbAart mtbAart, boolean printUntMis) { + if(UntMisUtils.shouldBeShowInColli(mtbAart)) { + return UtilityNumber.decimalToString(numCnf, 0) + + (printUntMis ? " " + ContextCompat.getString(context, R.string.pkg) : ""); + } + + return UtilityNumber.decimalToString(qta, mtbAart.getFirstUntMis().getCifreDec().intValue()) + + (printUntMis ? " " + mtbAart.getFirstUntMis().getUntMis() : ""); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UntMisUtils.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/data/UntMisUtils.java similarity index 86% rename from app/src/main/java/it/integry/integrywmsnative/core/utility/UntMisUtils.java rename to app/src/main/java/it/integry/integrywmsnative/core/utility/data/UntMisUtils.java index c68ab4f7..cd0319c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UntMisUtils.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/data/UntMisUtils.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.utility; +package it.integry.integrywmsnative.core.utility.data; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java index 120de42a..3c682e01 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java @@ -48,7 +48,7 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.report.ReportManager; import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UntMisUtils; +import it.integry.integrywmsnative.core.utility.data.UntMisUtils; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java index 33b2d4a1..8a38018d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java @@ -1,37 +1,53 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.math.BigDecimal; import java.time.LocalDate; import java.util.Date; public class ArtDTO { + @SerializedName("rigaOrd") private Integer rigaOrd; + @SerializedName("codMart") private String codMart; + @SerializedName("barcode") private String barcode; + @SerializedName("descrizione") private String descrizione; + @SerializedName("dataIns") private Date dataIns; + @SerializedName("untMis") private String untMis; + @SerializedName("qta") private BigDecimal qta; + @SerializedName("qtaCnf") private BigDecimal qtaCnf; + @SerializedName("colli") private BigDecimal colli; + @SerializedName("partitaMag") private String partitaMag; + @SerializedName("dataScad") private LocalDate dataScad; + @SerializedName("systemNote") private String systemNote; + @SerializedName("codAlis") private String codAlis; + @SerializedName("datetimeRow") private Date datetimeRow; public Integer getRigaOrd() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/CheckFornitoreDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/CheckFornitoreDTO.java index f636bb7c..077b7b59 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/CheckFornitoreDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/CheckFornitoreDTO.java @@ -1,8 +1,14 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + public class CheckFornitoreDTO { + + @SerializedName("codDtip") private String codDtip; + + @SerializedName("flagCheckPartitaMag") private Boolean flagCheckPartitaMag; public String getCodDtip() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ColloDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ColloDTO.java index a017beec..b5885726 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ColloDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ColloDTO.java @@ -1,23 +1,51 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.util.ArrayList; import java.util.Date; import java.util.List; public class ColloDTO { + + @SerializedName("codMdep") private String codMdep; + + @SerializedName("createdDate") private String createdDate; + + @SerializedName("annotazioni") private String annotazioni; + + @SerializedName("gestione") private String gestione; + + @SerializedName("segno") private String segno; + + @SerializedName("idDisp") private String idDisp; + + @SerializedName("codDtip") private String codDtip; + + @SerializedName("codAnag") private String codAnag; + + @SerializedName("codVdes") private String codVdes; + + @SerializedName("numDoc") private Integer numDoc; + + @SerializedName("dataDoc") private Date dataDoc; + + @SerializedName("artRows") private List artRows = new ArrayList<>(); + + @SerializedName("rifOrd") private RifOrd rifOrd; public String getCodMdep() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocInterniSetupDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocInterniSetupDTO.java index c00109a6..bef4258c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocInterniSetupDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocInterniSetupDTO.java @@ -1,14 +1,19 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.util.List; public class DocInterniSetupDTO { + @SerializedName("tipiDoc") private List tipiDoc; + @SerializedName("gruppiArt") private List gruppiArt; + @SerializedName("fornitori") private List fornitori; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocSetupDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocSetupDTO.java deleted file mode 100644 index 3f715f40..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocSetupDTO.java +++ /dev/null @@ -1,4 +0,0 @@ -package it.integry.integrywmsnative.gest.contab_doc_interni.dto; - -public class DocSetupDTO { -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/FornitoreDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/FornitoreDTO.java index 91c6da93..87bf341a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/FornitoreDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/FornitoreDTO.java @@ -1,20 +1,28 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.util.List; public class FornitoreDTO { + @SerializedName("codAnag") private String codAnag; + @SerializedName("descrizione") private String descrizione; + @SerializedName("codVdes") private String codVdes; + @SerializedName("tipoAnag") private String tipoAnag; + @SerializedName("gestioneAnag") private String gestioneAnag; + @SerializedName("checkFornitoreDTO") private List checkFornitoreDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java index 8273167a..ec892bb4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java @@ -1,24 +1,58 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.math.BigDecimal; public class GrigliaAcquistiChildDTO { + + @SerializedName("codMart") private String codMart; + + @SerializedName("descrizione") private String descrizione; + + @SerializedName("untMis") private String untMis; + + @SerializedName("qtaCnf") private BigDecimal qtaCnf; + + @SerializedName("barcode") private String barcode; + + @SerializedName("merceDaRic") private BigDecimal merceDaRic; + + @SerializedName("mediaSett") private BigDecimal mediaSett; + + @SerializedName("flagQtaMultipla") private String flagQtaMultipla; + + @SerializedName("flagTracciabilita") private String flagTracciabilita; + + @SerializedName("qtaMinOrdinabile") private BigDecimal qtaMinOrdinabile; + + @SerializedName("newNoPromo") private boolean newNoPromo; + + @SerializedName("ggScadenza") private int ggScadenza; + + @SerializedName("giacenza") private float giacenza; + + @SerializedName("qtaPrevistaVendita") private float qtaPrevistaVendita; + + @SerializedName("qtaProposta") private float qtaProposta; + + @SerializedName("qtaOrd") private BigDecimal qtaOrd; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java deleted file mode 100644 index a09f00ae..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package it.integry.integrywmsnative.gest.contab_doc_interni.dto; - -import java.util.List; - -public class GrigliaArticoliDTO { - - private String descrLisa; - - private String descrDepo; - - private List grigliaAcquistiChild; - - public String getDescrLisa() { - return descrLisa; - } - - public void setDescrLisa(String descrLisa) { - this.descrLisa = descrLisa; - } - - public String getDescrDepo() { - return descrDepo; - } - - public void setDescrDepo(String descrDepo) { - this.descrDepo = descrDepo; - } - - public List getGrigliaAcquistiChild() { - return grigliaAcquistiChild; - } - - public void setGrigliaAcquistiChild(List grigliaAcquistiChild) { - this.grigliaAcquistiChild = grigliaAcquistiChild; - } -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GruppoArticoloDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GruppoArticoloDTO.java index 832169bc..ca44e137 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GruppoArticoloDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GruppoArticoloDTO.java @@ -1,8 +1,14 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + public class GruppoArticoloDTO { + + @SerializedName("codMgrp") private String codMgrp; + + @SerializedName("descrizione") private String descrizione; public String getCodMgrp() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/InventarioDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/InventarioDTO.java index 5ca20c3c..7cf2fcb0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/InventarioDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/InventarioDTO.java @@ -1,5 +1,7 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.util.Date; import java.util.List; @@ -8,8 +10,10 @@ import java.util.List; */ public class InventarioDTO { + @SerializedName("rowList") private List rowList; + @SerializedName("dataCreate") private Date dataCreate; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/OrdineDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/OrdineDTO.java index 1d9918bb..22cfbf86 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/OrdineDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/OrdineDTO.java @@ -1,13 +1,20 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.util.Date; import java.util.List; + public class OrdineDTO { + @SerializedName("chiaveGriglia") private String chiaveGriglia; + + @SerializedName("dataCons") private Date dataCons; + @SerializedName("artRows") private List artRows; public String getChiaveGriglia() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/PropostaOrdineDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/PropostaOrdineDTO.java deleted file mode 100644 index 29f3dc28..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/PropostaOrdineDTO.java +++ /dev/null @@ -1,98 +0,0 @@ -package it.integry.integrywmsnative.gest.contab_doc_interni.dto; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -public class PropostaOrdineDTO { - - List articoli; - private Date dataOrd; - private String compilatoDa; - - public Date getDataOrd() { - return dataOrd; - } - - public PropostaOrdineDTO setDataOrd(Date dataOrd) { - this.dataOrd = dataOrd; - return this; - } - - public String getCompilatoDa() { - return compilatoDa; - } - - public PropostaOrdineDTO setCompilatoDa(String compilatoDa) { - this.compilatoDa = compilatoDa; - return this; - } - - public List getArticoli() { - return articoli; - } - - public PropostaOrdineDTO setArticoli(List articoli) { - this.articoli = articoli; - return this; - } - - public static class ArticoliDTO { - String codMart, untMis, codArtFor, listino; - BigDecimal qtaOrd, qtaCnf; - - public String getCodMart() { - return codMart; - } - - public ArticoliDTO setCodMart(String codMart) { - this.codMart = codMart; - return this; - } - - public String getUntMis() { - return untMis; - } - - public ArticoliDTO setUntMis(String untMis) { - this.untMis = untMis; - return this; - } - - public String getCodArtFor() { - return codArtFor; - } - - public ArticoliDTO setCodArtFor(String codArtFor) { - this.codArtFor = codArtFor; - return this; - } - - public String getListino() { - return listino; - } - - public ArticoliDTO setListino(String listino) { - this.listino = listino; - return this; - } - - public BigDecimal getQtaOrd() { - return qtaOrd; - } - - public ArticoliDTO setQtaOrd(BigDecimal qtaOrd) { - this.qtaOrd = qtaOrd; - return this; - } - - public BigDecimal getQtaCnf() { - return qtaCnf; - } - - public ArticoliDTO setQtaCnf(BigDecimal qtaCnf) { - this.qtaCnf = qtaCnf; - return this; - } - } -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java index 48a72886..419abc18 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java @@ -1,11 +1,19 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.util.Date; public class RetrieveLottiDTO { + + @SerializedName("codProd") private String codProd; + + @SerializedName("partitaMag") private String partitaMag; + + @SerializedName("dataScad") private Date dataScad; public String getCodProd() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java index d75399bc..24a2a84b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java @@ -1,20 +1,46 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; +import com.google.gson.annotations.SerializedName; + import java.util.Date; public class SaveDTO { + + @SerializedName("gestione") private String gestione; + + @SerializedName("codMdep") private String codMdep; + + @SerializedName("idDisp") private String idDisp; + + @SerializedName("zona") private String zona; + + @SerializedName("segno") private String segno; + + @SerializedName("listCreate") private Date listCreate; + + @SerializedName("annotazioni") private String annotazioni; + + @SerializedName("codDtip") private String codDtip; + + @SerializedName("idInventario") private Integer idInventario; + + @SerializedName("ordineDTO") private OrdineDTO ordineDTO; + + @SerializedName("colloDTO") private ColloDTO colloDTO; + + @SerializedName("inventarioDTO") private InventarioDTO inventarioDTO; private String UUID; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java index e039c42e..a762414a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java @@ -1,13 +1,28 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.dto; -public class TipoDocDTO { +import com.google.gson.annotations.SerializedName; +public class TipoDocDTO { + + @SerializedName("codDtip") private String codDtip; + + @SerializedName("descrizione") private String descrizione; + + @SerializedName("gestione") private String gestione; + + @SerializedName("gestioneDoc") private String gestioneDoc; + + @SerializedName("flagChkTracciabilita") private boolean flagChkTracciabilita; + + @SerializedName("requireNote") private boolean requireNote = false; + + @SerializedName("suggestLotti") private boolean suggestLotti; public String getCodDtip() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ui/ContenutoBancaleListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ui/ContenutoBancaleListAdapter.java index 302bbaeb..199ab629 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ui/ContenutoBancaleListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ui/ContenutoBancaleListAdapter.java @@ -11,10 +11,6 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView; import it.integry.integrywmsnative.core.model.MtbColr; -import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityNumber; -import it.integry.integrywmsnative.core.utility.UtilityResources; -import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ListaContenutoBancaleListModelBinding; public class ContenutoBancaleListAdapter extends ExtendedRecyclerView { @@ -36,21 +32,6 @@ public class ContenutoBancaleListAdapter extends ExtendedRecyclerView { if (mOnItemClickListener != null) { mOnItemClickListener.run(mtbColr); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/ui/PickingLiberoListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/ui/PickingLiberoListAdapter.java index 04250597..053fcc9b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/ui/PickingLiberoListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/ui/PickingLiberoListAdapter.java @@ -10,10 +10,6 @@ import androidx.recyclerview.widget.RecyclerView; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView; import it.integry.integrywmsnative.core.model.MtbColr; -import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityNumber; -import it.integry.integrywmsnative.core.utility.UtilityResources; -import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ListaPickingLiberoListModelBinding; public class PickingLiberoListAdapter extends ExtendedRecyclerView { @@ -34,20 +30,6 @@ public class PickingLiberoListAdapter extends ExtendedRecyclerView { @@ -52,19 +48,6 @@ public class RettificaGiacenzeMainListAdapter extends ExtendedRecyclerView { if(mOnItemClickListener != null) { mOnItemClickListener.onItemClick(holder.mViewDataBinding.getMtbColr()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index f5512d8f..2711a4bb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -58,7 +58,7 @@ import it.integry.integrywmsnative.core.report.ReportManager; import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UntMisUtils; +import it.integry.integrywmsnative.core.utility.data.UntMisUtils; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index f52203fb..1cff9349 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -88,7 +88,7 @@ import it.integry.integrywmsnative.core.rest.model.uds.EditUDSRowRequestDTO; import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO; import it.integry.integrywmsnative.core.rest.model.uds.PrintULRequestDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UntMisUtils; +import it.integry.integrywmsnative.core.utility.data.UntMisUtils; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java index e13651ba..2081ed71 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java @@ -11,10 +11,6 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.model.MtbColr; -import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityNumber; -import it.integry.integrywmsnative.core.utility.UtilityResources; -import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogBasketLuMtbColrModelBinding; public class DialogBasketLU_Page2_ListAdapter extends RecyclerView.Adapter{ @@ -55,19 +51,6 @@ public class DialogBasketLU_Page2_ListAdapter extends RecyclerView.Adapter - + + @@ -51,7 +52,7 @@ android:textColor="?colorPrimary" android:textSize="14sp" android:textStyle="bold" - app:layout_constraintEnd_toStartOf="@+id/qta_layout" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="COD MART" /> @@ -69,7 +70,7 @@ android:text="@{item.getDescrizione()}" android:textColor="@android:color/black" android:textSize="16sp" - app:layout_constraintEnd_toStartOf="@+id/qta_layout" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/articolo_textview" tools:text="Descrizione lunga articolo" /> @@ -81,27 +82,36 @@ android:layout_height="wrap_content" android:text="@{`Lotto: ` + item.getPartitaMag()}" android:textSize="14sp" - app:layout_constraintEnd_toStartOf="@+id/qta_layout" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/articolo_descrizione_textview" app:visibilityWhenNotNull="@{item.getPartitaMag()}" tools:text="Lotto: ABCDE" /> + - - - - + android:singleLine="false" + android:maxLines="2" + tools:text="280.45 PZ" /> @@ -147,7 +156,7 @@ android:layout_marginTop="8dp" android:clickable="false" android:focusable="false" - android:visibility="@{item.numColloRif != null ? View.VISIBLE : View.GONE}" + app:visibilityWhenNotNull="@{item.numColloRif}" app:cardElevation="0dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml index 76a632d1..f053fe26 100644 --- a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml +++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml @@ -9,6 +9,8 @@ + + @@ -27,7 +29,7 @@ android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintEnd_toStartOf="@+id/qta_box" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent"> @@ -61,24 +63,6 @@ style="@style/AppTheme.NewMaterial.Text" tools:text="(12345)" /> - - - - @@ -106,35 +90,67 @@ - + android:orientation="vertical" + app:layout_constraintGuide_percent="0.80" /> - + + + + - - + android:textColor="?colorOnPrimaryContainer" + android:singleLine="false" + android:maxLines="2" + tools:text="280.45 PZ" /> + diff --git a/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml index e491675b..884dbe2c 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml @@ -6,14 +6,12 @@ - - - - + + - - @@ -113,22 +114,32 @@ + + + + + android:singleLine="false" + android:maxLines="2" + tools:text="280.45 PZ" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml index 181dd652..e5bd3ba7 100644 --- a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml +++ b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml @@ -5,12 +5,20 @@ xmlns:tools="http://schemas.android.com/tools"> + + + + + - + + + + @@ -21,171 +29,175 @@ - + android:paddingHorizontal="8dp" + android:paddingVertical="8dp"> + + + - - - + android:orientation="horizontal" + app:layout_constraintTop_toBottomOf="@id/ul_label" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/qta_guideline"> + android:layout_marginTop="4dp" + android:background="@drawable/badge_round_corner_without_padding" + android:backgroundTint="@color/light_blue_500" + android:gravity="center_vertical" + app:visibilityWhenNotNull="@{item.posizione}"> + android:orientation="horizontal"> - + + + android:layout_marginStart="4dp" + android:text="@{item.posizione}" + android:textColor="@android:color/white" + app:layout_constraintStart_toEndOf="@id/position_label_icon" + tools:text="POSIZIONE" /> - - - - - - - - - - - - - - - + + + + + + + + + - + + + app:layout_constraintStart_toEndOf="@id/qta_guideline" + app:layout_constraintTop_toTopOf="parent"> + tools:text="280.45 PZ" /> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml b/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml index 316724ce..32869ea2 100644 --- a/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml +++ b/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml @@ -11,7 +11,7 @@ - + diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml index db2b81dd..71b38585 100644 --- a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml +++ b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml @@ -5,12 +5,20 @@ xmlns:tools="http://schemas.android.com/tools"> + + + + + - + + + + @@ -21,41 +29,29 @@ - + android:paddingVertical="8dp"> - + android:text="@{"UL " + item.numCollo.toString() + " del " + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="UL 109467 del 17 mar 2023" /> - - - - - - - - - - - + + + + + + + + + + + android:text="@{item.posizione}" + app:layout_constraintStart_toEndOf="@id/position_label_icon" + tools:text="POSIZIONE" /> + + android:layout_marginStart="4dp" + android:layout_marginTop="4dp" + android:background="@drawable/badge_round_corner_without_padding" + android:backgroundTint="@color/red_300" + android:gravity="center_vertical" + android:orientation="horizontal" + app:layout_constraintStart_toEndOf="@id/posizione_layout" + app:layout_constraintTop_toBottomOf="@id/partita_mag_layout" + app:visibilityWhenNotNull="@{item.codJcom}"> + android:orientation="horizontal"> - + + - - - - - - - - - - - - - - - - + android:layout_marginStart="4dp" + android:text="@{item.codJcom}" + tools:text="COMMESSA" /> - + - + + + app:layout_constraintTop_toBottomOf="@id/ul_label"> + android:singleLine="false" + android:maxLines="2" + tools:text="280.45 PZ" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml index 29fe3db0..f0723bf9 100644 --- a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml +++ b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml @@ -14,7 +14,9 @@ - + + + @@ -58,41 +60,49 @@ - + + + app:layout_constraintTop_toTopOf="parent"> + android:singleLine="false" + android:maxLines="2" + tools:text="280.45 PZ" /> diff --git a/app/src/main/res/layout/fragment_picking_libero.xml b/app/src/main/res/layout/fragment_picking_libero.xml index 81d60c91..98c31219 100644 --- a/app/src/main/res/layout/fragment_picking_libero.xml +++ b/app/src/main/res/layout/fragment_picking_libero.xml @@ -68,13 +68,13 @@ app:visibility="@{view.thereIsntAnOpenedUL}"> + android:textColor="@android:color/black" /> + android:textColor="@android:color/black"/> diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml index 763cf8e6..45d2d187 100644 --- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml +++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml @@ -16,7 +16,8 @@ - + + @@ -51,7 +52,7 @@ android:textColor="?colorPrimary" android:textSize="14sp" android:textStyle="bold" - app:layout_constraintEnd_toStartOf="@+id/qta_layout" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="COD MART" /> @@ -70,7 +71,7 @@ android:text="@{mtbColr.getDescrizione()}" android:textColor="@android:color/black" android:textSize="16sp" - app:layout_constraintEnd_toStartOf="@+id/qta_layout" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/articolo_textview" tools:text="Descrizione lunga articolo" /> @@ -83,44 +84,55 @@ android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}" android:textSize="14sp" android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}" - app:layout_constraintEnd_toStartOf="@+id/qta_layout" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/articolo_descrizione_textview" tools:text="Lotto: ABCDE" /> + + + app:layout_constraintTop_toTopOf="parent"> - - + android:singleLine="false" + android:maxLines="2" + tools:text="280.45 PZ" /> diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml index 2c5ec710..f00ab19f 100644 --- a/app/src/main/res/layout/lista_picking_libero_list_model.xml +++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml @@ -1,120 +1,133 @@ - + + + + - + + + + + - - + tools:text="COD MART" /> - - - - - - - - - + - - - + - + android:orientation="vertical" + app:layout_constraintGuide_percent="0.80" /> - + + + + - - + android:textColor="?colorOnPrimaryContainer" + android:textStyle="bold" + tools:text="280.45 PZ" /> + diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml index 8aa96ad4..d8327ce0 100644 --- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml +++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml @@ -7,6 +7,8 @@ + + @@ -25,7 +27,7 @@ android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintEnd_toStartOf="@+id/qta_box" + app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent"> @@ -61,22 +63,6 @@ - - @@ -104,35 +90,66 @@ - + android:orientation="vertical" + app:layout_constraintGuide_percent="0.80" /> - + + + + - - + android:textColor="?colorOnPrimaryContainer" + android:singleLine="false" + android:maxLines="2" + tools:text="280.45 PZ" /> + diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml index bb43963a..0eb47bed 100644 --- a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml +++ b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml @@ -7,7 +7,8 @@ - + + @@ -78,7 +79,7 @@ android:text="@{UtilityNumber.decimalToString(item.numCnf, 0) + ' ' + @string/pkg}" android:textAppearance="?attr/textAppearanceLabelSmall" android:textColor="?attr/colorOnSecondaryContainer" - app:visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart) ? View.VISIBLE : View.GONE}" + app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}" tools:visibility="visible" tools:text="10 CNF" /> @@ -89,7 +90,7 @@ android:background="@drawable/badge_background_primary" android:paddingHorizontal="6dp" android:paddingVertical="2dp" - android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue()) + ' ' + item.mtbAart.firstUntMis.untMis}" + android:text="@{MtbColrUtils.getQtaToShow(context, item.qtaCol, item.numCnf, item.mtbAart, true)}" android:textAppearance="?attr/textAppearanceBodyMedium" android:textStyle="bold" android:textColor="?attr/colorOnPrimaryContainer" diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle index a27f8dba..781b6894 100644 --- a/barcode_base_android_library/build.gradle +++ b/barcode_base_android_library/build.gradle @@ -6,13 +6,15 @@ android { defaultConfig { minSdkVersion 21 targetSdk 35 - - consumerProguardFiles 'consumer-rules.pro' } buildTypes { + debug { + minifyEnabled false + } release { minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle index b3153695..6ea4550b 100644 --- a/honeywellscannerlibrary/build.gradle +++ b/honeywellscannerlibrary/build.gradle @@ -12,6 +12,9 @@ android { } buildTypes { + debug { + minifyEnabled false + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle index 27dd3f80..4e70c5eb 100644 --- a/keyobardemulatorscannerlibrary/build.gradle +++ b/keyobardemulatorscannerlibrary/build.gradle @@ -12,6 +12,9 @@ android { } buildTypes { + debug { + minifyEnabled false + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle index 46c9a71a..70c01442 100644 --- a/pointmobilescannerlibrary/build.gradle +++ b/pointmobilescannerlibrary/build.gradle @@ -11,6 +11,9 @@ android { } buildTypes { + debug { + minifyEnabled false + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle index 40bb1543..4b24cdd5 100644 --- a/zebrascannerlibrary/build.gradle +++ b/zebrascannerlibrary/build.gradle @@ -11,6 +11,9 @@ android { } buildTypes { + debug { + minifyEnabled false + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'