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

Merge branch 'feature/RefactoringGestioneColli' into master-beta
All checks were successful
WMS - Android (New)/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-06-06 17:43:00 +02:00
parent 74b3613555 afd7ae25f3
commit 70a819ec83
55 changed files with 978 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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'
}

24
app/proguard-rules.pro vendored
View File

@@ -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 { *; }
-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 { *; }

87
app/src/main/java/it/integry/integrywmsnative/core/di/ObservableArrayListDataTypeAdapter.java Normal file
View File

@@ -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 <T> tipo degli elementi nella lista
*/
public class ObservableArrayListDataTypeAdapter<T> implements JsonSerializer<ObservableArrayList<T>>, JsonDeserializer<ObservableArrayList<T>> {
private final Handler handler = new Handler(Looper.getMainLooper());
/**
* Serializza un oggetto MutableListLiveData in un JsonElement
*/
@Override
public JsonElement serialize(ObservableArrayList<T> src, Type typeOfSrc, JsonSerializationContext context) {
// Ottiene la lista interna da MutableListLiveData e la serializza
ArrayList<T> list = new ArrayList<>(src);
return context.serialize(list);
}
/**
* Deserializza un JsonElement in un oggetto MutableListLiveData
*/
@Override
public ObservableArrayList<T> 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<T> list = context.deserialize(json, listType);
if (list == null) {
list = new ArrayList<>();
}
// Crea una nuova istanza di MutableListLiveData e aggiunge tutti gli elementi
ObservableArrayList<T> result = new ObservableArrayList<>();
result.addAll(list);
return result;
}
/**
* Estrae il tipo della lista da un tipo parametrizzato di MutableListLiveData<T>
*/
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<T> usando il parametro di tipo T
return TypeToken.getParameterized(List.class, typeArguments[0]).getType();
}
}
// Fallback per List<Object> se non riusciamo a determinare il tipo
return TypeToken.getParameterized(List.class, Object.class).getType();
}
/**
* Crea un'istanza del TypeAdapter per MutableListLiveData<T>
*
* @param elementType il tipo T degli elementi nella lista
* @return un'istanza del TypeAdapter
*/
public static <T> ObservableArrayListDataTypeAdapter<T> create(Type elementType) {
return new ObservableArrayListDataTypeAdapter<>();
}
}

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

@@ -180,8 +180,10 @@ public class MtbAart extends EntityBase {
@SerializedName("numCnfImpegnata")
private BigDecimal numCnfImpegnata;
@SerializedName("mtbUntMis")
private List<MtbUntMis> mtbUntMis;
@SerializedName("mtbAartBarCode")
private List<MtbAartBarCode> 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
}
}
}

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

@@ -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;
}
}

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

@@ -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;
}
}

1
app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbColrListDeserializer.java Normal file
View File

@@ -0,0 +1 @@

4
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java
View File

@@ -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 {
}
}

25
app/src/main/java/it/integry/integrywmsnative/core/utility/data/MtbColrUtils.java Normal file
View File

@@ -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() : "");
}
}

2
app/src/main/java/it/integry/integrywmsnative/core/utility/UntMisUtils.java → app/src/main/java/it/integry/integrywmsnative/core/utility/data/UntMisUtils.java
View File

@@ -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;

2
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java
View File

@@ -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;

16
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java
View File

