Finish v1.32.26(366)

corretto bug modifica articolo non in listino

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 361
-    def appVersionName = '1.32.21'
+    def appVersionCode = 366
+    def appVersionName = '1.32.26'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java

@@ -201,7 +201,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
                                         .setTitleText(it.integry.integrywmsnative.R.string.doc_interni)
                                         .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni)
-                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni)
+                                        .setDrawerIcon(R.drawable.ic_documents_outline)
                                         .setFragmentFactory(DocInterniFragment::newInstance))
 
 //                                .addItem(new MenuItem()

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java

@@ -40,7 +40,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
         InventarioRoomDTO.class,
         InventarioRowRoomDTO.class
 },
-        version = 16)
+        version = 17)
 @TypeConverters({
         DateConverter.class,
         BigDecimalConverter.class,
@@ -68,7 +68,8 @@ public abstract class AppDatabase extends RoomDatabase {
                     .addMigrations(MIGRATION_12_13)
                     .addMigrations(MIGRATION_13_14)
                     .addMigrations(MIGRATION_14_15)
-                    .addMigrations(MIGRATION_15_16);
+                    .addMigrations(MIGRATION_15_16)
+                    .addMigrations(MIGRATION_16_17);
 
             sInstance = builder.build();
         }
@@ -161,4 +162,20 @@ public abstract class AppDatabase extends RoomDatabase {
         public void migrate(@NonNull SupportSQLiteDatabase database) {
         }
     };
+    static final Migration MIGRATION_16_17 = new Migration(16, 17) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE inventario_rows RENAME TO _inventario_rows_old;");
+            database.execSQL("DROP INDEX index_inventario_rows__id;");
+            database.execSQL("DROP INDEX index_inventario_rows_parent_id;");
+
+            database.execSQL("CREATE TABLE inventario_rows (_id INTEGER PRIMARY KEY AUTOINCREMENT, parent_id INTEGER, cod_mart TEXT, partita_mag TEXT, descrizione TEXT, qta REAL NOT NULL DEFAULT 0, num_cnf REAL NOT NULL DEFAULT 0, qta_cnf REAL NOT NULL DEFAULT 0, unt_mis TEXT NOT NULL DEFAULT '0', data_ora_inv INTEGER, scan_cod_barre TEXT, zona TEXT, remote_sync_date INTEGER, FOREIGN KEY(parent_id) REFERENCES inventari(_id) ON UPDATE NO ACTION ON DELETE CASCADE);");
+
+            database.execSQL("INSERT INTO inventario_rows SELECT * FROM _inventario_rows_old;");
+
+            database.execSQL("CREATE INDEX index_inventario_rows__id ON inventario_rows (_id);");
+            database.execSQL("CREATE INDEX index_inventario_rows_parent_id ON inventario_rows (parent_id)");
+            database.execSQL("DROP TABLE _inventario_rows_old;");
+        }
+    };
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java

