From 43ff3b18565138417006532d2649401c2c6cefb9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 26 Jul 2019 17:31:52 +0200 Subject: [PATCH] =?UTF-8?q?[FEAT]=20Implementato=20controllo=20per=20evita?= =?UTF-8?q?re=20l'apertura/modifica=20di=20UL=20gi=C3=A0=20agganciate=20a?= =?UTF-8?q?=20documento.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DialogScanOrCreateLU.java | 62 +++++++++++++------ 1 file changed, 42 insertions(+), 20 deletions(-) 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 7ad91b65..f077da15 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 @@ -34,7 +34,7 @@ import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; public class DialogScanOrCreateLU { - private Context currentContext; + private Context mContext; private Dialog mDialog; @@ -46,6 +46,7 @@ public class DialogScanOrCreateLU { private boolean mShouldCheckResiduo = false; + private boolean mShouldCheckIfExistDoc = true; public static Dialog make(final Context context, RunnableArgs onDialogDismiss) { @@ -65,7 +66,7 @@ public class DialogScanOrCreateLU { currentMtbColt = null; mShouldCheckResiduo = checkResiduo; - currentContext = context; + mContext = context; LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); @@ -88,12 +89,12 @@ public class DialogScanOrCreateLU { mOnDialogDismiss = onDialogDismiss; mBinding.createNewLuButton.setOnClickListener(v -> { - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext); + final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.createColloLavorazione(+1, createdMtbColt -> { sendMtbColt(createdMtbColt, progressDialog); }, ex -> { - UtilityExceptions.defaultException(currentContext, ex, progressDialog); + UtilityExceptions.defaultException(mContext, ex, progressDialog); }); }); } @@ -118,7 +119,7 @@ public class DialogScanOrCreateLU { private RunnableArgs onScanSuccessfull = data -> { BarcodeManager.disable(); - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext); + final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); if(UtilityBarcode.isEtichettaPosizione(data)){ this.executeEtichettaPosizione(data, progressDialog); @@ -150,7 +151,7 @@ public class DialogScanOrCreateLU { ColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), mShouldCheckResiduo, false, mtbColt -> { sendMtbColt(mtbColt, progressDialog); }, ex -> { - UtilityExceptions.defaultException(currentContext, ex, progressDialog); + UtilityExceptions.defaultException(mContext, ex, progressDialog); BarcodeManager.enable(); }); @@ -163,7 +164,7 @@ public class DialogScanOrCreateLU { } }, ex -> { - UtilityExceptions.defaultException(currentContext, ex, progressDialog); + UtilityExceptions.defaultException(mContext, ex, progressDialog); BarcodeManager.enable(); }); @@ -180,21 +181,31 @@ public class DialogScanOrCreateLU { createdMtbColt.setDisablePrint(true); sendMtbColt(createdMtbColt, progressDialog); }, ex -> { - UtilityExceptions.defaultException(currentContext, ex, progressDialog); + UtilityExceptions.defaultException(mContext, ex, progressDialog); BarcodeManager.enable(); }); } else { - BarcodeManager.enable(); + if(mtbColt.getCodDtip() != null && mShouldCheckIfExistDoc) { + DialogSimpleMessageHelper.makeWarningDialog(mContext, + new SpannableString(mContext.getResources().getText(R.string.lu_already_attache_to_doc)), + null, () -> { + BarcodeManager.enable(); + progressDialog.dismiss(); + }) + .show(); + } else { + BarcodeManager.enable(); - mtbColt.setDisablePrint(true); - sendMtbColt(mtbColt, progressDialog); + mtbColt.setDisablePrint(true); + sendMtbColt(mtbColt, progressDialog); + } } }, ex -> { - UtilityExceptions.defaultException(currentContext, ex, progressDialog); + UtilityExceptions.defaultException(mContext, ex, progressDialog); BarcodeManager.enable(); }); } @@ -209,8 +220,19 @@ public class DialogScanOrCreateLU { if(mtbColt != null) { - BarcodeManager.enable(); - sendMtbColt(mtbColt, progressDialog); + if(mtbColt.getCodDtip() != null && mShouldCheckIfExistDoc) { + DialogSimpleMessageHelper.makeWarningDialog(mContext, + new SpannableString(mContext.getResources().getText(R.string.lu_already_attache_to_doc)), + null, () -> { + BarcodeManager.enable(); + progressDialog.dismiss(); + }) + .show(); + } else { + BarcodeManager.enable(); + sendMtbColt(mtbColt, progressDialog); + } + } else { BarcodeManager.enable(); @@ -219,7 +241,7 @@ public class DialogScanOrCreateLU { } }, ex -> { - UtilityExceptions.defaultException(currentContext, ex, progressDialog); + UtilityExceptions.defaultException(mContext, ex, progressDialog); BarcodeManager.enable(); }); @@ -234,21 +256,21 @@ public class DialogScanOrCreateLU { }, ex -> { - UtilityExceptions.defaultException(currentContext, ex, progressDialog); + UtilityExceptions.defaultException(mContext, ex, progressDialog); BarcodeManager.enable(); }); } private void showTooMuchULFound() { - DialogSimpleMessageHelper.makeWarningDialog(currentContext, - new SpannableString(currentContext.getResources().getText(R.string.too_much_lu_found_message)), + DialogSimpleMessageHelper.makeWarningDialog(mContext, + new SpannableString(mContext.getResources().getText(R.string.too_much_lu_found_message)), null, null).show(); } private void showNoULFound() { - DialogSimpleMessageHelper.makeWarningDialog(currentContext, - new SpannableString(currentContext.getResources().getText(R.string.no_lu_found_message)), + DialogSimpleMessageHelper.makeWarningDialog(mContext, + new SpannableString(mContext.getResources().getText(R.string.no_lu_found_message)), null, null).show(); }