diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..a7561653 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c08014f7..8f2dfc64 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 141 - def appVersionName = '1.12.12' + def appVersionCode = 142 + def appVersionName = '1.12.13' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java index 38eff484..61edc4b4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java @@ -1,14 +1,13 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel; import android.app.Dialog; +import android.text.SpannableString; +import androidx.appcompat.app.AlertDialog; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableField; -import androidx.appcompat.app.AlertDialog; import androidx.recyclerview.widget.LinearLayoutManager; -import android.text.SpannableString; - import com.annimon.stream.Stream; import com.tfb.fbtoast.FBToast; @@ -17,16 +16,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import it.integry.barcode_base_android_library.model.BarcodeScanDTO; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; -import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; @@ -35,6 +27,14 @@ import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.report.ReportManager; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityDate; @@ -49,15 +49,12 @@ import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.IOnOrdi import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.MainListOrdineAccettazioneAdapter; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoOrderBy; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest.OrdineAccettazioneInevasoRESTConsumerService; -import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; -import it.integry.barcode_base_android_library.model.BarcodeScanDTO; - -import static br.com.zbra.androidlinq.Linq.stream; +import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog; public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloClosedCallback, IOnOrdineAccettazioneRowDispatchCallback { @@ -463,8 +460,8 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } List codAnags = - stream(mOrders) - .select(OrdineAccettazioneDTO::getCodAnag) + Stream.of(mOrders) + .map(OrdineAccettazioneDTO::getCodAnag) .distinct() .toList(); @@ -473,8 +470,8 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } List rifOrds = - stream(mOrders) - .select(OrdineAccettazioneDTO::getRifOrd) + Stream.of(mOrders) + .map(OrdineAccettazioneDTO::getRifOrd) .distinct() .toList(); @@ -483,8 +480,8 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } List numDataOrds = - stream(mOrders) - .select(value -> ("" + value.getNumero()) + value.getData()) + Stream.of(mOrders) + .map(value -> value.getNumero() + value.getData()) .distinct() .toList(); @@ -528,7 +525,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC }); }, ex -> UtilityExceptions.defaultException(mActivity, ex, finalProgress)); - }).show(); + }, finalProgress::dismiss).show(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index c63c3158..63662db7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -385,6 +385,8 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC } else postNoteSave.run(); + }, () -> { + }).show(); } else { deleteCollo(progress, onComplete); 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 14668ab2..619c9d88 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 @@ -176,7 +176,7 @@ public class ProdRecuperoMaterialeViewModel { DialogInputQuantity.makeBase(mContext, dto, false, quantity -> { onItemDispatched(item, quantity.qtaTot.getBigDecimal(), sourceMtbColt, dialogProgress); }, () -> { - + if(dialogProgress != null) dialogProgress.dismiss(); }).show(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index b89dfd45..a7efc7ff 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -1034,11 +1034,17 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO MtbColr withdrawRow = this.mPickingList.get(i).getWithdrawRows().get(k); - this.mPickingList.get(i).setQtaCollo(this.mPickingList.get(i).getQtaCollo().subtract(withdrawRow.getQtaCol())); this.mPickingList.get(i).setQtaOrd(this.mPickingList.get(i).getQtaOrd().subtract(withdrawRow.getQtaCol())); - this.mPickingList.get(i).setNumCnfCollo(this.mPickingList.get(i).getNumCnfCollo().subtract(withdrawRow.getNumCnf())); this.mPickingList.get(i).setNumCnfOrd(this.mPickingList.get(i).getNumCnfOrd().subtract(withdrawRow.getNumCnf())); + if(this.mPickingList.get(i).getQtaCollo() != null) { + this.mPickingList.get(i).setQtaCollo(this.mPickingList.get(i).getQtaCollo().subtract(withdrawRow.getQtaCol())); + } + + if(this.mPickingList.get(i).getNumCnfCollo() != null) { + this.mPickingList.get(i).setNumCnfCollo(this.mPickingList.get(i).getNumCnfCollo().subtract(withdrawRow.getNumCnf())); + } + } this.mPickingList.get(i).getWithdrawRows().clear(); diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java b/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java index 200d73aa..d4d25345 100644 --- a/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java +++ b/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java @@ -57,6 +57,11 @@ public class DeactivatableViewPager extends ViewPager implements Animation.Anima height = getMinimumHeight(); } + int displayHeight = (int)(getResources().getDisplayMetrics().heightPixels*0.77); + + if(height > displayHeight) height = displayHeight; + + int newHeight = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY); if (/*getLayoutParams().height != 0 && */heightMeasureSpec != height && height > 0 && height < 100000) { // animate() diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java index dbf5b69c..c5f7b4a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java @@ -75,6 +75,8 @@ public class DialogBasketLU { mDialog.setOnShowListener(v -> { + + viewPagerAdapter.getViewModel(R.layout.dialog_basket_lu__page2).setOnConfirmClickListener(data -> { MtbColt mtbColt = (MtbColt) data; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java index 50196c74..e110c041 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java @@ -45,7 +45,7 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel @Override public void onShow() { - + this.mBinding.getRoot().requestLayout(); mBinding.constraintLayout.setMaxHeight((int) (mContext.getResources().getDisplayMetrics().heightPixels * 0.75)); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java index ee388813..ccc4653e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java @@ -60,7 +60,7 @@ public class DialogBasketLU_Page2_ViewModel extends DialogBasketLU_BaseViewModel @Override public void onShow() { - + this.mBinding.getRoot().getParent().requestLayout(); } @Override @@ -75,7 +75,7 @@ public class DialogBasketLU_Page2_ViewModel extends DialogBasketLU_BaseViewModel private void initRecyclerView(List dataset) { - mBinding.dialogBasketLuMtbColrList.setNestedScrollingEnabled(false); + //mBinding.dialogBasketLuMtbColrList.setNestedScrollingEnabled(false); mBinding.dialogBasketLuMtbColrList.setHasFixedSize(true); mBinding.dialogBasketLuMtbColrList.setLayoutManager(new LinearLayoutManager(mContext)); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java index ecf03469..1bc2546a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java @@ -16,11 +16,11 @@ public class NoteAggiuntiveLUDialog { private Dialog mDialog; - public static Dialog make(Context context, final RunnableArgs onComplete) { - return new NoteAggiuntiveLUDialog(context, onComplete).mDialog; + public static Dialog make(Context context, final RunnableArgs onComplete, final Runnable onAbort) { + return new NoteAggiuntiveLUDialog(context, onComplete, onAbort).mDialog; } - private NoteAggiuntiveLUDialog(Context context, final RunnableArgs onComplete){ + private NoteAggiuntiveLUDialog(Context context, final RunnableArgs onComplete, final Runnable onAbort){ LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); DialogNoteAggiuntiveNuovaUlBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_note_aggiuntive_nuova_ul, null, false); @@ -39,7 +39,7 @@ public class NoteAggiuntiveLUDialog { bindings.buttonAbort.setOnClickListener(v -> { mDialog.dismiss(); - if(onComplete != null) onComplete.run(null); + if(onAbort != null) onAbort.run(); }); diff --git a/app/src/main/res/layout/dialog_basket_lu.xml b/app/src/main/res/layout/dialog_basket_lu.xml index 637234c8..17884abc 100644 --- a/app/src/main/res/layout/dialog_basket_lu.xml +++ b/app/src/main/res/layout/dialog_basket_lu.xml @@ -1,7 +1,6 @@ - + - - - + android:layout_height="match_parent"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_basket_lu__page2.xml b/app/src/main/res/layout/dialog_basket_lu__page2.xml index 93d1e48f..1fd84f5c 100644 --- a/app/src/main/res/layout/dialog_basket_lu__page2.xml +++ b/app/src/main/res/layout/dialog_basket_lu__page2.xml @@ -3,119 +3,142 @@ - - - - - - - - - - - - - - - - - - - - - + android:fillViewport="true"> - + android:orientation="vertical"> + + + + - + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + \ No newline at end of file