diff --git a/app/build.gradle b/app/build.gradle index 92e1f209..f6674794 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -152,7 +152,7 @@ dependencies { implementation 'com.github.pedromassango:doubleClick:3.0' //SQLite ROOM - def room_version = "2.5.2" + def room_version = "2.6.1" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java index 0dad8b69..50577a84 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java @@ -78,14 +78,12 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer { .setCodMarts(codMarts)) .enqueue(new Callback<>() { @Override - public void onResponse(Call> call, Response> response) { - analyzeAnswer(response, "getByCodMart", (m) -> { - onComplete.run(response.body().getEntityList()); - }, onFailed); + public void onResponse(Call>> call, Response>> response) { + analyzeAnswer(response, "getByCodMart", onComplete, onFailed); } @Override - public void onFailure(Call> call, Throwable t) { + public void onFailure(Call>> call, Throwable t) { onFailed.run(new Exception(t)); } }); @@ -112,26 +110,9 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer { public void getByCodMart(String codMartToFind, RunnableArgs onComplete, RunnableArgs onFailed) { - ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class); - articoloRESTConsumer.getByCodMart( - new RetrieveArticoloByCodMartRequestDTO() - .setCodMarts(Collections.singletonList(codMartToFind))) - .enqueue(new Callback<>() { - @Override - public void onResponse(Call> call, Response> response) { - analyzeAnswer(response, "getByCodMart", (m) -> { - if (response.body().getEntityList() != null && !response.body().getEntityList().isEmpty()) { - onComplete.run(response.body().getEntityList().get(0)); - } else onComplete.run(null); - - }, onFailed); - } - - @Override - public void onFailure(Call> call, Throwable t) { - onFailed.run(new Exception(t)); - } - }); + getByCodMarts(Collections.singletonList(codMartToFind), artList -> { + onComplete.run(artList != null && !artList.isEmpty() ? artList.get(0) : null); + }, onFailed); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java index f872a169..7a4754a7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java @@ -21,7 +21,7 @@ public interface ArticoloRESTConsumerService { Call> searchByBarcode(@Body() SearchArticoloByBarcodeRequestDTO searchArticoloByBarcodeRequest); @POST("wms/articolo/retrieveByCodMart") - Call> getByCodMart(@Body RetrieveArticoloByCodMartRequestDTO retrieveArticoloByCodMartRequest); + Call>> getByCodMart(@Body RetrieveArticoloByCodMartRequestDTO retrieveArticoloByCodMartRequest); @POST("wms/articolo/updateBarcodeImballo") Call> updateBarcodeImballo(@Body UpdateBarcodeImballoRequestDTO updateBarcodeImballoRequest); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java index 8505f0e9..feb85589 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/dto/SitBollaAccettazioneDTO.java @@ -16,8 +16,6 @@ public class SitBollaAccettazioneDTO { private BigDecimal qtaDoc; private BigDecimal qtaCnfDoc; private BigDecimal numCnfDoc; - private BigDecimal qtaAccettata; - private BigDecimal numCnfAccettata; private BigDecimal qtaDaAccettare; private BigDecimal numCnfDaAccettare; @@ -111,24 +109,6 @@ public class SitBollaAccettazioneDTO { return this; } - public BigDecimal getQtaAccettata() { - return qtaAccettata; - } - - public SitBollaAccettazioneDTO setQtaAccettata(BigDecimal qtaAccettata) { - this.qtaAccettata = qtaAccettata; - return this; - } - - public BigDecimal getNumCnfAccettata() { - return numCnfAccettata; - } - - public SitBollaAccettazioneDTO setNumCnfAccettata(BigDecimal numCnfAccettata) { - this.numCnfAccettata = numCnfAccettata; - return this; - } - public BigDecimal getQtaDaAccettare() { return qtaDaAccettare; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java index 66c50a46..ab0b3697 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java @@ -103,7 +103,8 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie List mtbColrs = mViewModel.getObservableMtbColt().get().getMtbColr(); mBinding.textviewArtCounter.setText(String.valueOf(mtbColrs.size())); mBinding.textviewArtDescription.setText(mContext.getResources().getQuantityString(R.plurals.articles, mtbColrs.size())); - mViewModel.calcPesi(); + + mViewModel.refreshPesi(); } public BottomSheetFragmentLUContentView setListener(Listener listener) { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java index a772c3d1..8ff3a4c6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java @@ -41,7 +41,7 @@ public class BottomSheetFragmentLUContentViewModel { return this; } - public void calcPesi() { + public void refreshPesi() { MtbColt collo = this.mtbColt.get(); if (collo == null) return; @@ -52,7 +52,7 @@ public class BottomSheetFragmentLUContentViewModel { for (MtbColr mtbColr : collo.getMtbColr()) { MtbAart articolo = mtbColr.getMtbAart(); - if (articolo == null || articolo.getPesoKg() == null) + if (articolo == null || articolo.getPesoKg() == null || articolo.getTaraKg() == null) continue; BigDecimal pesoRiga = articolo.isFlagQtaCnfFissaBoolean() ? mtbColr.getNumCnf().multiply(articolo.getPesoKg()) : mtbColr.getQtaCol(); diff --git a/build.gradle b/build.gradle index 248cf6da..d900b182 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.9.0' - agp_version = '8.1.4' + agp_version = '8.2.0' } repositories { @@ -13,7 +13,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:$agp_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.15' + classpath 'com.google.gms:google-services:4.4.0' classpath 'com.google.firebase:perf-plugin:1.4.2' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4c8dc7c7..8363ee5b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Feb 13 15:14:43 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME