diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index be2889c1..cd7d4c20 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 05ba2f5b..23d37107 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 83 - def appVersionName = '1.7.6' + def appVersionCode = 84 + def appVersionName = '1.7.7' 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 9238efd0..6a795cde 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,7 +57,6 @@ 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, " + @@ -74,6 +73,7 @@ public class ProdRecuperoMaterialeHelper { "mtb_aart.descrizione, " + "mtb_aart.unt_mis, " + "mtb_colt.segno " + + "HAVING SUM(mtb_colr.qta_col) > 0 " + "ORDER BY data_collo DESC"; Type typeOfObjectsList = new TypeToken>() {}.getType(); 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 143cf3c8..6d124b6a 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 @@ -72,43 +72,6 @@ public class ProdRecuperoMaterialeViewModel { refreshAdapter(); } - public void openLU() { - DialogScanOrCreateLU.make(mContext, true, false, true, mtbColt -> { - if(mtbColt == null) { - ((IPoppableActivity)mContext).pop(); - } else if((mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(-1)){ - - if (!UtilityString.isNullOrEmpty(mtbColt.getPosizione()) && UtilityPosizione.isLineaProduzione(mtbColt.getPosizione())) { - - if(mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("E' stata scansionata una UL giĆ  vuota")), - null, this::openLU).show(); - - } else { - setMtbColt(mtbColt); -// chooseQuantityToReturn(); - } - - } else { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("Sono accettate solamente UL di provenienti da una linea di lavoro")), - null, this::openLU).show(); - } - - } else { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("Sono accettate solamente UL di Lavorazione di SCARICO")), - null, this::openLU).show(); - } - }).show(); - } - - - private void chooseQuantityToReturn(MtbAart mtbAart, BigDecimal min, BigDecimal max) { - - } - public void setMtbColt(MtbColt mtbColt) {