diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 2d8d9e21..be2889c1 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index bf2ef1a7..fc9d4646 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 14ab6024..05ba2f5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
- def appVersionCode = 82
- def appVersionName = '1.7.5'
+ def appVersionCode = 83
+ def appVersionName = '1.7.6'
signingConfigs {
release {
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) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
index e17a7bcd..c93d41a6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
@@ -1,6 +1,7 @@
package it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel;
import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Context;
import android.text.Html;
import android.text.SpannableString;
@@ -15,6 +16,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.databinding.FragmentProdVersamentoMaterialeBinding;
import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
@@ -94,12 +96,14 @@ public class ProdVersamentoMaterialViewModel {
private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) {
+ ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
+
MtbColt cloneUL = ((MtbColt) mtbColt.get().clone());
cloneUL.setCodJfas(mtbDepoPosizione.getPosizione());
- cloneUL.setSerCollo(null);
ColliMagazzinoRESTConsumer.createColloScaricoDaCarico(cloneUL, mtbDepoPosizione, generatedMtbColt -> {
showDataSavedDialog(() -> {
+ progressDialog.dismiss();
mOnVersamentoCompleted.run();
});
}, ex -> {