diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 99cdda0a..7f27189c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -15,6 +15,7 @@ import java.util.List; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; +import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityLogger; @@ -673,10 +674,10 @@ public class MtbColt extends EntityBase implements Parcelable { public void generaFiltroOrdineFromDTO(List filtroOrdineDtos) { - String xmlPrefix = ""; - String xmlSuffix = ""; + String xmlPrefix = "{\"whereCond\": \""; + String xmlSuffix = "\"}"; - StringBuilder xmlContent = new StringBuilder(); + StringBuilder whereCond = new StringBuilder(); if(filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) { @@ -684,7 +685,16 @@ public class MtbColt extends EntityBase implements Parcelable { FiltroOrdineDTO x = filtroOrdineDtos.get(i); try { - xmlContent.append("" + x.getGestioneOrd() + "" + UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH) + "" + x.getNumOrd() + ""); + whereCond.append(String.format("(dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s and dtb_ordt.num_ord = %s)", + UtilityDB.valueToString(x.getGestioneOrd()), + UtilityDB.valueToString(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)), + UtilityDB.valueToString(x.getNumOrd()))); + + if(i < filtroOrdineDtos.size()-1) { + whereCond.append(" OR "); + } + + //whereCond.append("" + x.getGestioneOrd() + "" + UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH) + "" + x.getNumOrd() + ""); } catch (Exception e) { e.printStackTrace(); } @@ -692,7 +702,7 @@ public class MtbColt extends EntityBase implements Parcelable { } - this.filtroOrdini = xmlPrefix + xmlContent + xmlSuffix; + this.filtroOrdini = xmlPrefix + whereCond + xmlSuffix; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index a22b6e49..471b81fb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -41,7 +41,7 @@ public class UtilityBarcode { } - return barcodeScanDTO != null && isPosizione; + return isPosizione; } public static boolean isEanPeso(BarcodeScanDTO barcodeScanDTO) {