@@ -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() {

6
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/CheckFornitoreDTO.java
View File

@@ -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() {

28
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ColloDTO.java
View File

@@ -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<ArtDTO> artRows = new ArrayList<>();
@SerializedName("rifOrd")
private RifOrd rifOrd;
public String getCodMdep() {

5
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocInterniSetupDTO.java
View File

@@ -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<TipoDocDTO> tipiDoc;
@SerializedName("gruppiArt")
private List<GruppoArticoloDTO> gruppiArt;
@SerializedName("fornitori")
private List<FornitoreDTO> fornitori;

4
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/DocSetupDTO.java
View File

@@ -1,4 +0,0 @@
package it.integry.integrywmsnative.gest.contab_doc_interni.dto;
public class DocSetupDTO {
}

8
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/FornitoreDTO.java
View File

@@ -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> checkFornitoreDTO;

34
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaAcquistiChildDTO.java
View File

@@ -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;

36
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GrigliaArticoliDTO.java
View File

@@ -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<GrigliaAcquistiChildDTO> 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<GrigliaAcquistiChildDTO> getGrigliaAcquistiChild() {
return grigliaAcquistiChild;
}
public void setGrigliaAcquistiChild(List<GrigliaAcquistiChildDTO> grigliaAcquistiChild) {
this.grigliaAcquistiChild = grigliaAcquistiChild;
}
}

6
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/GruppoArticoloDTO.java
View File

@@ -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() {

4
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/InventarioDTO.java
View File

@@ -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<Object> rowList;
@SerializedName("dataCreate")
private Date dataCreate;

7
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/OrdineDTO.java
View File

@@ -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<ArtDTO> artRows;
public String getChiaveGriglia() {

98
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/PropostaOrdineDTO.java
View File

@@ -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<ArticoliDTO> 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<ArticoliDTO> getArticoli() {
return articoli;
}
public PropostaOrdineDTO setArticoli(List<ArticoliDTO> 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;
}
}
}

8
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/RetrieveLottiDTO.java
View File

@@ -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() {

26
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java
View File

@@ -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;

17
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/TipoDocDTO.java
View File

@@ -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() {

32
app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ui/ContenutoBancaleListAdapter.java
View File

@@ -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<MtbColr, ContenutoBancaleListAdapter.ViewHolder> {
@@ -36,21 +32,6 @@ public class ContenutoBancaleListAdapter extends ExtendedRecyclerView<MtbColr, C
public void bind(MtbColr mtbColr) {
mViewDataBinding.setMtbColr(mtbColr);
//Setting qty with unt_mis
if (!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())) {
String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
if (mtbColr.getMtbAart() != null) {
text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
}
mViewDataBinding.qtaTextview.setText(text);
} else {
mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
}
mViewDataBinding.executePendingBindings();
}
}
@@ -68,19 +49,6 @@ public class ContenutoBancaleListAdapter extends ExtendedRecyclerView<MtbColr, C
MtbColr mtbColr = mDataset.get(position);
holder.bind(mtbColr);
//Setting qty with unt_mis
if (!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())) {
String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
if (mtbColr.getMtbAart() != null) {
text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
}
holder.mViewDataBinding.qtaTextview.setText(text);
} else {
holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
}
holder.mViewDataBinding.getRoot().setOnClickListener(x -> {
if (mOnItemClickListener != null) {
mOnItemClickListener.run(mtbColr);

18
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/ui/PickingLiberoListAdapter.java
View File

@@ -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<MtbColr, PickingLiberoListAdapter.ViewHolder> {
@@ -34,20 +30,6 @@ public class PickingLiberoListAdapter extends ExtendedRecyclerView<MtbColr, Pick
}
public void bind(MtbColr mtbColr) {
//Setting qty with unt_mis
if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())){
String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
if(mtbColr.getMtbAart() != null) {
text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
}
mViewDataBinding.qtaTextview.setText(text);
} else {
mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
}
mViewDataBinding.setMtbColr(mtbColr);
mViewDataBinding.executePendingBindings();
}

32
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/ArticoloFornitoreDTO.java
View File

@@ -1,32 +0,0 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
public class ArticoloFornitoreDTO {
private String codMart;
private String descrizioneEstesa;
private String codArtFor;
public String getCodMart() {
return codMart;
}
public void setCodMart(String codMart) {
this.codMart = codMart;
}
public String getDescrizioneEstesa() {
return descrizioneEstesa;
}
public void setDescrizioneEstesa(String descrizioneEstesa) {
this.descrizioneEstesa = descrizioneEstesa;
}
public String getCodArtFor() {
return codArtFor;
}
public void setCodArtFor(String codArtFor) {
this.codArtFor = codArtFor;
}
}

6
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/FornitoreDTO.java
View File

@@ -1,8 +1,14 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
import com.google.gson.annotations.SerializedName;
public class FornitoreDTO implements Cloneable {
@SerializedName("codAlis")
private String codAlis;
@SerializedName("descrizione")
private String descrizione;
public String getCodAlis() {

3
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/SearchArticoloByBarcodeOrCodMartRequestDTO.java
View File

@@ -1,7 +1,10 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
import com.google.gson.annotations.SerializedName;
public class SearchArticoloByBarcodeOrCodMartRequestDTO {
@SerializedName("codMartOrBarcode")
private String codMartOrBarcode;
public String getCodMartOrBarcode() {

12
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/SearchArticoloByBarcodeOrCodMartResponseDTO.java
View File

@@ -1,15 +1,27 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import it.integry.integrywmsnative.core.model.MtbAart;
public class SearchArticoloByBarcodeOrCodMartResponseDTO {
@SerializedName("mtbAart")
private MtbAart mtbAart;
@SerializedName("qtaEsistente")
private BigDecimal qtaEsistente;
@SerializedName("qtaImpegnata")
private BigDecimal qtaImpegnata;
@SerializedName("numCnfEsistente")
private BigDecimal numCnfEsistente;
@SerializedName("numCnfImpegnata")
private BigDecimal numCnfImpegnata;

4
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/SearchArticoloByCodArtFornOrDescrizioneRequestDTO.java
View File

@@ -1,9 +1,13 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
import com.google.gson.annotations.SerializedName;
public class SearchArticoloByCodArtFornOrDescrizioneRequestDTO {
@SerializedName("codAlis")
private String codAlis;
@SerializedName("codArtFornOrDescrizione")
private String codArtFornOrDescrizione;

4
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/dto/SearchArticoloByCodArtFornOrDescrizioneResponseDTO.java
View File

@@ -1,11 +1,15 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.dto;
import com.google.gson.annotations.SerializedName;
import it.integry.integrywmsnative.core.model.MtbAart;
public class SearchArticoloByCodArtFornOrDescrizioneResponseDTO {
@SerializedName("mtbAart")
private MtbAart mtbAart;
@SerializedName("codArtFor")
private String codArtFor;
public MtbAart getMtbAart() {

17
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/RettificaGiacenzeMainListAdapter.java
View File

@@ -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.ListaRettificaGiacenzeModelBinding;
public class RettificaGiacenzeMainListAdapter extends ExtendedRecyclerView<MtbColr, RettificaGiacenzeMainListAdapter.ViewHolder> {
@@ -52,19 +48,6 @@ public class RettificaGiacenzeMainListAdapter extends ExtendedRecyclerView<MtbCo
MtbColr mtbColr = mDataset.get(position);
holder.bind(mtbColr);
//Setting qty with unt_mis
if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())){
String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
if(mtbColr.getMtbAart() != null) {
text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
}
holder.mViewDataBinding.qtaTextview.setText(text);
} else {
holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
}
holder.mViewDataBinding.getRoot().setOnClickListener(x -> {
if(mOnItemClickListener != null) {
mOnItemClickListener.onItemClick(holder.mViewDataBinding.getMtbColr());

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

@@ -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;

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

@@ -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;

17
app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java
View File

@@ -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<DialogBasketLU_Page2_ListAdapter.ViewHolder>{
@@ -55,19 +51,6 @@ public class DialogBasketLU_Page2_ListAdapter extends RecyclerView.Adapter<Dialo
public void onBindViewHolder(DialogBasketLU_Page2_ListAdapter.ViewHolder holder, int position) {
MtbColr mtbColr = mDataset.get(position);
holder.bind(mtbColr);
//Setting qty with unt_mis
if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())){
String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
if(mtbColr.getMtbAart() != null) {
text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
}
holder.mViewDataBinding.qtaTextview.setText(text);
} else {
holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
}
}
@Override

51
app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
View File

@@ -17,7 +17,8 @@
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
@@ -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" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.80" />
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
@@ -111,16 +121,16 @@
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
app:visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:maxLines="1"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="NUM CNF" />
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
@@ -130,14 +140,13 @@
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue()) + &quot;\n&quot; + item.mtbAart.firstUntMis.untMis}"
android:textStyle="bold"
android:text="@{MtbColrUtils.getQtaToShow(context, item.qtaCol, item.numCnf, item.mtbAart, true)}"
android:textAllCaps="true"
android:textColor="?colorOnPrimaryContainer"
android:textSize="16sp"
android:textStyle="bold"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="280.45\nCONF" />
android:singleLine="false"
android:maxLines="2"
tools:text="280.45 PZ" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -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"

86
app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
View File

@@ -9,6 +9,8 @@
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<variable
name="mtbColr"
type="it.integry.integrywmsnative.core.model.MtbColr" />
@@ -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)" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/orange_600"
android:textColor="@android:color/white"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="PESO KG" />
</RelativeLayout>
@@ -106,35 +90,67 @@
</LinearLayout>
<RelativeLayout
android:id="@+id/qta_box"
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
android:orientation="vertical"
app:layout_constraintGuide_percent="0.80" />
<androidx.appcompat.widget.AppCompatTextView
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/num_cnf_text"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:textStyle="bold"
android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:maxLines="1"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(mtbColr.mtbAart)}"
tools:text="NUM CNF" />
<TextView
android:id="@+id/qta_textview"
android:layout_width="wrap_content"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="?colorPrimary"
android:backgroundTint="?colorPrimaryContainer"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textSize="16sp"
android:textColor="@android:color/white"
android:textStyle="bold"
android:text="@{MtbColrUtils.getQtaToShow(context, mtbColr.qtaCol, mtbColr.numCnf, mtbColr.mtbAart, true)}"
android:textAllCaps="true"
style="@style/AppTheme.NewMaterial.Text"
tools:text="280.45\nCONF" />
</RelativeLayout>
android:textColor="?colorOnPrimaryContainer"
android:singleLine="false"
android:maxLines="2"
tools:text="280.45 PZ" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

59
app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml
View File

@@ -6,14 +6,12 @@
<data>
<import type="it.integry.integrywmsnative.R" />
<import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<variable
name="item"
@@ -21,7 +19,7 @@
</data>
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="4dp"
@@ -32,22 +30,25 @@
android:padding="4dp"
app:backgroundTintResID="@{item.checked.get() ? R.color.bg_checked_layout : android.R.color.transparent}">
<androidx.appcompat.widget.AppCompatCheckBox
<CheckBox
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:minWidth="0dp"
android:minHeight="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:checked="@{item.checked}" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_toStartOf="@id/qta_layout"
android:layout_toEndOf="@id/checkbox"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/checkbox"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
android:orientation="vertical">
@@ -113,22 +114,32 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.75" />
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="center_vertical"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
@@ -138,16 +149,16 @@
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:text="@{UtilityNumber.decimalToString(item.mtbColr.numCnf, 0)}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
app:visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbColr.mtbAart)}"
android:text="@{UtilityNumber.decimalToString(item.mtbColr.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:maxLines="1"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbColr.mtbAart)}"
tools:text="NUM CNF" />
<TextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
@@ -157,14 +168,14 @@
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:text="@{UtilityNumber.decimalToString(item.mtbColr.qtaCol, item.mtbColr.mtbAart.firstUntMis.cifreDec.intValue()) + &quot;\n&quot; + item.mtbColr.mtbAart.firstUntMis.untMis}"
android:textStyle="bold"
android:text="@{MtbColrUtils.getQtaToShow(context, item.mtbColr.qtaCol, item.mtbColr.numCnf, item.mtbColr.mtbAart, true)}"
android:textAllCaps="true"
android:textColor="?colorOnPrimaryContainer"
android:textSize="16sp"
android:textStyle="bold"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbColr.mtbAart)}"
tools:text="280.45\nCONF" />
android:singleLine="false"
android:maxLines="2"
tools:text="280.45 PZ" />
</LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

216
app/src/main/res/layout/dialog_info_giacenza_list_item.xml
View File

@@ -5,12 +5,20 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="androidx.core.content.ContextCompat" />
<import type="it.integry.integrywmsnative.R" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<import type="android.view.View" />
@@ -21,171 +29,175 @@
</data>
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingVertical="8dp"
android:paddingHorizontal="8dp">
android:paddingHorizontal="8dp"
android:paddingVertical="8dp">
<TextView
android:id="@+id/ul_label"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
tools:text="UL 109467 del 17 mar 2023" />
<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/qta_layout"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textStyle="bold"
tools:text="UL 109467 del 17 mar 2023" />
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/ul_label"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/qta_guideline">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
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}">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@drawable/badge_round_corner_without_padding"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/light_blue_500"
android:gravity="center_vertical"
app:visibilityWhenNotNull="@{item.posizione}">
android:orientation="horizontal">
<LinearLayout
<ImageView
android:id="@+id/position_label_icon"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_location_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/white" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/light_blue_500"
android:gravity="center_vertical"
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" />
<ImageView
android:id="@+id/position_label_icon"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_location_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/white" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:layout_marginStart="4dp"
android:text="@{item.posizione}"
app:layout_constraintStart_toEndOf="@id/position_label_icon"
tools:text="POSIZIONE" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:visibilityWhenNotNull="@{item.codJcom}"
tools:visibility="invisible">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@{ContextCompat.getColor(context, item.commessaMatch ? R.color.red_300 : R.color.white)}"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_tag"
app:tint="@android:color/black" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.codJcom}"
tools:text="COMMESSA" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:visibilityWhenNotNull="@{item.codJcom}"
tools:visibility="visible">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@{ContextCompat.getColor(context, item.commessaMatch ? R.color.red_300 : R.color.white)}"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_tag"
app:tint="@android:color/black" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.codJcom}"
tools:text="COMMESSA" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/qta_layout"
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
app:layout_constraintGuide_percent="0.80" />
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:maxLines="1"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:layout_marginBottom="-16dp"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
app:visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="NUM CNF" />
<TextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="?colorPrimaryContainer"
android:gravity="center"
android:maxLines="2"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:singleLine="false"
android:text="@{MtbColrUtils.getQtaToShow(context, item.qtaCol, item.numCnf, item.mtbAart, true)}"
android:textAllCaps="true"
android:textColor="?colorOnPrimaryContainer"
android:textSize="16sp"
android:textStyle="bold"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue()) + &quot;\n&quot; + item.mtbAart.firstUntMis.untMis}"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="280.45\nCONF" />
tools:text="280.45 PZ" />
</LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

2
app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml
View File

@@ -11,7 +11,7 @@
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="androidx.core.content.ContextCompat" />
<import type="it.integry.integrywmsnative.R" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="java.math.BigDecimal" />
<import type="android.view.View" />

256
app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
View File

@@ -5,12 +5,20 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="androidx.core.content.ContextCompat" />
<import type="it.integry.integrywmsnative.R" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<import type="android.view.View" />
@@ -21,41 +29,29 @@
</data>
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingVertical="8dp"
android:paddingHorizontal="8dp">
android:paddingVertical="8dp">
<LinearLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/ul_label"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/qta_layout"
android:gravity="center_vertical"
android:orientation="vertical">
android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + 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" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textStyle="bold"
tools:text="UL 109467 del 17 mar 2023" />
<!-- <TextView-->
<!-- style="@style/TextAppearance.AppCompat.Small"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:ellipsize="end"-->
<!-- android:maxLines="2"-->
<!-- android:text="@{UtilityString.isNull(item.descrizioneEstesa, &quot;Nessuna descrizione&quot;)}"-->
<!-- tools:text="Descrizione lunga articolo" />-->
<LinearLayout
android:id="@+id/partita_mag_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
@@ -63,6 +59,8 @@
android:backgroundTint="@color/green_200"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:visibilityWhenNotNull="@{item.partitaMag}">
<LinearLayout
@@ -93,8 +91,50 @@
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginStart="8dp"
app:visibilityWhenNotNull="@{item.dataScad}"
android:src="@drawable/ic_calendar_schedule"
app:tint="@android:color/black"
app:visibilityWhenNotNull="@{item.dataScad}" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{UtilityDate.formatDate(item.dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textColor="@android:color/black"
app:visibilityWhenNotNull="@{item.dataScad}"
tools:text="17 mag 2023" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/posizione_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@drawable/badge_round_corner_without_padding"
android:backgroundTint="@color/light_blue_500"
android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/partita_mag_layout"
app:visibilityWhenNotNull="@{item.posizione}">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/light_blue_500"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/position_label_icon"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_location_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/black" />
<TextView
@@ -102,131 +142,113 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
app:visibilityWhenNotNull="@{item.dataScad}"
android:text="@{UtilityDate.formatDate(item.dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
android:textColor="@android:color/black"
tools:text="17 mag 2023" />
android:text="@{item.posizione}"
app:layout_constraintStart_toEndOf="@id/position_label_icon"
tools:text="POSIZIONE" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/commessa_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
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}">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@drawable/badge_round_corner_without_padding"
android:backgroundTint="@color/light_blue_500"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@{ContextCompat.getColor(context, item.commessaMatch ? R.color.red_300 : R.color.white)}"
android:gravity="center_vertical"
app:visibilityWhenNotNull="@{item.posizione}">
android:orientation="horizontal">
<LinearLayout
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_tag"
app:tint="@android:color/black" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/light_blue_500"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/position_label_icon"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_location_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/black" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.posizione}"
app:layout_constraintStart_toEndOf="@id/position_label_icon"
tools:text="POSIZIONE" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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:visibilityWhenNotNull="@{item.codJcom}">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@{ContextCompat.getColor(context, item.commessaMatch ? R.color.red_300 : R.color.white)}"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/ic_tag"
app:tint="@android:color/black" />
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@{item.codJcom}"
tools:text="COMMESSA" />
</LinearLayout>
android:layout_marginStart="4dp"
android:text="@{item.codJcom}"
tools:text="COMMESSA" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/flow_optional_items"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
app:layout_constraintTop_toBottomOf="@id/ul_label"
app:flow_wrapMode="chain"
app:flow_horizontalBias="0"
app:flow_horizontalStyle="packed"
app:flow_horizontalGap="8dp"
app:flow_verticalGap="4dp"
android:layout_marginEnd="4dp"
app:constraint_referenced_ids="partita_mag_layout,posizione_layout,commessa_layout" />
<LinearLayout
android:id="@+id/qta_layout"
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
app:layout_constraintGuide_percent="0.75" />
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintTop_toBottomOf="@id/ul_label">
<TextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:layout_marginBottom="-16dp"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
app:visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:maxLines="1"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="NUM CNF" />
<TextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
@@ -236,16 +258,16 @@
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textStyle="bold"
android:text="@{MtbColrUtils.getQtaToShow(context, item.qtaCol, item.numCnf, item.mtbAart, true)}"
android:textAllCaps="true"
android:textColor="?colorOnPrimaryContainer"
android:textSize="16sp"
android:textStyle="bold"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue()) + &quot;\n&quot; + item.mtbAart.firstUntMis.untMis}"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="280.45\nCONF" />
android:singleLine="false"
android:maxLines="2"
tools:text="280.45 PZ" />
</LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

48
app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
View File

@@ -14,7 +14,9 @@
<import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<variable
name="item"
@@ -34,7 +36,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/qta_layout"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
android:orientation="vertical">
@@ -58,41 +60,49 @@
</LinearLayout>
<LinearLayout
android:id="@+id/qta_layout"
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
app:layout_constraintGuide_percent="0.75" />
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:layout_marginBottom="-16dp"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
app:visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:maxLines="1"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="NUM CNF" />
<TextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
@@ -102,13 +112,13 @@
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textStyle="bold"
android:text="@{MtbColrUtils.getQtaToShow(context, item.qtaOrd, item.numCnf, item.mtbAart, true)}"
android:textAllCaps="true"
android:textColor="?colorOnPrimaryContainer"
android:textSize="16sp"
android:textStyle="bold"
android:text="@{UtilityNumber.decimalToString(item.qtaOrd, 2) + &quot;\n&quot; + item.untMis}"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(item.mtbAart)}"
tools:text="280.45\nCONF" />
android:singleLine="false"
android:maxLines="2"
tools:text="280.45 PZ" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/fragment_picking_libero.xml
View File

@@ -68,13 +68,13 @@
app:visibility="@{view.thereIsntAnOpenedUL}">
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.Material3.HeadlineSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/free_picking_suggestion_1"
android:textColor="@android:color/black"
android:textSize="18sp" />
android:textColor="@android:color/black" />
</LinearLayout>
<LinearLayout
@@ -88,13 +88,13 @@
app:visibility="@{view.thereIsAnOpenULWithoutRows}">
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.Material3.HeadlineSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/free_picking_suggestion_2"
android:textColor="@android:color/black"
android:textSize="18sp" />
android:textColor="@android:color/black"/>
</LinearLayout>

