diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java index bb0f8709..decb423e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java @@ -255,7 +255,7 @@ public class ArticoloOrdine { public int checkQtaProposta() { int check = 0; - if (!qtaProposta.equals(BigDecimal.ZERO)) { + if (qtaProposta != null && !qtaProposta.equals(BigDecimal.ZERO)) { check = BigDecimal.valueOf(qtaOrd).compareTo(qtaProposta); } return check; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java index 5b5801aa..c51a9368 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java @@ -47,7 +47,7 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer { public void saveOrdine(SaveDTO saveDTO, RunnableArgs onComplete, RunnableArgs onFailed) { - MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class); + MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class, 240); service.saveOrdine(saveDTO) .enqueue(new Callback<>() { @Override