From feb79ff95db8b10bcf0aafb1ded2fc4d2006c410 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 9 Dec 2022 19:26:23 +0100 Subject: [PATCH] Modifiche per inventario --- .../it/integry/integrywmsnative/SplashActivity.java | 9 +++++---- .../core/rest/consumers/_BaseRESTConsumer.java | 7 ++++--- .../inventario/picking/PickingInventarioActivity.java | 3 ++- .../picking/PickingInventarioViewModel.java | 4 ++-- .../gest/spedizione/SpedizioneViewModel.java | 11 ++++++----- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java index 4af69432..e38e3df1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java @@ -83,12 +83,13 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener private void initPermissions(Runnable onComplete) { PermissionsHelper.askPermissions(this, onComplete, permanentlyDenied -> { - if (permanentlyDenied) { + if (permanentlyDenied) onError(new SpannableString(getText(R.string.permissions_permanently_denied))); - } else { - initPermissions(onComplete); - } + +// else { +// initPermissions(onComplete); +// } }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java index 02b7194b..ed399da0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java @@ -39,9 +39,10 @@ public abstract class _BaseRESTConsumer { } } else { if (response.code() == 404) { - Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url().toString() + ")"); - onFailed.run(new Exception("Errore " + response.code() + ": risorsa non trovata (" + logTitle + ")")); - } else if (response.code() == 550) + Log.e(logTitle, "Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url() + ")"); + onFailed.run(new Exception("Errore " + response.code() + ": risorsa non trovata (" + response.raw().request().url() + ")")); + } + else if (response.code() == 550) onFailed.run(new NotValidLicenseException()); else { Log.e(logTitle, "Status " + response.code() + ": " + response.message()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java index 509a59d2..7fc13d3a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java @@ -206,7 +206,8 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn .setDataScad(dataScad) .setCanOverflowOrderQuantity(canOverflowOrderQuantity) .setCanPartitaMagBeChanged(canPartitaMagBeChanged) - .setCanLUBeClosed(canLUBeClosed); + .setCanLUBeClosed(canLUBeClosed) + .setNumCnfEditable(false); if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java index 7c7de7b5..7a4792b5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java @@ -252,9 +252,9 @@ public class PickingInventarioViewModel extends ViewModel { this.sendOnItemDispatched( pickingObjectDTO, pickingObjectDTO.getMtbAart(), - initialNumCnf, + null, //initialNumCnf, initialQtaCnf, - initialQtaTot, + null, //initialQtaTot, null, null, null, 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 d660632b..e1473094 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 @@ -1652,11 +1652,12 @@ public class SpedizioneViewModel { onOrderClosedPrintingDone(); return; } - List closedOrders = Stream.of(this.mTestateOrdini).map(ord -> { - DtbOrdt ordV = new DtbOrdt(); - ordV.setDataOrd(ord.getDataOrdS()).setNumOrd(ord.getNumOrd()).setGestione(ord.getGestione()).setCodAnag(ord.getCodAnagOrd()); - return ordV; - }).toList(); + List closedOrders = Stream.of(this.mTestateOrdini) + .map(ord -> { + DtbOrdt ordV = new DtbOrdt(); + ordV.setDataOrd(ord.getDataOrdS()).setNumOrd(ord.getNumOrd()).setGestione(ord.getGestione()).setCodAnag(ord.getCodAnagOrd()); + return ordV; + }).toList(); dto.setPrintList(closedOrders); printClosedOrders(dto, this::onOrderClosedPrintingDone, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));