From 4748cf7c1c79f77db521dca3bda7a98fa81f00aa Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 29 Jul 2019 17:10:43 +0200 Subject: [PATCH] -> v1.6.13(74) --- .idea/caches/build_file_checksums.ser | Bin 964 -> 964 bytes app/build.gradle | 4 ++-- .../ProdRecuperoMaterialeViewModel.java | 2 +- .../ProdVersamentoMaterialViewModel.java | 2 +- .../viewmodel/VersamentoMerceViewModel.java | 2 +- .../scan_or_create_lu/DialogScanOrCreateLU.java | 13 +++++++------ 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 98263fcf5d5b8af2aedd75494e7ce06c0c43d801..8a90b21a5fa523d1d632ac721bd6ad7cc8fa2ced 100644 GIT binary patch delta 54 zcmV-60LlNv2gC=Em;^pZhR?B_ZUK`^0zH!o0zm{2VQ_GhUji2pI7t*WmzE$|^E20K MhN5{Kv$Fyb0S-VC)c^nh delta 65 zcmV-H0KWgk2gC=Em;^5l{4TMaZUK`=0zn2KdSzmAVUtk;C6hG*5(E%oaB!1f0v8ap X?;NfL@{(QkecGqOtiP7CvjPzT{g)XR diff --git a/app/build.gradle b/app/build.gradle index 81f368eb..eb5cd312 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 73 - def appVersionName = '1.6.12' + def appVersionCode = 74 + def appVersionName = '1.6.13' signingConfigs { release { 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 e8127549..0d514c21 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 @@ -61,7 +61,7 @@ public class ProdRecuperoMaterialeViewModel { } public void openLU() { - DialogScanOrCreateLU.make(mContext, true, false, mtbColt -> { + DialogScanOrCreateLU.make(mContext, true, false, true, mtbColt -> { if(mtbColt == null) { ((IPoppableActivity)mContext).pop(); } else if((mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(-1)){ 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 1e7138ce..b747955b 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 @@ -48,7 +48,7 @@ public class ProdVersamentoMaterialViewModel { public void openLU() { - DialogScanOrCreateLU.make(mContext, true, mtbColt -> { + DialogScanOrCreateLU.make(mContext, true, false, mtbColt -> { if(mtbColt == null) { ((IPoppableActivity)mContext).pop(); } else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){ diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index 6c24ba4d..e15b0796 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -66,7 +66,7 @@ public class VersamentoMerceViewModel { } public void openLU() { - DialogScanOrCreateLU.make(mContext, true, mtbColt -> { + DialogScanOrCreateLU.make(mContext, true, false, mtbColt -> { if(mtbColt == null) { ((IPoppableActivity)mContext).pop(); } else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){ diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index f077da15..18d1d054 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -50,21 +50,22 @@ public class DialogScanOrCreateLU { public static Dialog make(final Context context, RunnableArgs onDialogDismiss) { - return new DialogScanOrCreateLU(context, false, true, onDialogDismiss).mDialog; + return new DialogScanOrCreateLU(context, false, true, true, onDialogDismiss).mDialog; } - public static Dialog make(final Context context, boolean disableCreation, RunnableArgs onDialogDismiss) { - return new DialogScanOrCreateLU(context, disableCreation, true, onDialogDismiss).mDialog; + public static Dialog make(final Context context, boolean disableCreation, boolean shouldCheckIfExistDoc, RunnableArgs onDialogDismiss) { + return new DialogScanOrCreateLU(context, disableCreation, true, shouldCheckIfExistDoc, onDialogDismiss).mDialog; } - public static Dialog make(final Context context, boolean disableCreation, boolean checkResiduo, RunnableArgs onDialogDismiss) { - return new DialogScanOrCreateLU(context, disableCreation, checkResiduo, onDialogDismiss).mDialog; + public static Dialog make(final Context context, boolean disableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, RunnableArgs onDialogDismiss) { + return new DialogScanOrCreateLU(context, disableCreation, checkResiduo, shouldCheckIfExistDoc, onDialogDismiss).mDialog; } - private DialogScanOrCreateLU(Context context, boolean disableCreation, boolean checkResiduo, RunnableArgs onDialogDismiss) { + private DialogScanOrCreateLU(Context context, boolean disableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, RunnableArgs onDialogDismiss) { mOnDialogDismiss = null; currentMtbColt = null; mShouldCheckResiduo = checkResiduo; + mShouldCheckIfExistDoc = shouldCheckIfExistDoc; mContext = context;