@@ -239,15 +239,15 @@ public class ArticoloOrdine {
     }
 
     public BigDecimal getQtaCnfPrevistaVendita() {
-        return qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+        return qtaPrevistaVendita == null || qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
 
     public BigDecimal getQtaCnfProposta() {
-        return qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+        return qtaProposta == null || qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
 
     public BigDecimal getQtaCnfGiacenza() {
-        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+        return giacenza == null || giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
     }
 
     public boolean isNewNoPromo() {

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java

@@ -17,7 +17,8 @@ import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInte
                 @ForeignKey(
                         entity = InventarioRoomDTO.class,
                         parentColumns = {BaseSyncDTO.Columns.ID},
-                        childColumns = {InventarioRowRoomDTO.Columns.PARENT_ID}
+                        childColumns = {InventarioRowRoomDTO.Columns.PARENT_ID},
+                        onDelete = ForeignKey.CASCADE
                 )
         }
 )

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/_BaseRepository.java

@@ -58,7 +58,7 @@ public abstract class _BaseRepository<
                 .collect(Collectors.toList());
 
         var dataToDelete = finalLocalData.stream()
-                .filter(x -> x.isSyncronized() && finalRemoteData.stream().noneMatch(y -> keyComparator.run(y, x)))
+                .filter(x -> finalRemoteData.stream().noneMatch(y -> keyComparator.run(y, x)))
                 .collect(Collectors.toList());
 
         var dataToInsert = finalRemoteData.stream()

app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java

@@ -38,6 +38,7 @@ public class MvwSitArtUdcDetInventario {
     private BigDecimal pesoLordoKg;
     private String codJfas;
     private MtbAart mtbAart;
+    private MtbUntMis mtbUntMis;
 
 
     public String getGestione() {
@@ -283,6 +284,14 @@ public class MvwSitArtUdcDetInventario {
         return this;
     }
 
+    public MtbUntMis getMtbUntMis() {
+        return mtbUntMis;
+    }
+
+    public MvwSitArtUdcDetInventario setMtbUntMis(MtbUntMis mtbUntMis) {
+        this.mtbUntMis = mtbUntMis;
+        return this;
+    }
 
     public MtbColr toMtbColr() {
         return new MtbColr()

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java

@@ -14,6 +14,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.MtbUntMis;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
@@ -131,8 +132,26 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
         Type typeOfObjectsList = new TypeToken<ArrayList<MtbGrup>>() {
         }.getType();
-        this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed);
 
+        this.systemRESTConsumer.processSql("SELECT * FROM mtb_grup " + whereCond, typeOfObjectsList, onComplete, onFailed);
     }
 
+
+    public void getUntMisArts(List<String> inputUntMis, RunnableArgs<List<MtbUntMis>> onComplete, RunnableArgs<Exception> onFailed) {
+        List<HashMap<String, Object>> whereCondList = Stream.of(inputUntMis)
+                .distinct()
+                .withoutNulls()
+                .map(x -> {
+                    HashMap<String, Object> data = new HashMap<>();
+                    data.put("unt_mis", x);
+                    return data;
+                })
+                .toList();
+
+        var whereCond = whereCondList.isEmpty() ? "" : " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondList);
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbUntMis>>() {
+        }.getType();
+        this.systemRESTConsumer.processSql("SELECT * FROM mtb_unt_mis " + whereCond, typeOfObjectsList, onComplete, onFailed);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -13,6 +14,7 @@ import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationIncomingItemDto;
 import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationResponseDto;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import retrofit2.Call;
@@ -120,7 +122,54 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<InstantItemSituationResponseDto>> call, Response<ServiceRESTResponse<InstantItemSituationResponseDto>> response) {
-                        analyzeAnswer(response, "getInstantItemSituation", onComplete, onFailed);
+                        analyzeAnswer(response, "getInstantItemSituation", data -> {
+
+                            var inputUntMis = new ArrayList<String>();
+
+                            if (data.getIncomingItems() != null && !data.getIncomingItems().isEmpty()) {
+                                inputUntMis.addAll(Stream.of(data.getIncomingItems())
+                                        .map(InstantItemSituationIncomingItemDto::getUntMis)
+                                        .toList());
+                            }
+
+                            if (data.getAvailableItems() != null && !data.getAvailableItems().isEmpty()) {
+                                inputUntMis.addAll(Stream.of(data.getAvailableItems())
+                                        .map(MvwSitArtUdcDetInventario::getUntMis)
+                                        .toList());
+                            }
+
+                            if (inputUntMis.isEmpty()) {
+                                onComplete.run(data);
+                                return;
+                            }
+
+                            mArticoloRESTConsumer.getUntMisArts(inputUntMis, mtbUntMiss -> {
+
+                                if (data.getIncomingItems() != null && !data.getIncomingItems().isEmpty()) {
+                                    for (var item : data.getIncomingItems()){
+                                        var mtbUntMis = Stream.of(mtbUntMiss).filter(x -> x.getUntMis().equalsIgnoreCase(item.getUntMis()))
+                                                .findFirstOrElse(null);
+
+                                        if(mtbUntMis != null)
+                                            item.setMtbUntMis(mtbUntMis);
+                                    }
+                                }
+
+                                if (data.getAvailableItems() != null && !data.getAvailableItems().isEmpty()) {
+                                    for (var item : data.getAvailableItems()){
+                                        var mtbUntMis = Stream.of(mtbUntMiss).filter(x -> x.getUntMis().equalsIgnoreCase(item.getUntMis()))
+                                                .findFirstOrElse(null);
+
+                                        if(mtbUntMis != null)
+                                            item.setMtbUntMis(mtbUntMis);
+                                    }
+                                }
+
+                                onComplete.run(data);
+                            }, onFailed);
+
+
+                        }, onFailed);
                     }
 
                     @Override

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java

@@ -61,7 +61,10 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                                             .filter(x -> !UtilityString.isNullOrEmpty(x.getPartitaMag()))
                                             .forEach(x -> {
 
-                                                if (!Stream.of(batchLotsToSearch).anyMatch(batchLotToSearch -> batchLotToSearch.getCodMart().equalsIgnoreCase(x.getCodMart()) && batchLotToSearch.getPartitaMag().equalsIgnoreCase(x.getPartitaMag()))) {
+                                                if (!Stream.of(batchLotsToSearch)
+                                                        .anyMatch(batchLotToSearch ->
+                                                                batchLotToSearch.getCodMart().equalsIgnoreCase(x.getCodMart()) &&
+                                                                batchLotToSearch.getPartitaMag().equalsIgnoreCase(x.getPartitaMag()))) {
                                                     MtbPartitaMag mtbPartitaMag = new MtbPartitaMag()
                                                             .setCodMart(x.getCodMart())
                                                             .setPartitaMag(x.getPartitaMag());

app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java

@@ -28,6 +28,7 @@ public class SitArtOrdDTO {
     private String descrizioneMsfa;
     private String untord;
     private BigDecimal qtaOmg;
+    private BigDecimal qtaArrivo;
 
     private final HashMap<String, Object> extraInfo = new HashMap<>();
 
@@ -232,4 +233,13 @@ public class SitArtOrdDTO {
         this.qtaOmg = qtaOmg;
         return this;
     }
+
+    public BigDecimal getQtaArrivo() {
+        return qtaArrivo;
+    }
+
+    public SitArtOrdDTO setQtaArrivo(BigDecimal qtaArrivo) {
+        this.qtaArrivo = qtaArrivo;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/model/giacenza/InstantItemSituationIncomingItemDto.java

@@ -3,6 +3,8 @@ package it.integry.integrywmsnative.core.rest.model.giacenza;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
+import it.integry.integrywmsnative.core.model.MtbUntMis;
+
 public class InstantItemSituationIncomingItemDto {
 
     private BigDecimal qtaOrd;
@@ -21,6 +23,7 @@ public class InstantItemSituationIncomingItemDto {
     private String codJcom;
     private String codMdep;
     private String untMis;
+    private MtbUntMis mtbUntMis;
 
     public BigDecimal getQtaOrd() {
         return qtaOrd;
@@ -85,4 +88,13 @@ public class InstantItemSituationIncomingItemDto {
     public String getUntMis() {
         return untMis;
     }
+
+    public MtbUntMis getMtbUntMis() {
+        return mtbUntMis;
+    }
+
+    public InstantItemSituationIncomingItemDto setMtbUntMis(MtbUntMis mtbUntMis) {
+        this.mtbUntMis = mtbUntMis;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -56,6 +56,8 @@ public class DBSettingsModel {
     private boolean showCodFornSpedizione = true;
     private boolean flagCanCreateInventario = true;
     private boolean flagCanAddUnknownItemsInventario = true;
+    private boolean flagShouldAskToCreateOrUpdateRowInventario = false;
+    private String commessaMagazzino;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -418,6 +420,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagShouldAskToCreateOrUpdateRowInventario() {
+        return flagShouldAskToCreateOrUpdateRowInventario;
+    }
+
+    public DBSettingsModel setFlagShouldAskToCreateOrUpdateRowInventario(boolean flagShouldAskToCreateOrUpdateRowInventario) {
+        this.flagShouldAskToCreateOrUpdateRowInventario = flagShouldAskToCreateOrUpdateRowInventario;
+        return this;
+    }
+
     public boolean isFlagConsentiFuoriPianoLogistico() {
         return flagConsentiFuoriPianoLogistico;
     }
@@ -426,4 +437,13 @@ public class DBSettingsModel {
         this.flagConsentiFuoriPianoLogistico = flagConsentiFuoriPianoLogistico;
         return this;
     }
+
+    public String getCommessaMagazzino() {
+        return commessaMagazzino;
+    }
+
+    public DBSettingsModel setCommessaMagazzino(String commessaMagazzino) {
+        this.commessaMagazzino = commessaMagazzino;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -15,6 +15,7 @@ import java.util.List;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.StbGestSetup;
 import it.integry.integrywmsnative.core.model.dto.InternalCodAnagsDTO;
@@ -363,6 +364,14 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("INVENTARIO")
                 .setKeySection("FLAG_CAN_ADD_UNKNOWN_ITEMS"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("INVENTARIO")
+                .setKeySection("FLAG_SHOULD_ASK_TO_CREATE_OR_UPDATE_ROW"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SETUP")
+                .setKeySection("COMMESSA_MAGAZZINO"));
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
         mGestSetupRESTConsumer.getValues(codMdep, stbGestSetupList, list -> {
@@ -398,6 +407,8 @@ public class SettingsManager {
             dbSettingsModelIstance.setGroupShippingByCommodityGroup(getValueFromList(list, "SPEDIZIONE", "FLAG_GROUP_BY_GRP_MERC", Boolean.class, Boolean.FALSE));
             dbSettingsModelIstance.setFlagCanCreateInventario(getValueFromList(list, "INVENTARIO", "FLAG_CAN_CREATE_INVENTARIO", Boolean.class, Boolean.TRUE));
             dbSettingsModelIstance.setFlagCanAddUnknownItemsInventario(getValueFromList(list, "INVENTARIO", "FLAG_CAN_ADD_UNKNOWN_ITEMS", Boolean.class, Boolean.TRUE));
+            dbSettingsModelIstance.setFlagShouldAskToCreateOrUpdateRowInventario(getValueFromList(list, "INVENTARIO", "FLAG_SHOULD_ASK_TO_CREATE_OR_UPDATE_ROW", Boolean.class, Boolean.FALSE));
+            dbSettingsModelIstance.setCommessaMagazzino(getValueFromList(list, "SETUP", "COMMESSA_MAGAZZINO", String.class, CommonConst.Config.COMMESSA_MAG));
 
             String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
             if (notePerdita != null)
@@ -435,7 +446,7 @@ public class SettingsManager {
             } else if (clazz == Integer.class && value.getValue() != null) {
                 return clazz.cast(Integer.parseInt(value.getValue()));
             }
-        } else {
+        } else if(defaultValue == null) {
             if (clazz == Boolean.class) {
                 return clazz.cast(Boolean.FALSE);
             } else if (clazz == Integer.class) {

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java

@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,7 +29,6 @@ import it.integry.integrywmsnative.core.expansion.BaseFragment;
 import it.integry.integrywmsnative.core.interfaces.IScrollableFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.FragmentDocInterniBinding;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoView;
@@ -125,26 +123,7 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
     @Override
     public void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection) {
         mViewModel.setSelectedDocDetails(selection);
-
-        if (selection.isFornitoreRequired()) {
-            mBinding.codAnagContainer.setVisibility(View.VISIBLE);
-        } else {
-            mBinding.codAnagContainer.setVisibility(View.GONE);
-        }
-
-
-//        if (selection.getGruppoArt() != null) {
-//            mBinding.mtbGrpContainer.setVisibility(View.VISIBLE);
-//        } else {
-//            mBinding.mtbGrpContainer.setVisibility(View.GONE);
-//        }
-
-        if (selection.isDocumentRequired()) {
-            mBinding.docContainer.setVisibility(View.VISIBLE);
-            mBinding.document.setText(Html.fromHtml(getString(R.string.doc_testata, String.valueOf(selection.getNumDoc()), UtilityDate.formatDate(selection.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN))));
-        } else {
-            mBinding.docContainer.setVisibility(View.GONE);
-        }
+        mBinding.invalidateAll();
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java

@@ -35,7 +35,7 @@ public class DocInterniViewModel {
     private boolean docsFetched = true;
     private int nextNumCollo = 0;
     private List<DocumentoArtDTO> availableArts;
-    private MutableLiveData<List<DocInternoWrapper>> mDocsList = new MutableLiveData<>();
+    private final MutableLiveData<List<DocInternoWrapper>> mDocsList = new MutableLiveData<>();
 
     public TipoDocDTO dtbTipi;
     public GruppoArticoloDTO mtbGrup;

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java

@@ -9,7 +9,6 @@ import org.json.JSONObject;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -37,18 +36,17 @@ import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQua
 
 public class DocInterniEditFormViewModel {
 
-    @Inject
-    MtbColrDataSource mtbColrRepository;
-    @Inject
-    MtbColtRepository mtbColtRepository;
+    private final MtbColrDataSource mtbColrRepository;
+    private final MtbColtRepository mtbColtRepository;
     private final DocInterniRESTConsumer docInterniRESTConsumer;
-    private DocInterniEditFormViewModel.Listener listener;
+    private Listener listener;
     private List<DocumentoArtDTO> productsList;
-    private HashMap<String, String> flattedBarcodesCodMarts;
     private TipoDocDTO tipoDoc;
+
     private boolean isCheckPartitaMag = false;
     private JSONObject checkFornitoreRules = null;
 
+
     public MutableLiveData<SqlMtbColt> document = new MutableLiveData<>();
     public MutableLiveData<List<SqlMtbColr>> docRows = new MutableLiveData<>();
 
@@ -300,13 +298,6 @@ public class DocInterniEditFormViewModel {
 
     public void setProductsList(List<DocumentoArtDTO> productsList) {
         this.productsList = productsList;
-        this.flattedBarcodesCodMarts = new HashMap<>();
-
-        for (DocumentoArtDTO documentArt : productsList) {
-            for (String barcode : documentArt.getBarcode()) {
-                this.flattedBarcodesCodMarts.put(barcode, documentArt.getCodMart());
-            }
-        }
     }
 
     public void processBarcode(BarcodeScanDTO dto) {

app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java

@@ -36,6 +36,8 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.ActivityPickingInventarioBinding;
 import it.integry.integrywmsnative.databinding.ActivityPickingInventarioListItemBinding;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsItemListModel;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsView;
 import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsView;
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
@@ -99,7 +101,8 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn
         mViewModel.init(
                 DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO)),
                 DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO_ARTS)),
-                SettingsManager.iDB().isFlagCanAddUnknownItemsInventario());
+                SettingsManager.iDB().isFlagCanAddUnknownItemsInventario(),
+                SettingsManager.iDB().isFlagShouldAskToCreateOrUpdateRowInventario());
 
         initToolbar();
         initBarcodeReader();
@@ -236,6 +239,36 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn
                     .show(getSupportFragmentManager(), "tag");
     }
 
+    @Override
+    public void onItemAlreadyFound(InventarioArtDTO matchedArt, List<InventarioRowRoomDTO> alreadyScannedItems) {
+        final List<DialogSelectDocRowsItemListModel<Object>> dialogSelectDocRowsItemListModels = Stream.of(alreadyScannedItems)
+                .map(x -> new DialogSelectDocRowsItemListModel<>()
+                        .setBarcode(x.getScanCodBarre())
+                        .setCodMart(x.getCodMart())
+                        .setDescrizione(x.getDescrizione())
+                        .setQtaOrd(x.getQta())
+                        .setUntMisOrd(x.getUntMis())
+                        .setNew(false)
+                        .setOriginalModel(x))
+                .toList();
+
+        dialogSelectDocRowsItemListModels.add(new DialogSelectDocRowsItemListModel<>()
+                .setCodMart(matchedArt.getCodMart())
+                .setDescrizione(matchedArt.getDescrizione())
+                .setQtaOrd(BigDecimal.ZERO)
+                .setUntMisOrd(matchedArt.getUntMis())
+                .setNew(true));
+
+        DialogSelectDocRowsView.newInstance(dialogSelectDocRowsItemListModels, data -> {
+            if(data.isNew())
+                this.mViewModel.dispatchRowInsert(null, matchedArt, null);
+            else
+                this.mViewModel.dispatchRowEdit(matchedArt.toMtbAart(), (InventarioRowRoomDTO) data.getOriginalModel());
+        }, () -> {
+
+        }).show(this.getSupportFragmentManager(), "DialogSelectDocRowsView");
+    }
+
     public void showAvailableArts() {
         var listaMtbAart = Stream.of(this.mViewModel.getAvailableArts())
                 .map(InventarioArtDTO::toMtbAart)

app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java

@@ -4,6 +4,8 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
+import com.annimon.stream.Stream;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
@@ -37,6 +39,7 @@ public class PickingInventarioViewModel extends ViewModel {
     private final InventarioRowRepository inventarioRowRepository;
 
     private boolean canAddUnknownItems;
+    private boolean flagShouldAskToCreateOrUpdateRowInventario;
 
     public MutableLiveData<InventarioRoomDTO> currentInventario = new MutableLiveData<>();
     public LiveData<List<InventarioRowRoomDTO>> currentInventarioRows = new MutableLiveData<>();
@@ -51,8 +54,9 @@ public class PickingInventarioViewModel extends ViewModel {
         this.inventarioRowRepository = inventarioRowRepository;
     }
 
-    public void init(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> inventarioArts, boolean canAddUnknownItems) {
+    public void init(InventarioRoomDTO inventarioRoomDTO, List<InventarioArtDTO> inventarioArts, boolean canAddUnknownItems, boolean flagShouldAskToCreateOrUpdateRowInventario) {
         this.canAddUnknownItems = canAddUnknownItems;
+        this.flagShouldAskToCreateOrUpdateRowInventario = flagShouldAskToCreateOrUpdateRowInventario;
 
         this.sendOnLoadingStarted();
 
@@ -159,24 +163,41 @@ public class PickingInventarioViewModel extends ViewModel {
 
         if (canAddUnknownItems && matchedArt == null) {
             matchedArt = new InventarioArtDTO()
-                        .setBarcode(barcodeList)
-                        .setFlagQtaCnfFissa(true)
-                        .setPlu(false)
-                        .setUntMis("PZ")
-                        .setQtaCnf(BigDecimal.ONE);
+                    .setBarcode(barcodeList)
+                    .setFlagQtaCnfFissa(true)
+                    .setPlu(false)
+                    .setUntMis("PZ")
+                    .setQtaCnf(BigDecimal.ONE);
 
         }
 
         if (matchedArt != null) {
-            this.dispatchRowInsert(barcodeProd, matchedArt, ean128Model);
+            var alreadyScannedItems = searchArtInAlreadyScannedItems(matchedArt);
+
+            if (alreadyScannedItems == null || alreadyScannedItems.isEmpty() || !flagShouldAskToCreateOrUpdateRowInventario)
+                this.dispatchRowInsert(barcodeProd, matchedArt, ean128Model);
+
+            else {
+                this.sendOnItemAlreadyFound(matchedArt, alreadyScannedItems);
+
+            }
             onComplete.run();
         } else
             this.sendError(new NoResultFromBarcodeException(barcodeProd));
+    }
 
+    private List<InventarioRowRoomDTO> searchArtInAlreadyScannedItems(InventarioArtDTO inventarioArtDTO) {
+        final List<InventarioRowRoomDTO> inventarioRows = this.currentInventarioRows.getValue();
+
+        if (inventarioRows == null) return null;
+
+        return Stream.of(inventarioRows)
+                .filter(x -> x.getCodMart().equalsIgnoreCase(inventarioArtDTO.getCodMart()))
+                .toList();
     }
 
 
-    private void dispatchRowInsert(String barcode, InventarioArtDTO inventarioArtDTO, Ean128Model ean128Model) {
+    public void dispatchRowInsert(String barcode, InventarioArtDTO inventarioArtDTO, Ean128Model ean128Model) {
         var mtbAart = inventarioArtDTO.toMtbAart();
         mtbAart.setFlagTracciabilita("N");
 
@@ -290,7 +311,7 @@ public class PickingInventarioViewModel extends ViewModel {
         }
     }
 
-    private void dispatchRowEdit(MtbAart mtbAart, InventarioRowRoomDTO inventarioRowRoomDTO) {
+    public void dispatchRowEdit(MtbAart mtbAart, InventarioRowRoomDTO inventarioRowRoomDTO) {
 
         final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
                 .setMtbAart(mtbAart);
@@ -393,6 +414,11 @@ public class PickingInventarioViewModel extends ViewModel {
                 onComplete);
     }
 
+    private void sendOnItemAlreadyFound(InventarioArtDTO matchedArt, List<InventarioRowRoomDTO> alreadyScannedItems) {
+        if(this.mListener != null)
+            this.mListener.onItemAlreadyFound(matchedArt, alreadyScannedItems);
+    }
+
     public PickingInventarioViewModel setListener(Listener listener) {
         this.mListener = listener;
         return this;
@@ -419,5 +445,7 @@ public class PickingInventarioViewModel extends ViewModel {
                               RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
 
 
+        void onItemAlreadyFound(InventarioArtDTO matchedArt, List<InventarioRowRoomDTO> alreadyScannedItems);
+
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java

@@ -175,7 +175,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
         setSupportActionBar(mBindings.toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        
+
         mFlagShowCodForn = SettingsManager.iDB().isShowCodFornSpedizione();
         mDivideByGrpMerc = SettingsManager.iDB().isGroupShippingByCommodityGroup();
 
@@ -337,10 +337,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                     qtaColWithdrawRows.addAndGet(row.getQtaCol());
                                 });
 
-                        spedizioneListModel.setBadge2(x.getSitArtOrdDTO().getCodJcom());
-
                         if (!anyLUPresent) {
                             spedizioneListModel.setGroupTitle(!mEnableFakeGiacenza ? getString(R.string.picking_not_available) : "");
+                            spedizioneListModel.setBadge2(getCommessa(x.getSitArtOrdDTO().getCodJcom()));
 
                             if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
                                 spedizioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
@@ -378,14 +377,18 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                 cloneModel.setGroupTitle(String.format("%s: %s", getString(R.string.position_text), UtilityString.isNullOrEmpty(mtbColtToPick.getPosizione()) ? "N.A." : mtbColtToPick.getPosizione()));
 
                                 MtbColr mtbColrToDispatch = mtbColtToPick.getMtbColr() != null && mtbColtToPick.getMtbColr().size() > 0 ? mtbColtToPick.getMtbColr().get(0) : null;
-                                if (mtbColrToDispatch != null && !UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag())) {
-                                    cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag()));
-                                    cloneModel.setBadge2(mtbColrToDispatch.getCodJcom());
+                                if (mtbColrToDispatch != null) {
+                                    if(!UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag()))
+                                        cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag()));
+
+                                    if (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getCodJcom())) {
+                                        cloneModel.setBadge2(getCommessa(mtbColrToDispatch.getCodJcom()));
+                                    }
                                 }
                                 cloneModel.setSourceMtbColr(mtbColrToDispatch);
-
                                 cloneModel.setSubDescrizione2(String.format(getString(R.string.lu_number_data_text), mtbColtToPick.getNumCollo(), UtilityDate.formatDate(mtbColtToPick.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
 
+
                                 if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
                                     cloneModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
 
@@ -514,7 +517,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                         spedizioneListModel.setGroupTitle(groupTitle);
 
                         if (!anyLUPresent) {
-                            spedizioneListModel.setBadge2(x.getSitArtOrdDTO().getCodJcom());
+                            spedizioneListModel.setBadge2(getCommessa(x.getSitArtOrdDTO().getCodJcom()));
 
                             if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
                                 spedizioneListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
@@ -547,9 +550,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
 
                                 MtbColr mtbColrToDispatch = mtbColtToPick.getMtbColr() != null && mtbColtToPick.getMtbColr().size() > 0 ? mtbColtToPick.getMtbColr().get(0) : null;
-                                if (mtbColrToDispatch != null && !UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag())) {
-                                    cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag()));
-                                    cloneModel.setBadge2(mtbColrToDispatch.getCodJcom());
+                                if (mtbColrToDispatch != null) {
+                                    if (!UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag()))
+                                        cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag()));
+
+                                    cloneModel.setBadge2(getCommessa(mtbColrToDispatch.getCodJcom()));
                                 }
                                 cloneModel.setSourceMtbColr(mtbColrToDispatch);
 
@@ -632,6 +637,19 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         return sortedList;
     }
 
+    private String getCommessa(String codJcom) {
+        var commessaMagazzino = SettingsManager.iDB().getCommessaMagazzino();
+
+        if(UtilityString.isNullOrEmpty(commessaMagazzino)) {
+            return UtilityString.isNull(codJcom, "Magazzino").toUpperCase();
+        } else {
+            if(commessaMagazzino.equalsIgnoreCase(codJcom) || codJcom == null)
+                return "Magazzino".toUpperCase();
+            else
+                return codJcom.toUpperCase();
+        }
+    }
+
     private boolean isThereAnyItemToPick(List<PickingObjectDTO> dataList) {
         return Stream.of(dataList)
                 .anyMatch(x -> !x.isHidden());

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -652,7 +652,12 @@ public class SpedizioneViewModel {
         if (mEnableGiacenza) {
 
             Stream.of(pickingList).forEach(pickingObjectDTO -> {
-                if (Stream.of(pickingObjectDTO.getMtbColts()).anyMatch(x -> Objects.equals(x.getNumCollo(), scannedUL.getNumCollo()) && x.getDataColloS().equals(scannedUL.getDataColloS()) && x.getSerCollo().equalsIgnoreCase(scannedUL.getSerCollo()) && (scannedUL.getGestioneEnum() == GestioneEnum.ACQUISTO || scannedUL.getGestioneEnum() == GestioneEnum.LAVORAZIONE))) {
+                if (Stream.of(pickingObjectDTO.getMtbColts())
+                        .anyMatch(x ->
+                                Objects.equals(x.getNumCollo(), scannedUL.getNumCollo()) &&
+                                        x.getDataColloS().equals(scannedUL.getDataColloS()) &&
+                                        x.getSerCollo().equalsIgnoreCase(scannedUL.getSerCollo()) &&
+                                        (scannedUL.getGestioneEnum() == GestioneEnum.ACQUISTO || scannedUL.getGestioneEnum() == GestioneEnum.LAVORAZIONE))) {
 
                     matchPickingObject.add(pickingObjectDTO);
                 }
@@ -679,7 +684,13 @@ public class SpedizioneViewModel {
             ObservableArrayList<MtbColr> cloneMtbColrs = (ObservableArrayList<MtbColr>) cloneMtbColt.getMtbColr().clone();
 
 
-            Stream.of(cloneMtbColt.getMtbColr()).filter(x -> !(UtilityString.equalsIgnoreCase(x.getCodMart(), matchedObject.getSitArtOrdDTO().getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), matchedObject.getSitArtOrdDTO().getCodTagl()) && UtilityString.equalsIgnoreCase(x.getCodCol(), matchedObject.getSitArtOrdDTO().getCodCol()) && (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), matchedObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(matchedObject.getSitArtOrdDTO().getPartitaMag())))).forEach(cloneMtbColrs::remove);
+            Stream.of(cloneMtbColt.getMtbColr())
+                    .filter(x -> !(UtilityString.equalsIgnoreCase(x.getCodMart(), matchedObject.getSitArtOrdDTO().getCodMart()) &&
+                            UtilityString.equalsIgnoreCase(x.getCodTagl(), matchedObject.getSitArtOrdDTO().getCodTagl()) &&
+                            UtilityString.equalsIgnoreCase(x.getCodCol(), matchedObject.getSitArtOrdDTO().getCodCol()) &&
+                            (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), matchedObject.getSitArtOrdDTO().getPartitaMag()) ||
+                                    UtilityString.isNullOrEmpty(matchedObject.getSitArtOrdDTO().getPartitaMag()))))
+                    .forEach(cloneMtbColrs::remove);
 
             cloneMtbColt.setMtbColr(cloneMtbColrs);
 

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java

@@ -119,7 +119,7 @@ public class DialogInfoSituazioneArticoloView extends BaseDialogRowInfoView {
             availableItems = new ArrayList<>();
 
         availableItems = Stream.of(availableItems)
-                .filter(x -> UtilityDate.isAfterToday(x.getDataScad()))
+                .filter(x -> x.getDataScad() == null || UtilityDate.isAfterToday(x.getDataScad()))
                 .toList();
 
         if(availableItems.isEmpty())
@@ -141,7 +141,7 @@ public class DialogInfoSituazioneArticoloView extends BaseDialogRowInfoView {
 
         var itemListCommessaNotMatchMatch = Stream.of(itemList)
                 .filter(dialogInfoSituazioneArticoloAvailableListItem -> !dialogInfoSituazioneArticoloAvailableListItem.isCommessaMatch())
-                .sortBy(x -> x.getDataScad())
+                .sortBy(x -> x.getDataScad() == null ? UtilityDate.getNow() : x.getDataScad())
                 .toList();
 
 

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
@@ -150,8 +151,18 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
             holder.mBinding.freeQty.setVisibility(View.GONE);
         }
 
-        holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa()));
-        holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot()));
+        int cifreDec = CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS;
+        if (pickingObjectDTO.getOriginalModel().getMtbAart() != null &&
+                pickingObjectDTO.getOriginalModel().getMtbAart().getMtbUntMis() != null &&
+                !pickingObjectDTO.getOriginalModel().getMtbAart().getMtbUntMis().isEmpty()) {
+
+            var mtbUntMis = pickingObjectDTO.getOriginalModel().getMtbAart().getMtbUntMis().get(0);
+            if (mtbUntMis.isFlagDig()) cifreDec = 0;
+            else cifreDec = Math.min(mtbUntMis.getCifreDec().intValue(), CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS);
+        }
+
+        holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa(), cifreDec));
+        holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot(), cifreDec));
 
         holder.mBinding.untMis.setText(pickingObjectDTO.getUntMis());
         holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE);

app/src/main/res/drawable/ic_documents_outline.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,1C3.9,1 3,1.9 3,3L3,17L5,17L5,3L17,3L17,1L5,1zM9,5C7.9,5 7,5.9 7,7L7,21C7,22.1 7.9,23 9,23L20,23C21.1,23 22,22.1 22,21L22,10L17,5L9,5zM9,7L16,7L16,11L20,11L20,21L9,21L9,7zM11,13L11,15L18,15L18,13L11,13zM11,17L11,19L18,19L18,17L11,17z"
+      android:fillColor="#5B5B5B"/>
+</vector>

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

@@ -79,7 +79,6 @@
                     app:cardElevation="4dp">
 
                     <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/profile_root_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@color/colorPrimary"
@@ -93,7 +92,7 @@
                             android:layout_gravity="center_vertical"
                             android:layout_marginEnd="16dp"
                             android:adjustViewBounds="true"
-                            android:src="@drawable/ic_doc_interni_outline"
+                            android:src="@drawable/ic_document_outline"
                             android:tint="@color/white" />
 
 
@@ -114,18 +113,10 @@
                                     android:layout_toStartOf="@id/loaded_arts_info_layout"
                                     android:orientation="horizontal">
 
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="ID:"
-                                        android:textColor="@android:color/white" />
-
                                     <androidx.appcompat.widget.AppCompatTextView
                                         style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:layout_marginStart="4dp"
                                         app:binding="@{view.documentHeader}"
                                         android:textColor="@android:color/white"
                                         tools:text="670" />
@@ -186,7 +177,7 @@
                                     android:layout_marginStart="4dp"
                                     android:text="Non definito"
                                     android:textStyle="italic"
-                                    app:visibility="@{view.documentRifHeader.get() == null}" />
+                                    app:visibility="@{view.documentRifHeader.get().empty}" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
@@ -194,7 +185,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="4dp"
                                     app:binding="@{view.documentRifHeader}"
-                                    app:visibility="@{view.documentRifHeader.get() != null}" />
+                                    app:reverse_visibility="@{view.documentRifHeader.get().empty}" />
                             </androidx.appcompat.widget.LinearLayoutCompat>
 
                             <androidx.appcompat.widget.LinearLayoutCompat
@@ -216,7 +207,7 @@
                                     android:layout_marginStart="4dp"
                                     android:text="Non definito"
                                     android:textStyle="italic"
-                                    app:visibility="@{view.codAnag.get() == null}" />
+                                    app:visibility="@{view.codAnag.get().empty}" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
@@ -224,7 +215,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="4dp"
                                     app:binding="@{view.codAnag}"
-                                    app:visibility="@{view.codAnag.get() != null}" />
+                                    app:reverse_visibility="@{view.codAnag.get().empty}" />
                             </androidx.appcompat.widget.LinearLayoutCompat>
 
                         </androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -163,7 +163,8 @@
                 app:layout_constraintTop_toBottomOf="@id/header_content"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:listitem="@layout/fragment_pv_articoli_ordine_acquisto__list_single_item" />
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/scan_art_spinner"
@@ -266,7 +267,6 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 

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

@@ -74,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:backgroundTint="@color/colorPrimary"
                 android:gravity="center"
-                android:text="@{UtilityNumber.decimalToString(item.qtaOrd, 2)}"
+                android:text="@{UtilityNumber.decimalToString(item.qtaOrd, item.mtbUntMis.cifreDec.intValue())}"
                 android:textAllCaps="true"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"

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

@@ -6,6 +6,10 @@
     <data>
 
         <import type="androidx.databinding.ObservableList" />
+        <import type="it.integry.integrywmsnative.R" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+        <import type="android.text.Html" />
+        <import type="androidx.core.content.ContextCompat" />
 
         <variable
             name="view"
@@ -31,216 +35,203 @@
             android:background="@color/full_white"
             android:orientation="vertical">
 
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:descendantFocusability="blocksDescendants"
-                android:orientation="vertical"
-                android:paddingTop="8dp">
 
-                <RelativeLayout
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="12dp"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="4dp">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
-                    android:background="@drawable/gray_detail_background_round16"
-                    android:layout_gravity="center_vertical"
+                    android:background="@color/colorPrimary"
+                    android:orientation="horizontal"
                     android:padding="16dp">
 
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:src="@drawable/ic_documents_outline"
+                        android:tint="@color/white" />
+
+
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
 
                         <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginEnd="8dp"
-                                android:text="@string/cod_dtip_name"
-                                android:textColor="@android:color/black"
-                                android:textSize="16sp" />
+                                android:text="Tipo doc:" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/cod_dtip"
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_marginStart="4dp"
+                                android:text="Non definito"
+                                android:textStyle="italic"
+                                app:visibility="@{viewModel.dtbTipi.codDtip.empty}"
+                                tools:visibility="gone"/>
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="4dp"
                                 android:text="@{viewModel.dtbTipi.codDtip}"
-                                android:textColor="@android:color/black"
-                                android:textSize="16sp"
-                                android:textStyle="bold"
+                                app:reverse_visibility="@{viewModel.dtbTipi.codDtip.empty}"
                                 tools:text="114" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/desc_tipo_doc"
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
                                 android:ellipsize="end"
                                 android:maxLines="1"
                                 android:text="@{viewModel.dtbTipi.descrizione}"
-                                android:textColor="@android:color/black"
-                                android:textSize="16sp"
-                                android:textStyle="bold"
+                                app:reverse_visibility="@{viewModel.dtbTipi.codDtip.empty}"
                                 tools:text="PERDITA" />
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
                         <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/cod_anag_container"
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal">
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal"
+                            app:reverse_visibility="@{viewModel.fornitore == null}">
 
                             <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginEnd="8dp"
-                                android:text="@string/cod_anag_name"
-                                android:textColor="@android:color/black"
-                                android:textSize="16sp" />
+                                android:text="Fornitore:" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/cod_anag"
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:ellipsize="end"
-                                android:maxLines="1"
+                                android:layout_marginStart="4dp"
                                 android:text="@{viewModel.fornitore.label}"
-                                android:textColor="@android:color/black"
-                                android:textSize="16sp"
-                                android:textStyle="bold"
                                 tools:text="F0000 - CARELLI" />
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/doc_container"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="8dp"
-                                android:text="@string/document_label"
-                                android:textColor="@android:color/black"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/document"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:ellipsize="end"
-                                android:maxLines="1"
-                                android:textColor="@android:color/black"
-                                android:textSize="16sp"
-                                android:textStyle="bold"
-                                tools:text="n. 123 del 12/11/2021" />
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
                         <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal">
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal"
+                            app:reverse_visibility="@{UtilityString.isNullOrEmpty(viewModel.numDoc)}">
 
                             <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginEnd="8dp"
-                                android:text="@string/articoli_disponibili"
-                                android:textColor="@android:color/black"
-                                android:textSize="14sp" />
+                                android:text="Documento:" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/count_arts"
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:textColor="@android:color/black"
-                                android:textSize="14sp"
-                                android:textStyle="bold"
-                                app:binding="@{viewModel.artsSize}"
-                                tools:text="0" />
+                                android:layout_marginStart="4dp"
+                                android:text="@{Html.fromHtml(context.getString(R.string.doc_testata, viewModel.numDoc, UtilityDate.formatDate(viewModel.dataDoc, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}"
+                                tools:text="n. 123 del 29/03/2023" />
+
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
-                </RelativeLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <RelativeLayout
+            </androidx.cardview.widget.CardView>
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/doc_interni_main_list"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="16dp"
+                    android:background="@color/full_white"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="2dp"
+                    tools:itemCount="5"
+                    tools:listitem="@layout/doc_interni_list_model" />
 
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/doc_interni_main_list"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="16dp"
-                        android:background="@color/full_white"
-                        android:paddingStart="2dp"
-                        android:paddingEnd="2dp" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/doc_interni_empty_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:alpha="0.3">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/doc_interni_empty_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:alpha="0.3">
+                    <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_top"
-                            android:layout_width="wrap_content"
+                    <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:gravity="center_horizontal"
+                        android:orientation="vertical"
+
+                        app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                        app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                        app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="72dp"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            app:layout_constraintGuide_percent="0.2" />
+                            android:adjustViewBounds="true"
+                            android:src="@drawable/ic_playlist_add_check_24dp" />
 
-                        <androidx.constraintlayout.widget.Guideline
-                            android:id="@+id/guideline_empty_left"
+                        <androidx.appcompat.widget.AppCompatTextView
                             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:gravity="center_horizontal"
-                            android:orientation="vertical"
+                            android:text="@string/no_doc_found_message"
+                            android:textColor="@android:color/black"
+                            android:textSize="18sp" />
+                    </LinearLayout>
 
-                            app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
-                            app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
-                            app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="72dp"
-                                android:layout_height="wrap_content"
-                                android:adjustViewBounds="true"
-                                android:src="@drawable/ic_playlist_add_check_24dp" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
-                                android:text="@string/no_doc_found_message"
-                                android:textColor="@android:color/black"
-                                android:textSize="18sp" />
-                        </LinearLayout>
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-                </RelativeLayout>
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </RelativeLayout>
         </androidx.appcompat.widget.LinearLayoutCompat>
 
 

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

@@ -108,7 +108,6 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/badge_round_corner"
                 android:backgroundTint="@{articolo.bgTint}"
-                android:visibility="@{articolo.invalid ? View.GONE : View.VISIBLE}"
                 android:gravity="center"
                 android:paddingLeft="6dp"
                 android:paddingTop="2dp"