52
app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
View File

@@ -16,7 +16,8 @@
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
@@ -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" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.80" />
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
android:gravity="center_vertical"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/num_cnf_text"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:layout_marginBottom="-16dp"
android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf) + ` CNF`}"
android:textColor="?colorOnSecondaryContainer"
android:textSize="14sp"
android:textStyle="bold"
app:visibility="@{UntMisUtils.shouldBeShowInColli(mtbColr.mtbAart)}"
android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:maxLines="1"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(mtbColr.mtbAart)}"
tools:text="NUM CNF" />
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
@@ -130,11 +142,13 @@
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textStyle="bold"
android:text="@{MtbColrUtils.getQtaToShow(context, mtbColr.qtaCol, mtbColr.numCnf, mtbColr.mtbAart, true)}"
android:textAllCaps="true"
android:textColor="?colorOnPrimaryContainer"
android:textSize="16sp"
android:textStyle="bold"
tools:text="280.45\nCONF" />
android:singleLine="false"
android:maxLines="2"
tools:text="280.45 PZ" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

175
app/src/main/res/layout/lista_picking_libero_list_model.xml
View File

@@ -1,120 +1,133 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<variable
name="mtbColr"
type="it.integry.integrywmsnative.core.model.MtbColr" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
<LinearLayout
android:id="@+id/linearLayout"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/cod_mart"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:text="@{mtbColr.codMart}"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@+id/qta_box"
app:layout_constraintStart_toStartOf="parent">
tools:text="COD MART" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="COD MART" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/orange_600"
android:textColor="@android:color/white"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="PESO KG" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/posizione_collo"
android:ellipsize="end"
android:maxLines="1"
android:text="@{mtbColr.getDescrizione()}"
android:textColor="@android:color/black"
android:textSize="16sp"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="Descrizione lunga articolo" />
<TextView
android:id="@+id/descrizione_art"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="@{mtbColr.getDescrizione()}"
android:textColor="@android:color/black"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cod_mart"
tools:text="Descrizione lunga articolo" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
android:textSize="14sp"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="Lotto: ABCDE" />
</LinearLayout>
<TextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/descrizione_art"
android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
android:textSize="14sp"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
tools:text="Lotto: ABCDE" />
<RelativeLayout
android:id="@+id/qta_box"
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
android:orientation="vertical"
app:layout_constraintGuide_percent="0.80" />
<androidx.appcompat.widget.AppCompatTextView
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/num_cnf_text"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:maxLines="1"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:textStyle="bold"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(mtbColr.mtbAart)}"
tools:text="NUM CNF" />
<TextView
android:id="@+id/qta_textview"
android:layout_width="wrap_content"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="?colorPrimary"
android:backgroundTint="?colorPrimaryContainer"
android:gravity="center"
android:maxLines="2"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textSize="16sp"
android:textColor="@android:color/white"
android:textStyle="bold"
android:singleLine="false"
android:text="@{MtbColrUtils.getQtaToShow(context, mtbColr.qtaCol, mtbColr.numCnf, mtbColr.mtbAart, true)}"
android:textAllCaps="true"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="280.45\nCONF" />
</RelativeLayout>
android:textColor="?colorOnPrimaryContainer"
android:textStyle="bold"
tools:text="280.45 PZ" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

83
app/src/main/res/layout/lista_rettifica_giacenze_model.xml
View File

@@ -7,6 +7,8 @@
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<variable
name="mtbColr"
type="it.integry.integrywmsnative.core.model.MtbColr" />
@@ -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 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/orange_600"
android:textColor="@android:color/white"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="PESO KG" />
</RelativeLayout>
@@ -104,35 +90,66 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:id="@+id/qta_box"
<androidx.constraintlayout.widget.Guideline
android:id="@+id/qta_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
android:orientation="vertical"
app:layout_constraintGuide_percent="0.80" />
<androidx.appcompat.widget.AppCompatTextView
<LinearLayout
android:id="@+id/qta_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="start"
android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/qta_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/num_cnf_text"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-16dp"
android:background="@drawable/badge_round_corner_top"
android:backgroundTint="?colorSecondaryContainer"
android:gravity="center_horizontal"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="16dp"
android:textStyle="bold"
android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf, 0) + ' ' + @string/pkg}"
android:textColor="?colorOnSecondaryContainer"
android:maxLines="1"
app:reverse_visibility="@{UntMisUtils.shouldBeShowInColli(mtbColr.mtbAart)}"
tools:text="NUM CNF" />
<TextView
android:id="@+id/qta_textview"
android:layout_width="wrap_content"
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="?colorPrimary"
android:backgroundTint="?colorPrimaryContainer"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textSize="16sp"
android:textColor="@android:color/white"
android:textStyle="bold"
android:text="@{MtbColrUtils.getQtaToShow(context, mtbColr.qtaCol, mtbColr.numCnf, mtbColr.mtbAart, true)}"
android:textAllCaps="true"
style="@style/AppTheme.NewMaterial.Text"
tools:text="280.45\nCONF" />
</RelativeLayout>
android:textColor="?colorOnPrimaryContainer"
android:singleLine="false"
android:maxLines="2"
tools:text="280.45 PZ" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

7
app/src/main/res/layout/prod_recupero_materiale_list_item.xml
View File

@@ -7,7 +7,8 @@
<import type="android.view.View"/>
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="it.integry.integrywmsnative.core.utility.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.UntMisUtils" />
<import type="it.integry.integrywmsnative.core.utility.data.MtbColrUtils" />
<variable
name="item"
type="it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULDTO" />
@@ -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"

6
barcode_base_android_library/build.gradle
View File

@@ -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'
}
}

3
honeywellscannerlibrary/build.gradle
View File

@@ -12,6 +12,9 @@ android {
}
buildTypes {
debug {
minifyEnabled false
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

3
keyobardemulatorscannerlibrary/build.gradle
View File

@@ -12,6 +12,9 @@ android {
}
buildTypes {
debug {
minifyEnabled false
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

3
pointmobilescannerlibrary/build.gradle
View File

@@ -11,6 +11,9 @@ android {
}
buildTypes {
debug {
minifyEnabled false
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

3
zebrascannerlibrary/build.gradle
View File

@@ -11,6 +11,9 @@ android {
}
buildTypes {
debug {
minifyEnabled false
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'