diff --git a/app/build.gradle b/app/build.gradle index c7754df3..a1d5c660 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 541 - def appVersionName = '1.48.01' + def appVersionCode = 542 + def appVersionName = '1.48.02' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index bdfb7b92..3b1a5b0a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -1185,8 +1185,12 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onBatchLotSelectionRequest(List availableBatchLotsCodJcoms, RunnableArgs onComplete) { handler.post(() -> { + this.onLoadingStarted(); + DialogChooseBatchLotView.newInstance(availableBatchLotsCodJcoms, onComplete) .show(getSupportFragmentManager(), "tag"); + + this.onLoadingEnded(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index ad43d88e..30b21892 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1050,10 +1050,7 @@ public class SpedizioneViewModel { // } if (availableBatchLotsAndCodJcoms.size() > 1) { - this.sendOnLoadingStarted(); - var selected = this.sendBatchLotSelectionRequest(availableBatchLotsAndCodJcoms); - this.sendOnLoadingEnded(); if (selected != null) { MtbColr scannedMtbColr = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().stream() diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index 61144572..08b0e277 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -564,14 +564,24 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } @Override - public void onWarning(String text, RunnableArgs result) { + public void onWarning(String text, Boolean showNegativeClick, RunnableArgs result) { handler.post(() -> { - - DialogSimpleMessageView.makeWarningDialog(context, new SpannableString(Html.fromHtml(text)), - null, - () -> result.run(true), - () -> result.run(false) - ).show(); + if (showNegativeClick) { + DialogSimpleMessageView.makeWarningDialog( + context, + new SpannableString(Html.fromHtml(text)), + null, + () -> result.run(true), + () -> result.run(false) + ).show(); + } else { + DialogSimpleMessageView.makeWarningDialog( + context, + new SpannableString(Html.fromHtml(text)), + null, + () -> result.run(true) + ).show(); + } }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index fe276b85..02ac4967 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -215,6 +215,12 @@ public class DialogInputQuantityV2ViewModel { } else if (ean128Model.Sscc != null) { //Close current UDS and open another one with new SSCC if (enableSSCCRead) { + + if (UtilityBigDecimal.lowerThan(totalNumCnfToBeTaken, totalNumCnfAvailable)){ + this.sendWarning(UtilityResources.getString(R.string.qta_to_be_taken_lower_then_qta_available), false); + return; + } + this.internalNextUlBarcode = barcodeScanDTO; this.sendOnULCloseRequested(); } @@ -674,7 +680,7 @@ public class DialogInputQuantityV2ViewModel { final FutureTask ft = new FutureTask<>(() -> { }, new Object()); AtomicBoolean returnResult = new AtomicBoolean(); - mListener.onWarning(text, result -> { + mListener.onWarning(text, true, result -> { returnResult.set(result); ft.run(); }); @@ -745,12 +751,17 @@ public class DialogInputQuantityV2ViewModel { if (this.mListener != null) mListener.onULCloseRequested(); } + private void sendWarning(String text, Boolean showNegativeClick) { + if (this.mListener != null) mListener.onWarning(text, showNegativeClick, result -> { + }); + } + public interface Listener extends ILoadingListener { void onDataChanged(); void onError(Exception ex); - void onWarning(String text, RunnableArgs result); + void onWarning(String text, Boolean showNegativeClick, RunnableArgs result); void onULCloseRequested(); } diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 41e94742..be489e7d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -225,6 +225,7 @@ Check box This is a regular preference %d anomalie. Continuare?]]> + quantità da prelevare risulta inferiore alla quantità totale disponibile.
Chiudere manualmente la UL.]]>
Stai per eliminare una UL. Confermi? Stai per eliminare una riga. Confermi? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 857c5e77..239f8d5d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -224,6 +224,7 @@ Check box This is a regular preference %d anomalies were found. To continue?]]> + quantity to be withdrawn is less than the total quantity available. Close the UL manually.]]> Are you sure you want to delete this UL? Please confirm Are you sure to delete? Please confirm