From 57c22b617ec36deba33cdc1f15546f828504a639 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 21 Jul 2022 15:58:01 +0200 Subject: [PATCH 1/2] =?UTF-8?q?apportate=20modifiche=20rientro=20merce=20r?= =?UTF-8?q?ichieste=20da=20Agricoper,=20risolto=20bug=20divide=20by=20zero?= =?UTF-8?q?=20in=20spedizione=20quando=20qtaCmfOrd=20=C3=A8=20decimale?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProdRientroMerceOrderListFragment.java | 23 +++++++- .../DialogInputQuantityV2View.java | 4 +- .../main/res/layout/dialog_input_lu_prod.xml | 12 ++-- ...tro_merce_order_list__list_group_model.xml | 58 ++++++++----------- ...d_rientro_merce_order_list__list_model.xml | 11 ++-- 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java index dc8cd432..c7f835e2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java @@ -15,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.annimon.stream.ComparatorCompat; import com.annimon.stream.Stream; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; @@ -116,7 +117,9 @@ public class ProdRientroMerceOrderListFragment extends Fragment { private List convertDataModelToListModel(List dataList) { ComparatorCompat comparator = ComparatorCompat - .comparing(OrdineLavorazioneDTO::getCodJfas) + .comparing(OrdineLavorazioneDTO::getCodAnag) + .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDescCommessa() != null ? ordineLavorazioneDTO.getDescCommessa() : "zzzzzzzz")) + .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataConsCommessaD() != null ? String.valueOf(ordineLavorazioneDTO.getDataConsCommessaD().getTime()) : "999999999999")).reversed() .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataOrd() != null ? ordineLavorazioneDTO.getDataOrd() : "zzzzzzzz")).reversed() .thenComparing(ComparatorCompat.comparing(OrdineLavorazioneDTO::getNumOrd)); @@ -140,7 +143,7 @@ public class ProdRientroMerceOrderListFragment extends Fragment { break; } - listModel.setGroupTitle(x.getCodJfas()); + listModel.setGroupTitle(x.getRagSocAnag()); if (!UtilityString.isNullOrEmpty(x.getDataConsCommessa())) { listModel.setPreDescription("Consegna: " + UtilityDate.formatDate(x.getDataConsCommessaD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); @@ -157,7 +160,21 @@ public class ProdRientroMerceOrderListFragment extends Fragment { listModel.setRightDescription(x.getCodJcom() != null ? (x.getDescCommessa() + " (" + x.getCodJcom() + ")") : ""); listModel.setProgress(x.getProgress()); - listModel.setRightSubDescription(x.getNumCnf().stripTrailingZeros().toPlainString() + " COL"); + int numPedane = x.getNumCnf().divide(x.getColliPedana(), 0, RoundingMode.DOWN).intValue(); + int numCnf = x.getNumCnf().remainder(x.getColliPedana()).intValue(); + String qtaOrdLabel = ""; + if (numPedane > 0) { + qtaOrdLabel += numPedane + "UL x " + x.getColliPedana().stripTrailingZeros().toPlainString() + " COL"; + if (numCnf > 0) { + qtaOrdLabel += " + "; + } + } + if (numCnf > 0) { + qtaOrdLabel += numCnf + " COL"; + } + +// listModel.setRightSubDescription(x.getNumCnf().stripTrailingZeros().toPlainString() + " COL"); + listModel.setRightSubDescription(qtaOrdLabel); /*try { listModel.setRightSubDescription(UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); } catch (Exception ex) { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index b7044a7f..52fe6128 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -412,10 +412,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia this.enabledLUCloseButton.set(this.mDialogInputQuantityV2DTO.isCanLUBeClosed()); this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg()); - if (this.mDialogInputQuantityV2DTO.getMtbAart().isFlagQtaCnfFissaBoolean() && this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue() == 0)) { + if (this.mDialogInputQuantityV2DTO.getMtbAart().isFlagQtaCnfFissaBoolean() && this.mDialogInputQuantityV2DTO.getTotalQtaOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalQtaOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getQtaCnfOrd().compareTo(BigDecimal.ZERO) == 0)) { int numCnftoTake = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().divide(this.mDialogInputQuantityV2DTO.getQtaCnfOrd(), 0, RoundingMode.DOWN).intValue(); this.currentTextNumCnfToTake.set(numCnftoTake); - int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getQtaCnfOrd().intValue(); + int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().remainder(this.mDialogInputQuantityV2DTO.getQtaCnfOrd()).intValue(); this.currentTextNumPezziToTake.set(qtaText); } else { this.currentTextNumCnfToTake.set(0); diff --git a/app/src/main/res/layout/dialog_input_lu_prod.xml b/app/src/main/res/layout/dialog_input_lu_prod.xml index c4d51048..9ee24e63 100644 --- a/app/src/main/res/layout/dialog_input_lu_prod.xml +++ b/app/src/main/res/layout/dialog_input_lu_prod.xml @@ -50,7 +50,7 @@ android:src="@drawable/ic_erase_96" android:backgroundTint="@android:color/transparent" android:onClick="@{() -> view.resetValues()}" - android:tint="@android:color/white"/> + android:tint="@android:color/white" /> - - - - - - + tools:text="Cons 07 nov 2018" /> - - + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + tools:text="CLIENTE (COMMESSA)" /> - + - - + - + android:textStyle="bold" + tools:text="NOME GRUPPO" /> From a22ecb96207e46ad0cfd1371b838a39e5251a110 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 21 Jul 2022 15:58:54 +0200 Subject: [PATCH 2/2] -> v1.28.4 (298) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 05290803..e935030d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 297 - def appVersionName = '1.28.3' + def appVersionCode = 298 + def appVersionName = '1.28.4' signingConfigs { release {