From cf64ead7b1f1ab24f485752ef7eab727c37b533a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 24 Sep 2019 15:36:00 +0200 Subject: [PATCH] Implementato DialogInputQuantity in fase di recupero materiale da produzione. --- .../core/ProdRecuperoMaterialeHelper.java | 1 + .../ProdRecuperoMaterialeViewModel.java | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java index b480c4e2..9238efd0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java @@ -57,6 +57,7 @@ public class ProdRecuperoMaterialeHelper { "LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " + "WHERE jtb_fasi.cod_jfas IS NOT NULL " + "AND segno = -1 " + + "AND qta_col > 0 " + "GROUP BY jtb_fasi.cod_jfas, " + "jtb_fasi.descrizione, " + "mtb_colr.gestione, " + diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java index cdfe4225..143cf3c8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java @@ -132,10 +132,26 @@ public class ProdRecuperoMaterialeViewModel { qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol()); - InputQuantityToReturnDialog.make(mContext, item.getMtbAart(), BigDecimal.ONE, qtaDaEvadere, quantity -> { - onItemDispatched(item, quantity); + DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO() + .setBatchLot(item.getPartitaMag()) + .setQtaDaEvadere(null) + .setQtaOrd(null) + .setMtbAart(item.getMtbAart()) + .setCanPartitaMagBeChanged(false) + .setQtaTot(BigDecimal.ONE) + .setMaxQta(qtaDaEvadere) + .setQtaDisponibile(qtaDaEvadere); + + DialogInputQuantity.makeBase(mContext, dto, false, quantity -> { + onItemDispatched(item, quantity.qtaTot.getBigDecimal()); + }, () -> { + }).show(); +// InputQuantityToReturnDialog.make(mContext, item.getMtbAart(), BigDecimal.ONE, qtaDaEvadere, quantity -> { +// onItemDispatched(item, quantity); +// }).show(); + } private void onItemDispatched(HistoryVersamentoProdUL item, BigDecimal quantity) {