Finish v1_10_12(115)

app/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 114
+    def appVersionCode = 115
-    def appVersionName = '1.10.11'
+    def appVersionName = '1.10.12'
 
     signingConfigs {
         release {

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<HashMap<String, Object>> inputData) {
+        StringBuilder sbWhereCond = new StringBuilder();
+
+        for(int i = 0; i < inputData.size(); i++) {
+
+            HashMap<String, Object> 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<String, Object> inputData) {
 
         StringBuilder sbWhereCond = new StringBuilder();

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<ContenutoB
             mViewDataBinding.setMtbColr(mtbColr);
 
 
-            if(mtbColr.getMtbAart() != null) {
+            //Setting qty with unt_mis
-                if (mtbColr.getMtbAart().isFlagQtaCnfFissa()) {
+            if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-                    mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : ""));
+                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
-                } else {
+
-                    mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + mContext.getString(R.string.unt_mis_col));
+                if(mtbColr.getMtbAart() != null) {
+                    mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
                 }
             } else {
-                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
             }
 
             mViewDataBinding.executePendingBindings();

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java

@@ -11,6 +11,10 @@ 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.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.ListaPickingLiberoListModelBinding;
 
 public class PickingLiberoListAdapter extends RecyclerView.Adapter<PickingLiberoListAdapter.ViewHolder>{
@@ -20,8 +24,8 @@ public class PickingLiberoListAdapter extends RecyclerView.Adapter<PickingLibero
 
     private IRecyclerItemClicked<MtbColr> mOnItemClickListener;
 
-    public static class ViewHolder extends RecyclerView.ViewHolder {
+    public class ViewHolder extends RecyclerView.ViewHolder {
-        protected ListaPickingLiberoListModelBinding mViewDataBinding;
+        private ListaPickingLiberoListModelBinding mViewDataBinding;
 
 
         public ViewHolder(ListaPickingLiberoListModelBinding v) {
@@ -30,6 +34,18 @@ public class PickingLiberoListAdapter extends RecyclerView.Adapter<PickingLibero
         }
 
         public void bind(MtbColr mtbColr) {
+
+            //Setting qty with unt_mis
+            if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
+                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+
+                if(mtbColr.getMtbAart() != null) {
+                    mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
+                }
+            } else {
+                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
+            }
+
             mViewDataBinding.setMtbColr(mtbColr);
             mViewDataBinding.executePendingBindings();
         }

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java

@@ -727,7 +727,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
                 .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<>());

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<Picking
     public void onBindItemViewHolder(final SingleItemViewHolder holder, final int position) {
         final WithdrawableDtbDocr dtbDocr = this.mDataset.get(position);
 
-        BigDecimal qtaEvasa = BigDecimal.ZERO;
+        BigDecimal qtaColEvasa = BigDecimal.ZERO;
+        BigDecimal numCnfColEvasa = BigDecimal.ZERO;
 
         for(MtbColr mtbColr : dtbDocr.getWithdrawRows()) {
-            qtaEvasa = qtaEvasa.add(mtbColr.getQtaCol());
+            qtaColEvasa = qtaColEvasa.add(mtbColr.getQtaCol());
+            numCnfColEvasa = numCnfColEvasa.add(mtbColr.getNumCnf());
         }
 
-        Float qtaDaEvadere = UtilityNumber.decimalToFloat(dtbDocr.getQtaDoc().subtract(qtaEvasa));
+        Float qtaDaEvadere = UtilityNumber.decimalToFloat(dtbDocr.getQtaDoc().subtract(qtaColEvasa));
 
         holder.mBinding.badge1.setText(dtbDocr.getCodMart());
-        holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(qtaEvasa));
-        holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(dtbDocr.getQtaDoc()));
         holder.mBinding.descrizione.setText(UtilityString.isNullOrEmpty(dtbDocr.getDescrizioneEstesa()) ? dtbDocr.getDescrizioneEstesa() : dtbDocr.getDescrizione());
 
 
 
+        //Setting qty with unt_mis
+        if(!SettingsManager.iDB().isFlagForceAllToColli() && (dtbDocr.getMtbAart() == null || dtbDocr.getMtbAart().isFlagQtaCnfFissa())){
+            holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(qtaColEvasa));
+            holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(dtbDocr.getQtaDoc()));
+            holder.mBinding.untMis.setText(dtbDocr.getUntDoc());
+        } else {
+            holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(numCnfColEvasa));
+            holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(dtbDocr.getNumCnf()));
+            holder.mBinding.untMis.setText(UtilityResources.getString(R.string.unt_mis_col));
+        }
+
+
+
         if (qtaDaEvadere <= 0 ) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.green_500_with_alpha));
