From 7bdb9b47f4f516d4f338f2f477daba65509187ef Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 1 Apr 2025 17:27:36 +0200 Subject: [PATCH] Fix su qtaCnfOrd in VerificaGiacenze --- .../AccettazioneBollaPickingActivity.java | 2 +- .../AccettazioneOrdiniPickingActivity.java | 2 +- .../pv_verifica_giacenze/VerificaGiacenzeFragment.java | 1 + .../gest/spedizione/SpedizioneActivity.java | 2 +- .../input_quantity_v2/DialogInputQuantityV2DTO.java | 10 +++++----- .../input_quantity_v2/DialogInputQuantityV2View.java | 8 ++++---- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java index 2c9701f5..4d618d3e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java @@ -609,7 +609,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac .setInitialQtaTot(initialQtaTot) .setTotalQtaOrd(totalQtaOrd) .setTotalNumCnfOrd(totalNumCnfOrd) - .setQtaCnfOrd(qtaCnfOrd) + .setTotalQtaCnfOrd(qtaCnfOrd) .setTotalQtaToBeTaken(totalQtaToBeTaken) .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken) .setQtaCnfToBeTaken(qtaCnfToBeTaken) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java index 0d15c4a9..403b0907 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java @@ -782,7 +782,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A @Override public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, String customArtDescription, RunnableArgss onComplete) { - DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO().setMtbAart(mtbAart).setInitialNumCnf(initialNumCnf).setInitialQtaCnf(initialQtaCnf).setInitialQtaTot(initialQtaTot).setTotalQtaOrd(totalQtaOrd).setTotalNumCnfOrd(totalNumCnfOrd).setQtaCnfOrd(qtaCnfOrd).setTotalQtaToBeTaken(totalQtaToBeTaken).setTotalNumCnfToBeTaken(totalNumCnfToBeTaken).setQtaCnfToBeTaken(qtaCnfToBeTaken).setTotalQtaAvailable(totalQtaAvailable).setTotalNumCnfAvailable(totalNumCnfAvailable).setQtaCnfAvailable(qtaCnfAvailable).setPartitaMag(partitaMag).setDataScad(dataScad).setCanPartitaMagBeChanged(canPartitaMagBeChanged).setCanLUBeClosed(true).setCanOverflowOrderQuantity(canOverflowQuantity).setCustomArtDescription(customArtDescription); + DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO().setMtbAart(mtbAart).setInitialNumCnf(initialNumCnf).setInitialQtaCnf(initialQtaCnf).setInitialQtaTot(initialQtaTot).setTotalQtaOrd(totalQtaOrd).setTotalNumCnfOrd(totalNumCnfOrd).setTotalQtaCnfOrd(qtaCnfOrd).setTotalQtaToBeTaken(totalQtaToBeTaken).setTotalNumCnfToBeTaken(totalNumCnfToBeTaken).setQtaCnfToBeTaken(qtaCnfToBeTaken).setTotalQtaAvailable(totalQtaAvailable).setTotalNumCnfAvailable(totalNumCnfAvailable).setQtaCnfAvailable(qtaCnfAvailable).setPartitaMag(partitaMag).setDataScad(dataScad).setCanPartitaMagBeChanged(canPartitaMagBeChanged).setCanLUBeClosed(true).setCanOverflowOrderQuantity(canOverflowQuantity).setCustomArtDescription(customArtDescription); if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java index 40aec6ff..d4a3d8a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java @@ -275,6 +275,7 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra .setTotalNumCnfInWarehouse(inWarehouseNumCnf) .setTotalQtaInWarehouse(inWarehouseQtaTot) .setTotalQtaOrd(incomingQtaTot) + .setTotalQtaCnfOrd(initialQtaCnf) .setTotalNumCnfOrd(incomingNumCnf) .setPartitaMag(partitaMag) .setDataScad(dataScad) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index 1f4e7de6..29c43d92 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -999,7 +999,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo .setInitialQtaTot(initialQtaTot) .setTotalQtaOrd(totalQtaOrd) .setTotalNumCnfOrd(totalNumCnfOrd) - .setQtaCnfOrd(qtaCnfOrd) + .setTotalQtaCnfOrd(qtaCnfOrd) .setTotalQtaToBeTaken(totalQtaToBeTaken) .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken) .setQtaCnfToBeTaken(qtaCnfToBeTaken) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java index 640a29ce..fb0c386b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java @@ -20,7 +20,7 @@ public class DialogInputQuantityV2DTO { private BigDecimal totalQtaOrd; private BigDecimal totalNumCnfOrd; - private BigDecimal qtaCnfOrd; + private BigDecimal totalQtaCnfOrd; private BigDecimal totalQtaInWarehouse; private BigDecimal totalNumCnfInWarehouse; @@ -116,12 +116,12 @@ public class DialogInputQuantityV2DTO { return this; } - public BigDecimal getQtaCnfOrd() { - return UtilityBigDecimal.round(qtaCnfOrd); + public BigDecimal getTotalQtaCnfOrd() { + return UtilityBigDecimal.round(totalQtaCnfOrd); } - public DialogInputQuantityV2DTO setQtaCnfOrd(BigDecimal qtaCnfOrd) { - this.qtaCnfOrd = qtaCnfOrd; + public DialogInputQuantityV2DTO setTotalQtaCnfOrd(BigDecimal totalQtaCnfOrd) { + this.totalQtaCnfOrd = totalQtaCnfOrd; return this; } 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 b387510e..96d64cfc 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 @@ -162,7 +162,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia .setTotalNumCnfCommitted(mDialogInputQuantityV2DTO.getTotalNumCnfCommitted()) .setTotalNumCnfOrd(mDialogInputQuantityV2DTO.getTotalNumCnfOrd()) .setTotalQtaOrd(mDialogInputQuantityV2DTO.getTotalQtaOrd()) - .setQtaCnfOrd(mDialogInputQuantityV2DTO.getQtaCnfOrd()) + .setQtaCnfOrd(mDialogInputQuantityV2DTO.getTotalQtaCnfOrd()) .setTotalNumCnfToBeTaken(mDialogInputQuantityV2DTO.getTotalNumCnfToBeTaken()) .setTotalQtaToBeTaken(mDialogInputQuantityV2DTO.getTotalQtaToBeTaken()) .setQtaCnfToBeTaken(mDialogInputQuantityV2DTO.getQtaCnfToBeTaken()) @@ -510,10 +510,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia this.enabledLUCloseButton.set(this.mDialogInputQuantityV2DTO.isCanLUBeClosed()); this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg() != null ? this.mViewModel.getMtbAart().getTaraKg() : BigDecimal.ZERO); - 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(); + if (this.mDialogInputQuantityV2DTO.getMtbAart().isFlagQtaCnfFissaBoolean() && this.mDialogInputQuantityV2DTO.getTotalQtaOrd() != null && !this.mDialogInputQuantityV2DTO.getTotalQtaOrd().equals(BigDecimal.ZERO) && !(this.mDialogInputQuantityV2DTO.getTotalQtaCnfOrd().compareTo(BigDecimal.ZERO) == 0)) { + int numCnftoTake = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().divide(this.mDialogInputQuantityV2DTO.getTotalQtaCnfOrd(), 0, RoundingMode.DOWN).intValue(); this.currentTextNumCnfToTake.set(numCnftoTake); - int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().remainder(this.mDialogInputQuantityV2DTO.getQtaCnfOrd()).intValue(); + int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().remainder(this.mDialogInputQuantityV2DTO.getTotalQtaCnfOrd()).intValue(); this.currentTextNumPezziToTake.set(qtaText); } else { this.currentTextNumCnfToTake.set(0);