diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java index bffd491f..65806503 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java @@ -26,8 +26,6 @@ public class CommonRESTException { put(MESSAGE_KEY, "Barcode non letto correttamente"); put(EXCEPTION_KEY, NoResultFromBarcodeException.class); }}); - - }}; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java index ba014ab2..8921513d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java @@ -115,7 +115,10 @@ public class ProdRecuperoMaterialeViewModel { qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol()); if (!UtilityBigDecimal.equalsTo(qtaDaEvadere, BigDecimal.ZERO)) { - numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf()); + + if(item.getMtbAart().isFlagQtaCnfFissaBoolean()) + numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf()); + else numCnfDaEvadere = item.getNumCnf(); } this.sendOnItemDispatched(item, 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 fa09f2a6..506c6a36 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 @@ -1882,6 +1882,7 @@ public class SpedizioneViewModel { .setCodAnag(ord.getCodAnagOrd()); return ordV; }).toList(); + dto.setPrintList(closedOrders); printClosedOrders(dto, this::sendOnOrderClosed, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded)); } diff --git a/app/src/main/res/layout/layout_filter_agente.xml b/app/src/main/res/layout/layout_filter_agente.xml index e0d28e0f..ef214486 100644 --- a/app/src/main/res/layout/layout_filter_agente.xml +++ b/app/src/main/res/layout/layout_filter_agente.xml @@ -79,8 +79,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/title_layout"> + app:layout_constraintStart_toStartOf="parent">