From 00afb7db5368aa322922825b38070b86e31bbf5f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 23 Dec 2019 11:44:39 +0100 Subject: [PATCH 1/5] Fix pulsante in dialogScanArt. Aggiunta where cond su ricerca pedane versate su linea. Aggiunta emptyView in recupera ul. --- .../core/HistoryULsListAdapter.java | 7 +- .../core/ProdRecuperoMaterialeHelper.java | 1 + .../ProdRecuperoMaterialeViewModel.java | 2 +- .../res/layout/dialog_scan_or_create_lu.xml | 141 +++++++++--------- .../fragment_prod_recupero_materiale.xml | 57 ++++++- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 7 files changed, 137 insertions(+), 73 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java index d9555e37..3dd6da5f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java @@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.core; import android.content.Context; import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import androidx.databinding.DataBindingUtil; @@ -27,6 +28,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter mOriginalDataset; private List mDataset; + private View mEmptyView; private RunnableArgs mOnItemClicked; @@ -54,9 +56,10 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter myDataset) { + public HistoryULsListAdapter(Context context, List myDataset, View emptyView) { mContext = context; mOriginalDataset = myDataset; + mEmptyView = emptyView; mDataset = orderItems(myDataset); } @@ -68,6 +71,8 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter 0 ? View.GONE : View.VISIBLE); } 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 c60b5700..2455b828 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 @@ -61,6 +61,7 @@ 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 mtb_colr.data_collo > DATEADD(DAY, -1, GETDATE()) " + "GROUP BY jtb_fasi.cod_jfas, " + "jtb_fasi.descrizione, " + "mtb_colr.gestione, " + 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 a25821ee..c3a4a8b2 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 @@ -87,7 +87,7 @@ public class ProdRecuperoMaterialeViewModel { private void initRecyclerView() { - mAdapter = new HistoryULsListAdapter(mContext, new ArrayList<>()); + mAdapter = new HistoryULsListAdapter(mContext, new ArrayList<>(), mBinding.emptyView); mAdapter.setOnItemClicked(data -> this.dispatchItem(data, null, null)); mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(mContext)); diff --git a/app/src/main/res/layout/dialog_scan_or_create_lu.xml b/app/src/main/res/layout/dialog_scan_or_create_lu.xml index 58177df7..5e09ce58 100644 --- a/app/src/main/res/layout/dialog_scan_or_create_lu.xml +++ b/app/src/main/res/layout/dialog_scan_or_create_lu.xml @@ -1,9 +1,9 @@ - - + - - - - - - - - - - - + android:background="@color/light_blue_300" + android:gravity="center_horizontal"> + + + + + + + + + + android:paddingStart="16dp" + android:paddingEnd="16dp"> + + + android:layout_marginTop="16dp"> - + + + + + + android:layout_marginTop="8dp"> - + android:orientation="vertical" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - + android:gravity="center_horizontal" + android:layout_marginTop="12dp" + android:layout_marginBottom="12dp" + android:textSize="16sp" + android:textStyle="bold" + android:layout_gravity="center_horizontal" + style="@style/TextViewMaterial" + android:text="OPPURE" /> + + + + - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml index b0589ff2..0795ad18 100644 --- a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml +++ b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml @@ -3,9 +3,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:fab="http://schemas.android.com/apk/res-auto"> + + + android:layout_height="match_parent" /> + - + + + + + + + + + + + + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6d7f1962..73fc969c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -165,6 +165,7 @@ Nessun documento da mostrare Nessun ordine da evadere Nessun articolo + Nessuna UL versata in produzione Il barcode scansionato non ha fornito alcun risultato diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc2cdbba..815c14cb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -166,6 +166,7 @@ No documents to show No orders to dispatch No items + No LU poured into production The scanned label has already been used The scanned barcode did not produce any results From 0e519c1123424d5f5dec27ea3284e8a30b58324c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 23 Dec 2019 13:21:56 +0100 Subject: [PATCH 2/5] Sistemata width dialog choose arts --- .../DialogChooseArtFromListaArts.java | 3 +++ .../DialogChooseArtsFromListaArts.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java index 1812f3ac..db915904 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java @@ -18,6 +18,7 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbAart; +import it.integry.integrywmsnative.core.utility.UtilityDialog; import it.integry.integrywmsnative.databinding.DialogChooseArtFromListaArtBinding; public class DialogChooseArtFromListaArts { @@ -49,6 +50,8 @@ public class DialogChooseArtFromListaArts { mDialog.setCanceledOnTouchOutside(false); mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + UtilityDialog.setTo90PercentSize(context, mDialog); + initRecyclerView(bindings, listaArts); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index df51cafc..2c06d63e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -29,6 +29,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.utility.UtilityBarcode; +import it.integry.integrywmsnative.core.utility.UtilityDialog; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; @@ -97,6 +98,8 @@ public class DialogChooseArtsFromListaArts { mDialog.setCanceledOnTouchOutside(false); mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + UtilityDialog.setTo90PercentSize(context, mDialog); + initRecyclerView(binding); From 0d962747866790d6699c8819c64894cbb10741e5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 23 Dec 2019 19:10:23 +0100 Subject: [PATCH 3/5] Implementata gestione dei colli --- .../core/PickingLiberoListAdapter.java | 18 ++++++- .../viewmodel/RettificaGiacenzeViewModel.java | 3 +- .../DialogChooseArtsFromListaArtsAdapter.java | 19 +++++++- ..._choose_art_from_lista_art__item_model.xml | 35 -------------- ...hoose_arts_from_lista_arts__item_model.xml | 41 ++++++++++++---- ...log_choose_arts_from_lista_arts_layout.xml | 9 ++-- ...li_in_collo_bottom_sheet__mtbcolr_item.xml | 2 + .../lista_picking_libero_list_model.xml | 47 ++++++++++++++----- 8 files changed, 108 insertions(+), 66 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java index a07d327c..258f3066 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java @@ -11,6 +11,8 @@ import androidx.recyclerview.widget.RecyclerView; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ListaPickingLiberoListModelBinding; public class PickingLiberoListAdapter extends RecyclerView.Adapter{ @@ -20,8 +22,8 @@ public class PickingLiberoListAdapter extends RecyclerView.Adapter mOnItemClickListener; - public static class ViewHolder extends RecyclerView.ViewHolder { - protected ListaPickingLiberoListModelBinding mViewDataBinding; + public class ViewHolder extends RecyclerView.ViewHolder { + private ListaPickingLiberoListModelBinding mViewDataBinding; public ViewHolder(ListaPickingLiberoListModelBinding v) { @@ -30,6 +32,18 @@ public class PickingLiberoListAdapter extends RecyclerView.Adapter mBinding.rettificaGiacenzeMainList.setAdapter(null); ((IPoppableActivity) mContext).pop(); - - //if(openNew) openLU(); } @@ -419,6 +417,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked .setPartitaMag(quantityDTO.batchLot.get()) .setDataScadPartita(quantityDTO.expireDate) .setQtaCol(quantityDTO.qtaTot.getBigDecimal()) + .setNumCnf(quantityDTO.numCnf.getBigDecimal()) .setDescrizione(mtbAart.getDescrizioneEstesa()) .setCausale(MtbColr.Causale.RETTIFICA) .setUtente(SettingsManager.i().user.fullname); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java index a92244f0..60fcfc3e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java @@ -15,6 +15,8 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.model.CheckableMtbColr; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsItemModelBinding; public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter { @@ -58,8 +60,8 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml index e2a73e8d..e4a40b0e 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml @@ -47,16 +47,40 @@ android:layout_toStartOf="@id/qta_box"> - + android:orientation="horizontal"> + + + + + + + + diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml index 28795b3f..beb10b38 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml @@ -20,7 +20,7 @@ app:cardCornerRadius="12dp" app:cardElevation="0dp"> - @@ -50,9 +50,7 @@ android:paddingTop="24dp" android:paddingBottom="8dp" android:paddingStart="8dp" - android:paddingEnd="8dp" - android:layout_alignParentTop="true" - android:layout_above="@id/buttons"> + android:paddingEnd="8dp"> - + diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml index 79095543..dbaaa66b 100644 --- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml +++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml @@ -68,6 +68,8 @@ android:text="@{mtbColr.getDescrizione()}" android:textColor="@android:color/black" android:textSize="16sp" + android:paddingStart="0dp" + android:paddingEnd="8dp" style="@style/AppTheme.NewMaterial.Text.Small" tools:text="Descrizione lunga articolo" /> diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml index b057bd18..e5294b59 100644 --- a/app/src/main/res/layout/lista_picking_libero_list_model.xml +++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml @@ -23,30 +23,52 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@+id/qta_box" app:layout_constraintStart_toStartOf="parent"> + - + + + + @@ -56,6 +78,7 @@ android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}" android:textSize="14sp" android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}" + style="@style/AppTheme.NewMaterial.Text.Small" tools:text="Lotto: ABCDE" /> @@ -72,6 +95,7 @@ app:layout_constraintBottom_toBottomOf="parent"> From 69af9f56a2b814ab9847435020001f85331f2648 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 2 Jan 2020 10:00:28 +0100 Subject: [PATCH 4/5] Implementati salvataggi di numCnf --- .../core/utility/UtilityQuery.java | 29 +++++++++ .../core/ContenutoBancaleListAdapter.java | 15 +++-- .../core/PickingLiberoListAdapter.java | 14 +++-- .../viewmodel/PickingLiberoViewModel.java | 2 +- .../core/PickingResiListAdapter.java | 27 +++++++-- .../RettificaGiacenzeMainListAdapter.java | 14 +++-- .../viewmodel/RettificaGiacenzeViewModel.java | 57 +++++++++++------- .../UltimeConsegneClienteRESTConsumer.java | 28 ++++++--- .../MainListOrdineVenditaInevasoAdapter.java | 6 -- .../core/VenditaOrdineInevasoHelper.java | 38 +++++++----- ...icoliInColloBottomSheetMtbColrAdapter.java | 14 +++-- .../DialogChooseArtsFromListaArtsAdapter.java | 15 +++-- .../main/res/drawable/ic_truck_black_96.png | Bin 0 -> 1509 bytes ...li_in_collo_bottom_sheet__mtbcolr_item.xml | 3 +- ...ime_consegne_cliente__list_single_item.xml | 31 ++++++---- .../lista_picking_libero_list_model.xml | 3 +- .../layout/lista_rettifica_giacenze_model.xml | 3 +- .../ultime_consegne_main_list__item.xml | 11 ++++ 18 files changed, 204 insertions(+), 106 deletions(-) create mode 100644 app/src/main/res/drawable/ic_truck_black_96.png diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityQuery.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityQuery.java index cad443f8..3f47ee99 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityQuery.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityQuery.java @@ -1,9 +1,38 @@ package it.integry.integrywmsnative.core.utility; import java.util.HashMap; +import java.util.List; public class UtilityQuery { + + public static String concatFieldListInWhereCond(List> inputData) { + StringBuilder sbWhereCond = new StringBuilder(); + + for(int i = 0; i < inputData.size(); i++) { + + HashMap singleInputData = inputData.get(i); + Object[] keys = singleInputData.keySet().toArray(); + + sbWhereCond.append("("); + + for(int k = 0; k < keys.length; k++) { + Object value = singleInputData.get(keys[k]); + + sbWhereCond.append(keys[k] + (value == null ? " IS NULL" : " = " + UtilityDB.valueToString(value))); + + if(k < keys.length - 1) sbWhereCond.append(" AND "); + } + + sbWhereCond.append(")"); + + if(i < inputData.size() - 1) sbWhereCond.append(" OR "); + } + + + return sbWhereCond.toString(); + } + public static String concatFieldsInWhereCond(HashMap inputData) { StringBuilder sbWhereCond = new StringBuilder(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java index 47a44604..aac33a57 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java @@ -11,7 +11,9 @@ import android.view.ViewGroup; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ListaContenutoBancaleListModelBinding; @@ -36,14 +38,15 @@ public class ContenutoBancaleListAdapter extends RecyclerView.Adapter { .setRiga(null) .setDatetimeRow(UtilityDate.getDateInstance()) .setQtaCol(mtbColrToDeleteClone.getQtaCol().multiply(new BigDecimal(-1))) - .setOperation(CommonModelConsts.OPERATION.DELETE); + .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE ); MtbColt mtbColtClone = (MtbColt) mtbColt.get().clone(); mtbColtClone.setMtbColr(new ObservableArrayList<>()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java index 585b0079..a177aaef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/core/PickingResiListAdapter.java @@ -21,8 +21,10 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbDocr; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.UltimeConsegneMainListItemBinding; import it.integry.integrywmsnative.databinding.UltimeConsegneMainListItemHeaderBinding; @@ -122,24 +124,37 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter 0 && qtaEvasa.floatValue() > 0) { + } else if (qtaDaEvadere > 0 && qtaColEvasa.floatValue() > 0) { holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha)); } else { holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.full_white)); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java index 3a680ef1..9fec6a23 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java @@ -12,7 +12,9 @@ import android.view.ViewGroup; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ListaRettificaGiacenzeModelBinding; @@ -64,14 +66,14 @@ public class RettificaGiacenzeMainListAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index d7014c2a..af4bf5b7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -618,34 +618,47 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked DialogInputQuantity.makeBase(mContext, dto, true, value -> { - mtbColrToEditClone - .setRiga(null) - .setDatetimeRow(UtilityDate.getDateInstance()) - .setQtaCol(value.qtaTot.getBigDecimal().subtract(mtbColrToEditClone.getQtaCol())) - .setUtente(SettingsManager.i().user.fullname) - .setCausale(MtbColr.Causale.RETTIFICA) - .setOperation(CommonModelConsts.OPERATION.INSERT); + BigDecimal qtaCol = value.qtaTot.getBigDecimal().subtract(mtbColrToEditClone.getQtaCol()); - MtbColt mtbColtClone = (MtbColt) mtbColt.get().clone(); - mtbColtClone.setMtbColr(new ObservableArrayList<>()); - mtbColtClone.getMtbColr().add(mtbColrToEditClone); - mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + if(qtaCol.compareTo(BigDecimal.ZERO) != 0) { - Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + BigDecimal numCnf = value.numCnf.getBigDecimal().subtract(mtbColrToEditClone.getNumCnf()); - ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, valueNewMtbColt -> { - progressDialog.dismiss(); - mtbColt.get().getMtbColr().remove(index); + if (numCnf.compareTo(BigDecimal.ZERO) == 0 && qtaCol.compareTo(BigDecimal.ZERO) > 0) + numCnf = BigDecimal.ONE; + else if (numCnf.compareTo(BigDecimal.ZERO) == 0 && qtaCol.compareTo(BigDecimal.ZERO) < 0) + numCnf = new BigDecimal(-1); mtbColrToEditClone - .setQtaCol(value.qtaTot.getBigDecimal()) - .setMtbAart(mtbColrToEdit.getMtbAart()) - .setOperation(CommonModelConsts.OPERATION.NO_OP); + .setRiga(null) + .setDatetimeRow(UtilityDate.getDateInstance()) + .setQtaCol(qtaCol) + .setNumCnf(numCnf) + .setUtente(SettingsManager.i().user.fullname) + .setCausale(MtbColr.Causale.RETTIFICA) + .setOperation(CommonModelConsts.OPERATION.INSERT); - mtbColt.get().getMtbColr().add(index, mtbColrToEditClone); - }, ex -> { - UtilityExceptions.defaultException(mContext, ex, progressDialog); - }); + MtbColt mtbColtClone = (MtbColt) mtbColt.get().clone(); + mtbColtClone.setMtbColr(new ObservableArrayList<>()); + mtbColtClone.getMtbColr().add(mtbColrToEditClone); + mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + + ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, valueNewMtbColt -> { + progressDialog.dismiss(); + mtbColt.get().getMtbColr().remove(index); + + mtbColrToEditClone + .setQtaCol(value.qtaTot.getBigDecimal()) + .setMtbAart(mtbColrToEdit.getMtbAart()) + .setOperation(CommonModelConsts.OPERATION.NO_OP); + + mtbColt.get().getMtbColr().add(index, mtbColrToEditClone); + }, ex -> { + UtilityExceptions.defaultException(mContext, ex, progressDialog); + }); + } }, null).show(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java index fa25ecb9..451de68f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java @@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; @@ -15,6 +16,7 @@ import it.integry.integrywmsnative.core.model.DtbDocr; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; +import it.integry.integrywmsnative.core.utility.UtilityQuery; import it.integry.integrywmsnative.gest.picking_resi.dto.WithdrawableDtbDocr; import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; @@ -57,17 +59,18 @@ public class UltimeConsegneClienteRESTConsumer { public static void loadDocRowFromConsegna(List consegne, RunnableArgs> onComplete, RunnableArgs onFailed) { - StringBuilder sbWhereCond = new StringBuilder(); + List> filterCond = new ArrayList<>(); for(int i = 0; i < consegne.size(); i++) { - sbWhereCond.append(String.format("(dtb_docr.data_doc = '%s' AND dtb_docr.num_doc = %d AND dtb_docr.ser_doc = '%s' AND dtb_docr.cod_anag = '%s' AND dtb_docr.cod_dtip = '%s')", - UtilityDate.formatDate(consegne.get(i).getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH), - consegne.get(i).getNumDoc(), - consegne.get(i).getSerDoc(), - consegne.get(i).getCodAnag(), - consegne.get(i).getCodDtip())); + HashMap filter = new HashMap<>(); - if(i < consegne.size()-1) sbWhereCond.append(" OR "); + filter.put("dtb_docr.data_doc", consegne.get(i).getDataDocD()); + filter.put("dtb_docr.num_doc", consegne.get(i).getNumDoc()); + filter.put("dtb_docr.ser_doc", consegne.get(i).getSerDoc()); + filter.put("dtb_docr.cod_anag", consegne.get(i).getCodAnag()); + filter.put("dtb_docr.cod_dtip", consegne.get(i).getCodDtip()); + + filterCond.add(filter); } String sql = "SELECT dtb_docr.[cod_anag]" + @@ -142,12 +145,17 @@ public class UltimeConsegneClienteRESTConsumer { "LEFT OUTER JOIN ctb_cont ON mtb_aart.cod_ccon_ricavi = ctb_cont.cod_ccon " + "LEFT OUTER JOIN ctb_grup ON ctb_cont.cod_cgrp = ctb_grup.cod_cgrp " + "LEFT OUTER JOIN mtb_colr ON " + - " dtb_docr.cod_anag + '|' + dtb_docr.cod_dtip + '|' + dtb_docr.ser_doc + '|' + CONVERT(varchar(10), dtb_docr.data_doc , 111) + '|' + CONVERT(varchar(20), dtb_docr.num_doc) + '|' + CONVERT(varchar(20), dtb_docr.id_riga) = mtb_colr.note " + + " dtb_docr.cod_anag = mtb_colr.cod_anag_doc AND " + + " dtb_docr.cod_dtip = mtb_colr.cod_dtip_doc AND " + + " dtb_docr.ser_doc = mtb_colr.ser_doc AND " + + " dtb_docr.data_doc = mtb_colr.data_doc AND " + + " dtb_docr.num_doc = mtb_colr.num_doc AND " + + " dtb_docr.id_riga = mtb_colr.id_riga_doc " + "WHERE " + " (ctb_grup.sezione <> 1 OR ctb_grup.sezione IS NULL) AND " + " dtb_docr.[qta_doc] - ISNULL(mtb_colr.qta_col, 0) > 0 AND" + " ( " + - sbWhereCond.toString() + + UtilityQuery.concatFieldListInWhereCond(filterCond) + " ) " + "ORDER BY cod_mart"; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java index 63e35072..afbf16ae 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java @@ -259,10 +259,4 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter mtbColrs){ - BigDecimal currentQtaEvasa = BigDecimal.ZERO; - - if(mtbColrs != null) { - for (MtbColr mtbColr : item.getWithdrawRows()) { - currentQtaEvasa = currentQtaEvasa.add(item.getMtbAart().isFlagQtaCnfFissa() ? mtbColr.getQtaCol() : mtbColr.getNumCnf()); - } - } - - return currentQtaEvasa; - } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java index a46969c1..3058f47e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java @@ -15,7 +15,9 @@ import java.lang.ref.WeakReference; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetMtbcolrItemBinding; @@ -47,14 +49,14 @@ public class ArticoliInColloBottomSheetMtbColrAdapter extends BaseAdapter { binding.setMtbColr(mtbColr); //Setting qty with unt_mis - if(mtbColr.getMtbAart() != null) { - if (mtbColr.getMtbAart().isFlagQtaCnfFissa()) { - binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "")); - } else { - binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + mContext.getString(R.string.unt_mis_col)); + if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){ + binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol())); + + if(mtbColr.getMtbAart() != null) { + binding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : ""); } } else { - binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol())); + binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col)); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java index 60fcfc3e..46cae331 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java @@ -15,7 +15,9 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.model.CheckableMtbColr; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsItemModelBinding; @@ -74,14 +76,15 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter!iMqG@>7Z^z- ze}VV_hah<%x-vl#M~%90qYK4JCQ70RF)T-E3k5?^6cuMCW|Yj$bx}RctNT<{ zclFDAJ~%Mk+jZ(!=iKV9M|Te>ilQirq9}@@D2k#eokAmH`5s^>vNgcA3T;76Sq&T` zT;LbmQDCsJ*3^t`z!doff7bp2wieW;TF?NVBmclJwms;zfd=p<#Rq@ZUdz9U)#e4< zgEa%307igym|^G@k@ZENjYP-Hc=&xj_f}SvZMX&K0dwPvFzZ*9;2vbL`|&&NY?)W~ z8%%(25RPvE2Q3=%u$MjBlq+K-i@bpU1@}OLuf0NNG!^r1JpK(6GBMH7Hfn}Dm{giV-_O*+^_rOyG7!mFfDmszE zU()I9J;(AV1wB=?H#}k!%VEL!h^MbE%*->+*F%mzwhMZyYD3Nuis6jlc%7%OhZFov z0arQtSTE?Qs(tPpp%{J_9AD$<>w^S8?|b;@7xYxw?(k^i0{#`8`b^imNM1+!)Wg@6 zf}Sc{>RymEWb{qICX2vv%o4SYx+WlXFE}eW^cjLSfsZW$$AHT%eu_Q?`LF_cvY4tD zd@VTiy$CmvM^$aivWAp|+b!kGOaPeOx}d#4`qlalL%~e8j#xzQ6UrAo4E4p<3y%9b zlvX0sOvJzpIgcjz{1doUDEpP5rwR#xz`bBdaFk{#VwNtD47#*9ILEt0Dx~iT4u=j!u zKF(Z)Ph<9Q`#pRw#|$;oJXura1O&Yn_%@)0*+$%s*-YujtO+%vzt>0KouvHJOs7Km^tXT;T@nE1_VKh8?GXI#Dlmvu(?2Ts zT|$#|Z%I7l;JeB_Aus($us@`}geK;dE7FvG`c$E~vpU)c1TSZP` zf16g1gTG#n1{7@}^iN@4kv59`j__1SNpNYv)k67+9P}=xQu@=(gnt&klO8>qp;G$OB;ZHkyQdw>OUL}+sU;0{*U#g~=fGV;S=+109?MPj9Cg>v0QQm5Va#Zu zC$f#$AL70UtW^DOyloMa#@;GQ{Qp2dD==@s3MGC5b6cP4_h6XpYesF%WaYkswL|^& z1Mno-?)h&4PZX|tj=Jjy;C|9|=LxFu?@Q{gA24s$8pVtRTz)n0Qo=b?pfvrVAHH4* zJOJDaT*ut7>>OqS^a*Cg@m%0~Ls57AilQirq9}@@D2k#eN`?6kwJxVh + @@ -47,7 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}" - android:visibility="@{mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}" + android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}" android:textSize="14sp" android:textStyle="bold" android:layout_alignParentEnd="true" diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml index 1d98423a..4e6b7b12 100644 --- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml +++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml @@ -63,30 +63,35 @@ android:textSize="14sp" tools:text="13 Apr"/> + + + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml index e5294b59..d20d2c96 100644 --- a/app/src/main/res/layout/lista_picking_libero_list_model.xml +++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml @@ -6,6 +6,7 @@ + @@ -45,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}" - android:visibility="@{mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}" + android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}" android:textSize="14sp" android:textStyle="bold" android:layout_alignParentEnd="true" diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml index 485b444e..95383b45 100644 --- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml +++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml @@ -6,6 +6,7 @@ + @@ -62,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}" - android:visibility="@{mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}" + android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}" android:textSize="14sp" android:textStyle="bold" android:layout_alignParentEnd="true" diff --git a/app/src/main/res/layout/ultime_consegne_main_list__item.xml b/app/src/main/res/layout/ultime_consegne_main_list__item.xml index f30e2952..8cbc884b 100644 --- a/app/src/main/res/layout/ultime_consegne_main_list__item.xml +++ b/app/src/main/res/layout/ultime_consegne_main_list__item.xml @@ -66,6 +66,17 @@ style="@style/AppTheme.NewMaterial.Text.Medium" tools:text="QTA"/> + + From 8c723c8a5d5525ff7f1b1c9512c8ebe8de6c5031 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 2 Jan 2020 10:02:13 +0100 Subject: [PATCH 5/5] -> v1.10.12 (115) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 53f29218..cd5b3e22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 114 - def appVersionName = '1.10.11' + def appVersionCode = 115 + def appVersionName = '1.10.12' signingConfigs { release {