diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 3d4e89a9..3eba29cf 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 86e8af8a..9f967e41 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 45 - def appVersionName = '1.0.42' + def appVersionCode = 46 + def appVersionName = '1.0.43' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index 622d9f7c..6a781998 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -528,9 +528,13 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked if (!mtbColt.get().getDisablePrint()) { printCollo(progress); } else { + progress.dismiss(); resetMtbColt(openNewOne); } - }, progress::dismiss, ex -> UtilityExceptions.defaultException(mContext, ex, progress)); + }, () -> { + progress.dismiss(); + resetMtbColt(openNewOne); + }, ex -> UtilityExceptions.defaultException(mContext, ex, progress)); } } else { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index fb624437..55221a9e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -142,13 +142,15 @@ public class VenditaHelper { public void getBancaliVenditaGiaRegistrati(List orders, RunnableArgs> onComplete, RunnableArgs onFailed) { String baseSql = "SELECT DISTINCT mtb_colt.* " + - "FROM mtb_colt, mtb_colr " + - "WHERE mtb_colt.gestione = mtb_colr.gestione AND " + - "mtb_colt.ser_collo = mtb_colr.ser_collo AND " + - "mtb_colt.data_collo = mtb_colr.data_collo AND " + - "mtb_colt.num_collo = mtb_colr.num_collo AND " + - "mtb_colt.gestione IN ('V', 'L') AND " + - "mtb_colt.data_doc is null AND "; + "FROM mtb_colt, " + + " mtb_colr " + + "WHERE mtb_colt.gestione = mtb_colr.gestione " + + " AND mtb_colt.ser_collo = mtb_colr.ser_collo " + + " AND mtb_colt.data_collo = mtb_colr.data_collo " + + " AND mtb_colt.num_collo = mtb_colr.num_collo " + + " AND (mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') " + + " AND mtb_colt.ser_collo = '/' " + + " AND mtb_colt.data_doc IS NULL AND "; StringBuilder whereCond = new StringBuilder();