From 473b9f22fb194f6d8733afbe815dd672686cb044 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Mon, 28 Mar 2022 17:57:04 +0200 Subject: [PATCH 1/3] Aggiornato filtro ordine in caso di recupera UL. --- .idea/deploymentTargetDropDown.xml | 12 +++++ .../integrywmsnative/core/model/MtbColt.java | 50 ++++++++++++++++--- .../gest/spedizione/SpedizioneViewModel.java | 2 +- 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 2850b67a..514d91c4 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,6 +1,18 @@ + + + + + + + + + + + + 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 09102422..e46314e7 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 @@ -1,5 +1,7 @@ package it.integry.integrywmsnative.core.model; +import android.text.TextUtils; + import androidx.databinding.ObservableArrayList; import com.annimon.stream.Optional; @@ -8,6 +10,7 @@ import com.annimon.stream.Stream; import org.jetbrains.annotations.Nullable; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -120,24 +123,24 @@ public class MtbColt extends EntityBase { case ACQUISTO: case LAVORAZIONE: case PRODUZIONE: - if(SettingsManager.iDB().getInternalCodAnags() == null) break; + if (SettingsManager.iDB().getInternalCodAnags() == null) break; Optional optCodAnagForn = Stream.of(SettingsManager.iDB().getInternalCodAnags()) .filter(InternalCodAnagsDTO::isFornitore) .findFirst(); - if(optCodAnagForn.isEmpty()) break; + if (optCodAnagForn.isEmpty()) break; codAnagToUse = optCodAnagForn.get().getCodAnag(); break; case VENDITA: - if(SettingsManager.iDB().getInternalCodAnags() == null) break; + if (SettingsManager.iDB().getInternalCodAnags() == null) break; Optional optCodAnagClie = Stream.of(SettingsManager.iDB().getInternalCodAnags()) .filter(InternalCodAnagsDTO::isCliente) .findFirst(); - if(optCodAnagClie.isEmpty()) break; + if (optCodAnagClie.isEmpty()) break; codAnagToUse = optCodAnagClie.get().getCodAnag(); break; @@ -574,9 +577,41 @@ public class MtbColt extends EntityBase { String xmlPrefix = "{\"whereCond\": \""; String xmlSuffix = "\"}"; - StringBuilder whereCond = new StringBuilder(); +// StringBuilder whereCond = new StringBuilder(); + String whereCond; + List conditions = new ArrayList<>(); + String existingFilter; + if (this.filtroOrdini != null) { + existingFilter = this.filtroOrdini; + existingFilter = existingFilter.replace(xmlPrefix, "").replace(xmlSuffix, ""); + conditions.add(existingFilter); + } else { + existingFilter = ""; + } - if (filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) { + + for (FiltroOrdineDTO filtroOrdineDTO : filtroOrdineDtos) { + try { + String condition = (String.format("(d.g = %s AND d.d = %s and d.n = %s", + UtilityDB.valueToString(filtroOrdineDTO.getGestioneOrd()), + UtilityDB.valueToString(UtilityDate.formatDate(filtroOrdineDTO.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)), + UtilityDB.valueToString(filtroOrdineDTO.getNumOrd()))); + + if (!UtilityString.isNullOrEmpty(filtroOrdineDTO.getDataConsS())) { + condition += (String.format(" AND dr.dc = %s", + UtilityDB.valueToString(UtilityDate.formatDate(filtroOrdineDTO.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)))); + } + + condition += ")"; + if (!existingFilter.contains(condition)) { + conditions.add(condition); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /*if (filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) { for (int i = 0; i < filtroOrdineDtos.size(); i++) { FiltroOrdineDTO x = filtroOrdineDtos.get(i); @@ -602,7 +637,8 @@ public class MtbColt extends EntityBase { } } - } + }*/ + whereCond = TextUtils.join(" OR ", conditions); this.filtroOrdini = xmlPrefix + whereCond + xmlSuffix; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 0ea058d8..c291a184 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1752,7 +1752,7 @@ public class SpedizioneViewModel { this.sendOnLoadingStarted(); this.mCurrentMtbColt = mtbColt; mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini); - + this.mCurrentMtbColt.generaFiltroOrdineFromDTO(mDefaultFiltroOrdine); this.mColliMagazzinoRESTConsumer.saveCollo(this.mCurrentMtbColt, savedMtbColt -> { From b0fa911322b76a192de82553f57acc82da5f1dcf Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 29 Mar 2022 11:03:40 +0200 Subject: [PATCH 2/3] risolto problema scrollview su display ridotti --- .idea/deploymentTargetDropDown.xml | 12 +- .../res/layout/dialog_input_quantity_v2.xml | 1345 ++++++++--------- 2 files changed, 676 insertions(+), 681 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 514d91c4..ff0b9f9a 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,18 +1,18 @@ - + - + - - + + - - + + diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml index 312fb1f0..40ef5b7f 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -27,792 +27,787 @@ type="it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View" /> - + android:layout_height="match_parent"> - - + android:layout_height="match_parent" + android:background="@color/full_white" + android:orientation="vertical"> - - - - - - - + android:background="?attr/colorPrimary" + android:minHeight="?attr/actionBarSize" + app:titleTextColor="@android:color/white"> - - - - - - - - - - - - - - - + + + + + + android:orientation="vertical"> - - - - + android:layout_marginTop="8dp"> + android:layout_alignParentStart="true" + android:layout_toStartOf="@id/unt_mis" + android:ellipsize="end" + android:text="@{viewmodel.mtbAart.codMart}" + android:textColor="@color/colorPrimary" + tools:text="COD MART (Partita mag)" /> - - - - - - - + android:textColor="@color/colorPrimary" + android:visibility="@{viewmodel.mtbAart.untMis != null ? View.VISIBLE : View.GONE}" + tools:text="UM" /> + + + + + + + + + + + + + + android:orientation="horizontal"> + + + + - + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + android:weightSum="1"> - - - + android:layout_gravity="center" + android:layout_marginEnd="2dp" + android:layout_weight="0.5" + android:background="@drawable/badge_round_corner" + android:backgroundTint="@color/green_600" + android:orientation="vertical" + android:padding="8dp" + android:visibility="@{viewmodel.totalNumCnfToBeTaken != null || viewmodel.totalQtaToBeTaken != null ? View.VISIBLE : View.GONE}"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + android:layout_weight="0.5" + android:background="@drawable/badge_round_corner" + android:backgroundTint="@color/colorPrimary" + android:orientation="vertical" + android:padding="8dp" + android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + android:layout_marginTop="8dp" + android:orientation="horizontal" + android:weightSum="2"> - - + android:layout_weight="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? 1f : 2f}" + android:enabled="@{view.enabledChangePartitaMag}" + android:paddingEnd="4dp" + android:visibility="@{viewmodel.canPartitaMagBeChanged() || viewmodel.partitaMag != null ? View.VISIBLE : View.GONE}" + tools:layout_weight="1"> - + + + + + android:layout_weight="1" + android:enabled="@{view.enabledChangePartitaMag}" + android:visibility="@{viewmodel.shouldAskDataScad || viewmodel.shouldShowDataScad ? View.VISIBLE : View.GONE}"> - + android:focusableInTouchMode="false" + android:hint="@string/expire_date" + android:inputType="text" + app:binding="@{view.currentDataScad}" + app:parentView="@{view}" + app:warningOnOldDates="@{true}" /> - - - - - - - - - - - - - - - - - - + + android:layout_marginTop="8dp" + android:orientation="horizontal" + android:weightSum="3"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:paddingEnd="4dp" + tools:layout_weight="1"> - + + - - - - - - - + + + + + + + tools:layout_weight="1"> - + - - - - - - - - - - - + - + - - - + android:layout_marginTop="8dp" + android:orientation="horizontal" + android:visibility="@{viewmodel.mtbAart.isFlagQtaCnfFissaBoolean() ? View.GONE : View.VISIBLE}" + android:weightSum="3"> - + android:focusableInTouchMode="false" + android:paddingEnd="4dp" + tools:layout_weight="1"> - + - + - + + + + + + + tools:enabled="false" + tools:layout_weight="1"> - + - + + + + + + android:layout_marginTop="8dp" + android:orientation="horizontal"> - + android:enabled="@{view.enabledNotes}" + android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }"> - + + + - + - - - + android:layout_margin="16dp" + android:gravity="center_horizontal" + android:orientation="horizontal" + android:weightSum="1"> - + android:layout_marginStart="0dp" + android:layout_marginEnd="4dp" + android:layout_weight="0.4" + android:onClick="@{() -> view.saveAndCloseLU()}" + android:text="@string/action_close_ul" + app:strokeColor="@color/colorPrimary" + app:visibility="@{view.enabledLUCloseButton}" /> - + + + + + + + - - - - - - - - - - - - - - - + \ No newline at end of file From 2f3e74fbfeb197843f6e1e945925437d67b12d8c Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 29 Mar 2022 11:05:45 +0200 Subject: [PATCH 3/3] -> v1.24.7 (275) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cec1e390..552f3749 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 274 - def appVersionName = '1.24.6' + def appVersionCode = 275 + def appVersionName = '1.24.7' signingConfigs { release {