-        } else if (qtaDaEvadere > 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));

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<HistoryU
 
     private List<HistoryVersamentoProdUL> mOriginalDataset;
     private List<HistoryVersamentoProdUL> mDataset;
+    private View mEmptyView;
 
 
     private RunnableArgs<HistoryVersamentoProdUL> mOnItemClicked;
@@ -54,9 +56,10 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
 
 
 
-    public HistoryULsListAdapter(Context context, List<HistoryVersamentoProdUL> myDataset) {
+    public HistoryULsListAdapter(Context context, List<HistoryVersamentoProdUL> myDataset, View emptyView) {
         mContext = context;
         mOriginalDataset = myDataset;
+        mEmptyView = emptyView;
         mDataset = orderItems(myDataset);
     }
 
@@ -68,6 +71,8 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
         mDataset.clear();
         mDataset.addAll(orderItems(updatedDataset));
         notifyDataChanged();
+
+        mEmptyView.setVisibility(mDataset.size() > 0 ? View.GONE : View.VISIBLE);
     }
 
 

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, " +

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));

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<Retti
         holder.bind(mtbColr);
 
         //Setting qty with unt_mis
-        if(mtbColr.getMtbAart() != null) {
+        if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-            if (mtbColr.getMtbAart().isFlagQtaCnfFissa()) {
+            holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
-                holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : ""));
+
-            } else {
+            if(mtbColr.getMtbAart() != null) {
-                holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + mContext.getString(R.string.unt_mis_col));
+                holder.mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
             }
         } else {
-            holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+            holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
         }
 
         holder.mViewDataBinding.getRoot().setOnClickListener(x -> {

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java

@@ -121,8 +121,6 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
         mBinding.rettificaGiacenzeMainList.setAdapter(null);
 
         ((IPoppableActivity) mContext).pop();
-
-        //if(openNew) openLU();
     }
 
 
@@ -419,6 +417,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
                 .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);
@@ -619,34 +618,47 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
 
         DialogInputQuantity.makeBase(mContext, dto, true, value -> {
 
-            mtbColrToEditClone
+            BigDecimal qtaCol = value.qtaTot.getBigDecimal().subtract(mtbColrToEditClone.getQtaCol());
-                    .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);
 
-            MtbColt mtbColtClone = (MtbColt) mtbColt.get().clone();
+            if(qtaCol.compareTo(BigDecimal.ZERO) != 0) {
-            mtbColtClone.setMtbColr(new ObservableArrayList<>());
-            mtbColtClone.getMtbColr().add(mtbColrToEditClone);
-            mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
-            Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
+                BigDecimal numCnf = value.numCnf.getBigDecimal().subtract(mtbColrToEditClone.getNumCnf());
 
-            ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, valueNewMtbColt -> {
+                if (numCnf.compareTo(BigDecimal.ZERO) == 0 && qtaCol.compareTo(BigDecimal.ZERO) > 0)
-                progressDialog.dismiss();
+                    numCnf = BigDecimal.ONE;
-                mtbColt.get().getMtbColr().remove(index);
+                else if (numCnf.compareTo(BigDecimal.ZERO) == 0 && qtaCol.compareTo(BigDecimal.ZERO) < 0)
+                    numCnf = new BigDecimal(-1);
 
                 mtbColrToEditClone
-                        .setQtaCol(value.qtaTot.getBigDecimal())
+                        .setRiga(null)
-                        .setMtbAart(mtbColrToEdit.getMtbAart())
+                        .setDatetimeRow(UtilityDate.getDateInstance())
-                        .setOperation(CommonModelConsts.OPERATION.NO_OP);
+                        .setQtaCol(qtaCol)
+                        .setNumCnf(numCnf)
+                        .setUtente(SettingsManager.i().user.fullname)
+                        .setCausale(MtbColr.Causale.RETTIFICA)
+                        .setOperation(CommonModelConsts.OPERATION.INSERT);
 
-                mtbColt.get().getMtbColr().add(index, mtbColrToEditClone);
+                MtbColt mtbColtClone = (MtbColt) mtbColt.get().clone();
-            }, ex -> {
+                mtbColtClone.setMtbColr(new ObservableArrayList<>());
-                UtilityExceptions.defaultException(mContext, ex, progressDialog);
+                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();
 

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<DocumentoResoDTO> consegne, RunnableArgs<ArrayList<WithdrawableDtbDocr>> onComplete, RunnableArgs<Exception> onFailed) {
-        StringBuilder sbWhereCond = new StringBuilder();
+        List<HashMap<String, Object>> 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')",
+            HashMap<String, Object> filter = new HashMap<>();
-                    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()));
 
-            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";
 

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java

@@ -259,10 +259,4 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter<Ma
         }
     }
 
-    public interface IOnOrdineRowDispatchCallback {
-
-        void onOrdineRowDispatch(PickingObjectDTO item);
-
-    }
-
 }

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java

@@ -15,6 +15,9 @@ import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
 import it.integry.integrywmsnative.core.class_router.ClassRouter;
 import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
 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.gest.vendita.dto.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.dto.VenditaOrdineInevasoListViewModel;
@@ -148,16 +151,32 @@ public class VenditaOrdineInevasoHelper {
                     rowModel.setSubDescrizione2(String.format(mContext.getResources().getText(R.string.lu_number_data_text).toString(), currentItem.getNumCollo(), currentItem.getDataColloHuman()));
                 }
 
-                rowModel.setQtaRiservata(getRigaQuantityEvasa(currentItem, mtbColrs));
+                BigDecimal currentQtaColEvasa = BigDecimal.ZERO;
+                BigDecimal currentNumCnfColEvasa = BigDecimal.ZERO;
 
-                if(currentItem.getMtbAart().isFlagQtaCnfFissa()) {
+                if(currentItem.getWithdrawRows() != null) {
-                    rowModel.setUntMis(currentItem.getMtbAart().getUntMis());
+                    for (MtbColr mtbColr : currentItem.getWithdrawRows()) {
+                        currentQtaColEvasa = currentQtaColEvasa.add(mtbColr.getQtaCol());
+                        currentNumCnfColEvasa = currentNumCnfColEvasa.add(mtbColr.getNumCnf());
+                    }
+                }
+
+
+
+                if(!SettingsManager.iDB().isFlagForceAllToColli() && (currentItem.getMtbAart() == null || currentItem.getMtbAart().isFlagQtaCnfFissa())){
                     rowModel.setQtaOrdinata(currentItem.getNumCollo() != null ? currentItem.getQtaCollo() : currentItem.getQtaOrd());
+                    rowModel.setQtaRiservata(currentQtaColEvasa);
+
+                    if(currentItem.getMtbAart() != null) {
+                        rowModel.setUntMis(currentItem.getMtbAart().getUntMis());
+                    }
                 } else {
                     rowModel.setUntMis("col");
-                    rowModel.setQtaOrdinata(currentItem.getNumCollo() != null ? currentItem.getNumCnfDisponibileCollo() : currentItem.getNumCnfOrd());
+                    rowModel.setQtaOrdinata(currentItem.getNumCollo() != null ? currentItem.getNumCnfCollo() : currentItem.getNumCnfOrd());
+                    rowModel.setQtaRiservata(currentNumCnfColEvasa);
                 }
 
+
                 rowModel.setOriginalModel(currentItem);
 
                 itemModel.rows.add(rowModel);
@@ -169,16 +188,5 @@ public class VenditaOrdineInevasoHelper {
 
     }
 
-    private BigDecimal getRigaQuantityEvasa(PickingObjectDTO item, List<MtbColr> 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;
-    }
 
 }

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(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-            if (mtbColr.getMtbAart().isFlagQtaCnfFissa()) {
+            binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
-                binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : ""));
+
-            } else {
+            if(mtbColr.getMtbAart() != null) {
-                binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + mContext.getString(R.string.unt_mis_col));
+                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));
         }
 
 

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);
     }
 

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);
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java

@@ -15,6 +15,10 @@ 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;
 
 public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<DialogChooseArtsFromListaArtsAdapter.ViewHolder> {
@@ -58,8 +62,8 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<D
     }
 
 
-    public static class ViewHolder extends RecyclerView.ViewHolder {
+    public class ViewHolder extends RecyclerView.ViewHolder {
-        protected DialogChooseArtsFromListaArtsItemModelBinding mViewDataBinding;
+        private DialogChooseArtsFromListaArtsItemModelBinding mViewDataBinding;
 
 
         public ViewHolder(DialogChooseArtsFromListaArtsItemModelBinding v) {
@@ -69,6 +73,20 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<D
 
         public void bind(CheckableMtbColr checkableMtbColr) {
             mViewDataBinding.setCheckableMtbColr(checkableMtbColr);
+
+            MtbColr mtbColr = checkableMtbColr.getItem().getMtbColr();
+
+            //Setting qty with unt_mis
+            if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
+                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+
+                if(mtbColr.getMtbAart() != null) {
+                    mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
+                }
+            } else {
+                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
+            }
+
             mViewDataBinding.executePendingBindings();
         }
     }

app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml

@@ -67,43 +67,8 @@
                 tools:text="Descrizione lunga articolo" />
 
 
-            <!--<TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{`Lotto: ` + dtoModel.partitaMag}"
-                android:textSize="14sp"
-                android:visibility="@{UtilityString.isNullOrEmpty(dtoModel.partitaMag) ? View.INVISIBLE : View.VISIBLE}"
-                tools:text="Lotto: ABCDE" />-->
-
         </LinearLayout>
 
 
-        <!--<RelativeLayout
-            android:id="@+id/qta_box"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <android.support.v7.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/badge1_round_corner"
-                android:gravity="center"
-                android:paddingLeft="6dp"
-                android:paddingTop="2dp"
-                android:paddingRight="6dp"
-                android:paddingBottom="2dp"
-                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + `\n` + mtbColr.getUntMis()}"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"
-                android:textStyle="bold"
-                tools:text="280.45\nCONF" />
-
-        </RelativeLayout>-->
-
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml

@@ -47,16 +47,40 @@
                 android:layout_toStartOf="@id/qta_box">
 
 
-                <androidx.appcompat.widget.AppCompatTextView
+                <RelativeLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@{checkableMtbColr.item.mtbColr.mtbAart.getCodMart()}"
+                    android:orientation="horizontal">
-                    android:textColor="@color/colorPrimary"
-                    android:textSize="14sp"
-                    android:textStyle="bold"
-                    tools:text="COD MART" />
 
 
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{checkableMtbColr.item.mtbColr.mtbAart.getCodMart()}"
+                        android:textColor="@color/colorPrimary"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:text="COD MART" />
+
+
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{UtilityNumber.decimalToString(checkableMtbColr.item.mtbColr.qtaCol) + checkableMtbColr.item.mtbColr.mtbAart.untMis}"
+                        android:visibility="@{checkableMtbColr.item.mtbColr.mtbAart != null &amp;&amp; !checkableMtbColr.item.mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:paddingStart="6dp"
+                        android:paddingEnd="6dp"
+                        android:background="@drawable/badge2_round_corner"
+                        android:textColor="@android:color/white"
+                        android:layout_alignParentEnd="true"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        tools:text="PESO KG" />
+
+                </RelativeLayout>
+
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -93,6 +117,7 @@
                 android:layout_centerVertical="true">
 
                 <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/qta_textview"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/badge1_round_corner"
@@ -101,10 +126,10 @@
                     android:paddingTop="2dp"
                     android:paddingRight="6dp"
                     android:paddingBottom="2dp"
-                    android:text="@{UtilityNumber.decimalToString(checkableMtbColr.item.mtbColr.getQtaCol()) + (checkableMtbColr.item.mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(checkableMtbColr.item.mtbColr.mtbAart.untMis) ? `\n` + checkableMtbColr.item.mtbColr.mtbAart.untMis : ``)}"
                     android:textSize="16sp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
+                    android:textAllCaps="true"
                     tools:text="280.45\nCONF" />
 
             </RelativeLayout>

app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml

@@ -20,7 +20,7 @@
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -50,9 +50,7 @@
                 android:paddingTop="24dp"
                 android:paddingBottom="8dp"
                 android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingEnd="8dp">
-                android:layout_alignParentTop="true"
-                android:layout_above="@id/buttons">
 
                 <TextView
                     android:id="@+id/title_text"
@@ -121,7 +119,6 @@
                 android:id="@+id/buttons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
                 android:layout_marginTop="8dp"
                 android:layout_marginStart="4dp"
                 android:layout_marginEnd="4dp"
@@ -165,7 +162,7 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </RelativeLayout>
+        </LinearLayout>
 
 
     </androidx.cardview.widget.CardView>

app/src/main/res/layout/dialog_scan_or_create_lu.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.cardview.widget.CardView
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/base_root"
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -17,49 +17,54 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-        <RelativeLayout
+            <RelativeLayout
-            android:id="@+id/title_container"
+                android:id="@+id/title_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/light_blue_300"
-            android:gravity="center_horizontal">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/title_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_error_white_24dp"
-                android:layout_margin="24dp"/>
-
-        </RelativeLayout>
-
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="24dp">
-
-            <TextView
-                android:id="@+id/title_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/TextViewMaterial.DialogTitle"
+                android:background="@color/light_blue_300"
-                android:text="@string/title_open_lu"
+                android:gravity="center_horizontal">
-                android:gravity="center_horizontal"/>
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/title_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_error_white_24dp"
+                    android:layout_margin="24dp"/>
+
+            </RelativeLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingTop="24dp"
+                android:paddingBottom="16dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp">
+
+
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_marginTop="16dp">
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp">
+
+                    <TextView
+                        android:id="@+id/title_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/TextViewMaterial.DialogTitle"
+                        android:text="@string/title_open_lu"
+                        android:gravity="center_horizontal"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:weightSum="10">
+                        android:layout_marginTop="16dp">
 
 
                         <ProgressBar
@@ -81,63 +86,63 @@
                     </LinearLayout>
 
 
-                    <LinearLayout
+
+                </LinearLayout>
+
+
+
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/dialog_scan_or_create_lu__creation_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:layout_marginTop="8dp">
 
-                        <androidx.appcompat.widget.AppCompatTextView
+
+
+                        <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
-                            android:layout_marginTop="12dp"
+                            app:layout_constraintStart_toStartOf="parent"
-                            android:layout_marginBottom="12dp"
+                            app:layout_constraintEnd_toEndOf="parent"
-                            android:textSize="16sp"
+                            app:layout_constraintTop_toTopOf="parent">
-                            android:textStyle="bold"
-                            android:layout_gravity="center_horizontal"
-                            style="@style/TextViewMaterial"
-                            android:text="OPPURE" />
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
 
-                            <androidx.constraintlayout.widget.Guideline
+                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/ok_left_buttons_guideline"
+                                android:layout_width="wrap_content"
-                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical"
+                                android:gravity="center_horizontal"
-                                app:layout_constraintGuide_percent="0.15"/>
+                                android:layout_marginTop="12dp"
-
+                                android:layout_marginBottom="12dp"
-                            <androidx.constraintlayout.widget.Guideline
+                                android:textSize="16sp"
-                                android:id="@+id/ok_right_buttons_guideline"
+                                android:textStyle="bold"
-                                android:layout_width="0dp"
+                                android:layout_gravity="center_horizontal"
-                                android:layout_height="wrap_content"
+                                style="@style/TextViewMaterial"
-                                android:orientation="vertical"
+                                android:text="OPPURE" />
-                                app:layout_constraintGuide_percent="0.85"/>
-
 
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/create_new_lu_button"
-                                android:layout_width="0dp"
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 style="@style/Button.PrimaryFull"
                                 android:layout_marginLeft="8dp"
                                 android:layout_marginRight="8dp"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:layout_constraintStart_toStartOf="@id/ok_left_buttons_guideline"
-                                app:layout_constraintEnd_toEndOf="@id/ok_right_buttons_guideline"
                                 android:text="@string/button_create_new_ul"/>
+                        </LinearLayout>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
 
-                        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    </LinearLayout>
-                </LinearLayout>
 
             </LinearLayout>
+
+
         </LinearLayout>
 
+
     </androidx.cardview.widget.CardView>
 
+
 </layout>

app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml

@@ -7,6 +7,7 @@
         <import type="android.view.View" />
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
         <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+        <import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
         <variable
             name="mtbColr"
             type="it.integry.integrywmsnative.core.model.MtbColr"/>
@@ -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 &amp;&amp; !mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}"
+                    android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
                     android:textSize="14sp"
                     android:textStyle="bold"
                     android:layout_alignParentEnd="true"
@@ -68,6 +69,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" />
 

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"/>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/description_main"
+            android:layout_toStartOf="@id/compilato_da"
+            android:orientation="horizontal">
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/sub_description_main"
                 style="@android:style/TextAppearance.Small"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/description_main"
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="4dp"
-                android:layout_toStartOf="@id/compilato_da"
                 android:ellipsize="end"
                 android:singleLine="true"
                 tools:text="SUB TITLE" />
+        </LinearLayout>
 
-            <androidx.appcompat.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/compilato_da"
+            android:id="@+id/compilato_da"
-                android:layout_width="wrap_content"
+            android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-                style="@style/AppTheme.NewMaterial.Text.Badge"
+            style="@style/AppTheme.NewMaterial.Text.Badge"
-                android:layout_marginTop="4dp"
+            android:layout_marginTop="4dp"
-                android:layout_below="@id/date"
+            android:layout_below="@id/date"
-                android:layout_alignParentEnd="true"
+            android:layout_alignParentEnd="true"
-                android:textSize="12sp"
+            android:textSize="12sp"
-                tools:text="Nome Cognome"/>
+            tools:text="Nome Cognome"/>
-
     </RelativeLayout>
 
 </layout>

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">
+
     <data>
 
     </data>
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -13,14 +15,63 @@
 
 
         <androidx.recyclerview.widget.RecyclerView
-            android:background="@color/gray_200"
+            android:background="@android:color/white"
             android:id="@+id/prod_recupero_materiale_main_list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent" />
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/empty_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.3">
 
-        </androidx.recyclerview.widget.RecyclerView>
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_top"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.2" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.15" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.85" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:gravity="center_horizontal"
+                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="72dp"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_playlist_add_check_24dp"
+                    android:adjustViewBounds="true"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:textColor="@android:color/black"
+                    android:textSize="18sp"
+                    android:text="@string/no_item_in_recupera_materiale"/>
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </RelativeLayout>
 

app/src/main/res/layout/lista_picking_libero_list_model.xml

@@ -6,6 +6,7 @@
         <import type="android.view.View" />
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
         <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+        <import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
         <variable
             name="mtbColr"
             type="it.integry.integrywmsnative.core.model.MtbColr" />
@@ -23,30 +24,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">
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
+                    android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                android:text="@{mtbColr.codMart}"
+                    android:text="@{mtbColr.codMart}"
-                android:textColor="@color/colorPrimary"
+                    android:textColor="@color/colorPrimary"
-                android:textSize="14sp"
+                    android:textSize="14sp"
-                android:textStyle="bold"
+                    android:textStyle="bold"
-                tools:text="COD MART" />
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    tools:text="COD MART" />
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
+                    android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:layout_alignParentEnd="true"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp"
+                    android:background="@drawable/badge2_round_corner"
+                    android:textColor="@android:color/white"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    tools:text="PESO KG" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@id/posizione_collo"
+                android:layout_toStartOf="@id/posizione_collo"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:text="@{mtbColr.getDescrizione()}"
                 android:textColor="@android:color/black"
                 android:textSize="16sp"
+                style="@style/AppTheme.NewMaterial.Text.Small"
                 tools:text="Descrizione lunga articolo" />
 
 
@@ -56,6 +79,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" />
 
         </LinearLayout>
@@ -72,6 +96,7 @@
             app:layout_constraintBottom_toBottomOf="parent">
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/qta_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/badge1_round_corner"
@@ -80,10 +105,11 @@
                 android:paddingTop="2dp"
                 android:paddingRight="6dp"
                 android:paddingBottom="2dp"
-                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(mtbColr.mtbAart.untMis) ? `\n` + mtbColr.mtbAart.untMis : ``)}"
                 android:textSize="16sp"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
+                android:textAllCaps="true"
+                style="@style/AppTheme.NewMaterial.Text.Small"
                 tools:text="280.45\nCONF" />
 
         </RelativeLayout>

app/src/main/res/layout/lista_rettifica_giacenze_model.xml

@@ -6,6 +6,7 @@
         <import type="android.view.View" />
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
         <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+        <import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
         <variable
             name="mtbColr"
             type="it.integry.integrywmsnative.core.model.MtbColr" />
@@ -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 &amp;&amp; !mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}"
+                    android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
                     android:textSize="14sp"
                     android:textStyle="bold"
                     android:layout_alignParentEnd="true"

app/src/main/res/layout/ultime_consegne_main_list__item.xml

@@ -66,6 +66,17 @@
                     style="@style/AppTheme.NewMaterial.Text.Medium"
                     tools:text="QTA"/>
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/unt_mis"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textStyle="bold"
+                    android:textColor="@android:color/black"
+                    android:layout_marginStart="4dp"
+                    android:textAllCaps="true"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    tools:text="cnf"/>
+
             </LinearLayout>
 
         </LinearLayout>

app/src/main/res/values-it/strings.xml

@@ -165,6 +165,7 @@
     <string name="no_docs_to_show_text">Nessun documento da mostrare</string>
     <string name="no_orders_to_pick_text">Nessun ordine da evadere</string>
     <string name="no_item_text">Nessun articolo</string>
+    <string name="no_item_in_recupera_materiale">Nessuna UL versata in produzione</string>
 
     <string name="already_used_anonymous_barcode"><![CDATA[L\'etichetta scansionata è stata già utilizzata]]></string>
     <string name="no_result_from_barcode">Il barcode scansionato non ha fornito alcun risultato</string>

app/src/main/res/values/strings.xml

@@ -166,6 +166,7 @@
     <string name="no_docs_to_show_text">No documents to show</string>
     <string name="no_orders_to_pick_text">No orders to dispatch</string>
     <string name="no_item_text">No items</string>
+    <string name="no_item_in_recupera_materiale">No LU poured into production</string>
 
     <string name="already_used_anonymous_barcode">The scanned label has already been used</string>
     <string name="no_result_from_barcode">The scanned barcode did not produce any results</string>