Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Valerio Castellana 2023-03-30 09:44:48 +02:00
commit 73242bc208
21 changed files with 1619 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 360 def appVersionCode = 364
def appVersionName = '1.32.20' def appVersionName = '1.32.24'
signingConfigs { signingConfigs {
release { release {

1168
app/schemas/it.integry.integrywmsnative.core.data_store.db.AppDatabase/17.json Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -201,7 +201,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
.setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni) .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
.setTitleText(it.integry.integrywmsnative.R.string.doc_interni) .setTitleText(it.integry.integrywmsnative.R.string.doc_interni)
.setTitleIcon(R.drawable.ic_dashboard_contab_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)) .setFragmentFactory(DocInterniFragment::newInstance))
// .addItem(new MenuItem() // .addItem(new MenuItem()

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

@ -40,7 +40,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
InventarioRoomDTO.class, InventarioRoomDTO.class,
InventarioRowRoomDTO.class InventarioRowRoomDTO.class
}, },
version = 16) version = 17)
@TypeConverters({ @TypeConverters({
DateConverter.class, DateConverter.class,
BigDecimalConverter.class, BigDecimalConverter.class,
@ -68,7 +68,8 @@ public abstract class AppDatabase extends RoomDatabase {
.addMigrations(MIGRATION_12_13) .addMigrations(MIGRATION_12_13)
.addMigrations(MIGRATION_13_14) .addMigrations(MIGRATION_13_14)
.addMigrations(MIGRATION_14_15) .addMigrations(MIGRATION_14_15)
.addMigrations(MIGRATION_15_16); .addMigrations(MIGRATION_15_16)
.addMigrations(MIGRATION_16_17);
sInstance = builder.build(); sInstance = builder.build();
} }
@ -161,4 +162,20 @@ public abstract class AppDatabase extends RoomDatabase {
public void migrate(@NonNull SupportSQLiteDatabase database) { 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;");
}
};
} }

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

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

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

@ -58,7 +58,7 @@ public abstract class _BaseRepository<
.collect(Collectors.toList()); .collect(Collectors.toList());
var dataToDelete = finalLocalData.stream() 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()); .collect(Collectors.toList());
var dataToInsert = finalRemoteData.stream() var dataToInsert = finalRemoteData.stream()

7
app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java
View File

@ -1,10 +1,9 @@
package it.integry.integrywmsnative.core.di; package it.integry.integrywmsnative.core.di;
import java.math.BigDecimal;
import java.math.RoundingMode;
import androidx.databinding.BaseObservable; import androidx.databinding.BaseObservable;
import java.math.BigDecimal;
import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.CommonConst;
import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.core.utility.UtilityNumber;
@ -20,7 +19,7 @@ public class BindableFloat extends BaseObservable {
if(numberOfDigits > CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS) numberOfDigits = CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS; if(numberOfDigits > CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS) numberOfDigits = CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS;
return new BigDecimal(get()); return BigDecimal.valueOf(get());
} }
public Float get(boolean defaultIfNull) { public Float get(boolean defaultIfNull) {

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

@ -56,6 +56,7 @@ public class DBSettingsModel {
private boolean showCodFornSpedizione = true; private boolean showCodFornSpedizione = true;
private boolean flagCanCreateInventario = true; private boolean flagCanCreateInventario = true;
private boolean flagCanAddUnknownItemsInventario = true; private boolean flagCanAddUnknownItemsInventario = true;
private boolean flagShouldAskToCreateOrUpdateRowInventario = false;
public boolean isFlagSpedizioneEnableFakeGiacenza() { public boolean isFlagSpedizioneEnableFakeGiacenza() {
return flagSpedizioneEnableFakeGiacenza; return flagSpedizioneEnableFakeGiacenza;
@ -418,6 +419,15 @@ public class DBSettingsModel {
return this; return this;
} }
public boolean isFlagShouldAskToCreateOrUpdateRowInventario() {
return flagShouldAskToCreateOrUpdateRowInventario;
}
public DBSettingsModel setFlagShouldAskToCreateOrUpdateRowInventario(boolean flagShouldAskToCreateOrUpdateRowInventario) {
this.flagShouldAskToCreateOrUpdateRowInventario = flagShouldAskToCreateOrUpdateRowInventario;
return this;
}
public boolean isFlagConsentiFuoriPianoLogistico() { public boolean isFlagConsentiFuoriPianoLogistico() {
return flagConsentiFuoriPianoLogistico; return flagConsentiFuoriPianoLogistico;
} }

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

@ -363,6 +363,10 @@ public class SettingsManager {
.setGestName("PICKING") .setGestName("PICKING")
.setSection("INVENTARIO") .setSection("INVENTARIO")
.setKeySection("FLAG_CAN_ADD_UNKNOWN_ITEMS")); .setKeySection("FLAG_CAN_ADD_UNKNOWN_ITEMS"));
stbGestSetupList.add(new StbGestSetup()
.setGestName("PICKING")
.setSection("INVENTARIO")
.setKeySection("FLAG_SHOULD_ASK_TO_CREATE_OR_UPDATE_ROW"));
String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
mGestSetupRESTConsumer.getValues(codMdep, stbGestSetupList, list -> { mGestSetupRESTConsumer.getValues(codMdep, stbGestSetupList, list -> {
@ -398,6 +402,7 @@ public class SettingsManager {
dbSettingsModelIstance.setGroupShippingByCommodityGroup(getValueFromList(list, "SPEDIZIONE", "FLAG_GROUP_BY_GRP_MERC", Boolean.class, Boolean.FALSE)); 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.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.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));
String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class); String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
if (notePerdita != null) if (notePerdita != null)
@ -435,7 +440,7 @@ public class SettingsManager {
} else if (clazz == Integer.class && value.getValue() != null) { } else if (clazz == Integer.class && value.getValue() != null) {
return clazz.cast(Integer.parseInt(value.getValue())); return clazz.cast(Integer.parseInt(value.getValue()));
} }
} else { } else if(defaultValue == null) {
if (clazz == Boolean.class) { if (clazz == Boolean.class) {
return clazz.cast(Boolean.FALSE); return clazz.cast(Boolean.FALSE);
} else if (clazz == Integer.class) { } else if (clazz == Integer.class) {

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

@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; 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.IScrollableFragment;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO; 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.databinding.FragmentDocInterniBinding;
import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO;
import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoView; import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoView;
@ -125,26 +123,7 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment,
@Override @Override
public void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection) { public void onDocDetailsChanged(DialogSelectDocInfoResponseDTO selection) {
mViewModel.setSelectedDocDetails(selection); mViewModel.setSelectedDocDetails(selection);
mBinding.invalidateAll();
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);
}
} }
@Override @Override

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

@ -35,14 +35,14 @@ public class DocInterniViewModel {
private boolean docsFetched = true; private boolean docsFetched = true;
private int nextNumCollo = 0; private int nextNumCollo = 0;
private List<DocumentoArtDTO> availableArts; private List<DocumentoArtDTO> availableArts;
private MutableLiveData<List<DocInternoWrapper>> mDocsList = new MutableLiveData<>(); private final MutableLiveData<List<DocInternoWrapper>> mDocsList = new MutableLiveData<>();
public final MutableLiveData<TipoDocDTO> dtbTipi = new MutableLiveData<>(); public TipoDocDTO dtbTipi;
public final MutableLiveData<GruppoArticoloDTO> mtbGrup = new MutableLiveData<>(); public GruppoArticoloDTO mtbGrup;
public final MutableLiveData<FornitoreDTO> fornitore = new MutableLiveData<>(); public FornitoreDTO fornitore;
public final MutableLiveData<Date> dataDoc = new MutableLiveData<>(); public Date dataDoc;
public final MutableLiveData<String> numDoc = new MutableLiveData<>(); public String numDoc;
public final MutableLiveData<String> note = new MutableLiveData<>(); public String note;
public final BindableInteger artsSize = new BindableInteger(0); public final BindableInteger artsSize = new BindableInteger(0);
@Inject @Inject
@ -86,13 +86,13 @@ public class DocInterniViewModel {
} }
public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection) { public void setSelectedDocDetails(DialogSelectDocInfoResponseDTO selection) {
this.fornitore.postValue(selection.getFornitore()); this.fornitore = selection.getFornitore();
this.dtbTipi.postValue(selection.getTipoDoc()); this.dtbTipi = selection.getTipoDoc();
this.mtbGrup.postValue(selection.getGruppoArt()); this.mtbGrup = selection.getGruppoArt();
this.dataDoc.postValue(selection.getDataDoc()); this.dataDoc = selection.getDataDoc();
this.numDoc.postValue(selection.getNumDoc() != null ? selection.getNumDoc().toString() : null); this.numDoc = selection.getNumDoc() != null ? selection.getNumDoc().toString() : null;
this.note.postValue(selection.getNote()); this.note = selection.getNote();
this.sendOnLoadingStarted(); this.sendOnLoadingStarted();
fetchProducts(() -> { fetchProducts(() -> {
@ -118,7 +118,7 @@ public class DocInterniViewModel {
String codAnag = null; String codAnag = null;
String codVdes = null; String codVdes = null;
FornitoreDTO fornitore = this.fornitore.getValue(); FornitoreDTO fornitore = this.fornitore;
if (fornitore != null) { if (fornitore != null) {
codAnag = fornitore.getCodAnag(); codAnag = fornitore.getCodAnag();
codVdes = fornitore.getCodVdes(); codVdes = fornitore.getCodVdes();
@ -126,7 +126,7 @@ public class DocInterniViewModel {
var docsList = documentRepository.getDocuments(this.getCodDtip(), var docsList = documentRepository.getDocuments(this.getCodDtip(),
codAnag, codVdes, dataDoc.getValue(), numDoc.getValue()); codAnag, codVdes, dataDoc, numDoc);
docsList.observeForever(data -> { docsList.observeForever(data -> {
this.mDocsList.postValue(data); this.mDocsList.postValue(data);
@ -145,31 +145,28 @@ public class DocInterniViewModel {
} }
private String getCodDtip() { private String getCodDtip() {
if (this.dtbTipi.getValue() == null) { if (this.dtbTipi == null) {
return null; return null;
} }
return this.dtbTipi.getValue().getCodDtip(); return this.dtbTipi.getCodDtip();
} }
public TipoDocDTO getTipoDoc() { public TipoDocDTO getTipoDoc() {
if (this.dtbTipi.getValue() == null) { return this.dtbTipi;
return null;
}
return this.dtbTipi.getValue();
} }
private String getCodMgrp() { private String getCodMgrp() {
if (this.mtbGrup.getValue() == null) { if (this.mtbGrup == null) {
return null; return null;
} }
return this.mtbGrup.getValue().getCodMgrp(); return this.mtbGrup.getCodMgrp();
} }
private String getCodAnagForn() { private String getCodAnagForn() {
if (this.fornitore.getValue() == null) { if (this.fornitore == null) {
return null; return null;
} }
return this.fornitore.getValue().getCodAnag(); return this.fornitore.getCodAnag();
} }
public void editDocument(SqlMtbColt document) { public void editDocument(SqlMtbColt document) {
@ -178,7 +175,7 @@ public class DocInterniViewModel {
public void newDocument() { public void newDocument() {
SqlMtbColt document = new SqlMtbColt(); SqlMtbColt document = new SqlMtbColt();
if (this.dtbTipi.getValue() == null) { if (this.dtbTipi == null) {
this.sendError(new NoDocTypeSelectedException()); this.sendError(new NoDocTypeSelectedException());
return; return;
} }
@ -186,18 +183,18 @@ public class DocInterniViewModel {
document.setCodMgrp(this.getCodMgrp()); document.setCodMgrp(this.getCodMgrp());
document.setDataCollo(new Date()); document.setDataCollo(new Date());
document.setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep()); document.setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
document.setAnnotazioni(this.note.getValue()); document.setAnnotazioni(this.note);
document.setSegno(-1); document.setSegno(-1);
document.setSerCollo("/"); document.setSerCollo("/");
document.setNumCollo(this.nextNumCollo); document.setNumCollo(this.nextNumCollo);
document.setGestione("L"); document.setGestione("L");
document.setDataDoc(this.dataDoc.getValue()); document.setDataDoc(this.dataDoc);
if (this.numDoc.getValue() != null) { if (this.numDoc != null) {
document.setNumDoc(Integer.parseInt(this.numDoc.getValue())); document.setNumDoc(Integer.parseInt(this.numDoc));
} }
if (this.fornitore.getValue() != null) { if (this.fornitore != null) {
document.setCodAnag(this.fornitore.getValue().getCodAnag()); document.setCodAnag(this.fornitore.getCodAnag());
document.setCodVdes(this.fornitore.getValue().getCodVdes()); document.setCodVdes(this.fornitore.getCodVdes());
} }
documentRepository.insert(document, id -> { documentRepository.insert(document, id -> {
document.setId(id); document.setId(id);
@ -206,7 +203,7 @@ public class DocInterniViewModel {
} }
public boolean hasDocDetails() { public boolean hasDocDetails() {
return this.dtbTipi.getValue() != null; return this.dtbTipi != null;
} }
public interface Listener extends ILoadingListener { public interface Listener extends ILoadingListener {

7
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
View File

@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -130,7 +129,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
if (document.getCodAnag() != null) { if (document.getCodAnag() != null) {
this.codAnag.set(document.getCodAnag() + (document.getCodVdes() != null ? " - " + document.getCodVdes() : "")); this.codAnag.set(document.getCodAnag() + (document.getCodVdes() != null ? " - " + document.getCodVdes() : ""));
} else { } else {
this.binding.supplierLayout.setVisibility(View.GONE); this.codAnag.set(null);
} }
this.documentHeader.set(String.format(this.getString(R.string.doc_interni_doc_header), document.getId(), document.getCodDtipProvv())); this.documentHeader.set(String.format(this.getString(R.string.doc_interni_doc_header), document.getId(), document.getCodDtipProvv()));
@ -138,7 +137,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
if (document.getNumDoc() != null && document.getDataDoc() != null) { if (document.getNumDoc() != null && document.getDataDoc() != null) {
this.documentRifHeader.set(String.format(this.getString(R.string.doc_testata), document.getNumDoc().toString(), UtilityDate.formatDate(document.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN))); this.documentRifHeader.set(String.format(this.getString(R.string.doc_testata), document.getNumDoc().toString(), UtilityDate.formatDate(document.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
} else { } else {
this.binding.docRifLayout.setVisibility(View.GONE); this.documentRifHeader.set(null);
} }
} }
@ -186,7 +185,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
"Ricerca articolo", "Ricerca articolo",
null, null,
"Cod articolo / Barcode", "Cod articolo / Barcode",
barcodeProd -> this.viewModel.loadArticoloByCodMart(barcodeProd), BarcodeManager::enable).show(); barcodeProd -> this.viewModel.loadArticoloByCodMartOrBarcode(barcodeProd), BarcodeManager::enable).show();
} }

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

@ -9,7 +9,6 @@ import org.json.JSONObject;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
@ -37,17 +36,17 @@ import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQua
public class DocInterniEditFormViewModel { public class DocInterniEditFormViewModel {
@Inject private final MtbColrDataSource mtbColrRepository;
MtbColrDataSource mtbColrRepository; private final MtbColtRepository mtbColtRepository;
@Inject
MtbColtRepository mtbColtRepository;
private final DocInterniRESTConsumer docInterniRESTConsumer; private final DocInterniRESTConsumer docInterniRESTConsumer;
private DocInterniEditFormViewModel.Listener listener; private Listener listener;
private List<DocumentoArtDTO> productsList; private List<DocumentoArtDTO> productsList;
private HashMap<String, String> flattedBarcodesCodMarts;
private TipoDocDTO tipoDoc; private TipoDocDTO tipoDoc;
private boolean isCheckPartitaMag = false; private boolean isCheckPartitaMag = false;
private JSONObject checkFornitoreRules = null; private JSONObject checkFornitoreRules = null;
public MutableLiveData<SqlMtbColt> document = new MutableLiveData<>(); public MutableLiveData<SqlMtbColt> document = new MutableLiveData<>();
public MutableLiveData<List<SqlMtbColr>> docRows = new MutableLiveData<>(); public MutableLiveData<List<SqlMtbColr>> docRows = new MutableLiveData<>();
@ -129,9 +128,10 @@ public class DocInterniEditFormViewModel {
this.listener.onDocumentHoldRequest(); this.listener.onDocumentHoldRequest();
} }
public void loadArticoloByCodMart(String codMart) { public void loadArticoloByCodMartOrBarcode(String codMart) {
var matchedArt = Stream.of(productsList) var matchedArt = Stream.of(productsList)
.filter(x -> x.getCodMart().equalsIgnoreCase(codMart)) .filter(x -> x.getCodMart().equalsIgnoreCase(codMart) ||
x.getBarcode().contains(codMart))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
@ -298,13 +298,6 @@ public class DocInterniEditFormViewModel {
public void setProductsList(List<DocumentoArtDTO> productsList) { public void setProductsList(List<DocumentoArtDTO> productsList) {
this.productsList = 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) { public void processBarcode(BarcodeScanDTO dto) {
@ -312,10 +305,7 @@ public class DocInterniEditFormViewModel {
} }
public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) { public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) {
if(UtilityBarcode.isCode128(barcodeScanDTO)) { if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
this.loadArticoloByCodMart(barcodeScanDTO.getStringValue());
} else if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
//Cerco tramite etichetta ean peso //Cerco tramite etichetta ean peso
this.executeEtichettaEanPeso(barcodeScanDTO); this.executeEtichettaEanPeso(barcodeScanDTO);

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

@ -36,6 +36,8 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.databinding.ActivityPickingInventarioBinding; import it.integry.integrywmsnative.databinding.ActivityPickingInventarioBinding;
import it.integry.integrywmsnative.databinding.ActivityPickingInventarioListItemBinding; 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.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsView;
import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
@ -99,7 +101,8 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn
mViewModel.init( mViewModel.init(
DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO)), DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO)),
DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO_ARTS)), DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO_ARTS)),
SettingsManager.iDB().isFlagCanAddUnknownItemsInventario()); SettingsManager.iDB().isFlagCanAddUnknownItemsInventario(),
SettingsManager.iDB().isFlagShouldAskToCreateOrUpdateRowInventario());
initToolbar(); initToolbar();
initBarcodeReader(); initBarcodeReader();
@ -236,6 +239,36 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn
.show(getSupportFragmentManager(), "tag"); .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() { public void showAvailableArts() {
var listaMtbAart = Stream.of(this.mViewModel.getAvailableArts()) var listaMtbAart = Stream.of(this.mViewModel.getAvailableArts())
.map(InventarioArtDTO::toMtbAart) .map(InventarioArtDTO::toMtbAart)

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

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

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

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

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

@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.CommonConst;
import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback; import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
import it.integry.integrywmsnative.core.expansion.OnSingleClickListener; import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
import it.integry.integrywmsnative.core.expansion.RunnableArgsss; 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.freeQty.setVisibility(View.GONE);
} }
holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa())); int cifreDec = CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS;
holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot())); 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.setText(pickingObjectDTO.getUntMis());
holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE); holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE);

9
app/src/main/res/drawable/ic_document_outline.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="96dp"
android:height="96dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M6,2C4.906,2 4,2.906 4,4L4,20C4,21.094 4.906,22 6,22L18,22C19.094,22 20,21.094 20,20L20,8L14,2L6,2zM6,4L13,4L13,9L18,9L18,20L6,20L6,4zM8,12L8,14L16,14L16,12L8,12zM8,16L8,18L16,18L16,16L8,16z"
android:fillColor="#5B5B5B"/>
</vector>

9
app/src/main/res/drawable/ic_documents_outline.xml Normal file
View File

@ -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>

242
app/src/main/res/layout/activity_contab_doc_interni_edit.xml
View File

@ -71,136 +71,158 @@
</it.integry.integrywmsnative.ui.ElevatedToolbar> </it.integry.integrywmsnative.ui.ElevatedToolbar>
<RelativeLayout <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_margin="12dp"
android:layout_marginRight="8dp" app:cardCornerRadius="16dp"
android:background="@drawable/gray_detail_background_round16" app:cardElevation="4dp">
android:padding="16dp">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:background="@color/colorPrimary"
android:layout_toStartOf="@id/info_arts_button" android:orientation="horizontal"
android:layout_alignParentStart="true"> android:padding="16dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatImageView
style="@style/AppTheme.NewMaterial.Text.Small" android:layout_width="30dp"
android:layout_width="wrap_content" android:layout_height="30dp"
android:layout_height="wrap_content" android:layout_gravity="center_vertical"
android:text="@string/document_label" android:layout_marginEnd="16dp"
android:textColor="@android:color/black" android:adjustViewBounds="true"
android:textSize="16sp" /> android:src="@drawable/ic_document_outline"
android:tint="@color/white" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/order_identifier"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold"
app:binding="@{view.documentHeader}"
tools:text="#documentId" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/doc_rif_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/document_rif_label"
android:textColor="@android:color/black"
android:textSize="16sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/document_rif"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold"
app:binding="@{view.documentRifHeader}"
tools:text="#documentId" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/supplier_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fornitore"
android:textColor="@android:color/black" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/cod_anag"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:textColor="@android:color/black"
android:textStyle="italic"
app:binding="@{view.codAnag}"
tools:text="F000 - 01" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:orientation="vertical">
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView <RelativeLayout
style="@style/AppTheme.NewMaterial.Text.Small" android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_marginTop="2dp"
android:layout_toStartOf="@id/loaded_arts_info_layout"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:binding="@{view.documentHeader}"
android:textColor="@android:color/white"
tools:text="670" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/loaded_arts_info_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:orientation="horizontal"
app:singleClick="@{() -> view.showInfoArtDialog()}">
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{String.valueOf(viewModel.productsList.size())}"
tools:text="10250" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="articoli" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:src="@drawable/ic_black_barcode_scanner"
android:tint="@color/white" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/prod_count" android:layout_marginTop="2dp"
android:textColor="@android:color/black" /> android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/count_art_ord" style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
style="@style/AppTheme.NewMaterial.Text.Small" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Rif:" />
<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="Non definito"
android:textStyle="italic"
app:visibility="@{view.documentRifHeader.get().empty}" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
app:binding="@{view.documentRifHeader}"
app:reverse_visibility="@{view.documentRifHeader.get().empty}" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginTop="2dp"
android:textColor="@android:color/black" android:orientation="horizontal">
android:textStyle="bold"
app:binding="@{view.prodsCount}" <androidx.appcompat.widget.AppCompatTextView
tools:text="10" /> style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Fornitore:" />
<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="Non definito"
android:textStyle="italic"
app:visibility="@{view.codAnag.get().empty}" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
app:binding="@{view.codAnag}"
app:reverse_visibility="@{view.codAnag.get().empty}" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.cardview.widget.CardView>
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/info_arts_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_information_outline_24dp"
app:singleClick="@{() -> view.showInfoArtDialog()}" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/document_rows_list" android:id="@+id/document_rows_list"
@ -209,7 +231,9 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="92dp" android:layout_marginBottom="92dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp" /> android:paddingEnd="2dp"
tools:itemCount="5"
tools:listitem="@layout/activity_contab_doc_interno_row__list_single_item" />
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/scan_art_spinner" android:id="@+id/scan_art_spinner"

259
app/src/main/res/layout/fragment_doc_interni.xml
View File

@ -6,6 +6,10 @@
<data> <data>
<import type="androidx.databinding.ObservableList" /> <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 <variable
name="view" name="view"
@ -31,216 +35,203 @@
android:background="@color/full_white" android:background="@color/full_white"
android:orientation="vertical"> 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:background="@color/colorPrimary"
android:layout_marginRight="8dp" android:orientation="horizontal"
android:background="@drawable/gray_detail_background_round16"
android:layout_gravity="center_vertical"
android:padding="16dp"> 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 <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:text="Tipo doc:" />
android:text="@string/cod_dtip_name"
android:textColor="@android:color/black"
android:textSize="16sp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/cod_dtip" style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:text="@{viewModel.dtbTipi.codDtip}"
android:textColor="@android:color/black" app:reverse_visibility="@{viewModel.dtbTipi.codDtip.empty}"
android:textSize="16sp"
android:textStyle="bold"
tools:text="114" /> tools:text="114" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/desc_tipo_doc" style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="@{viewModel.dtbTipi.descrizione}" android:text="@{viewModel.dtbTipi.descrizione}"
android:textColor="@android:color/black" app:reverse_visibility="@{viewModel.dtbTipi.codDtip.empty}"
android:textSize="16sp"
android:textStyle="bold"
tools:text="PERDITA" /> tools:text="PERDITA" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/cod_anag_container" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:text="Fornitore:" />
android:text="@string/cod_anag_name"
android:textColor="@android:color/black"
android:textSize="16sp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/cod_anag" style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:layout_marginStart="4dp"
android:maxLines="1"
android:text="@{viewModel.fornitore.label}" android:text="@{viewModel.fornitore.label}"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold"
tools:text="F0000 - CARELLI" /> 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>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:text="Documento:" />
android:text="@string/articoli_disponibili"
android:textColor="@android:color/black"
android:textSize="14sp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/count_arts" style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/black" android:layout_marginStart="4dp"
android:textSize="14sp" android:text="@{Html.fromHtml(context.getString(R.string.doc_testata, viewModel.numDoc, UtilityDate.formatDate(viewModel.dataDoc, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}"
android:textStyle="bold" tools:text="n. 123 del 29/03/2023" />
app:binding="@{viewModel.artsSize}"
tools:text="0" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</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_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 <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/doc_interni_main_list" android:id="@+id/doc_interni_empty_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="16dp" android:alpha="0.3">
android:background="@color/full_white"
android:paddingStart="2dp"
android:paddingEnd="2dp" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.Guideline
android:id="@+id/doc_interni_empty_view" android:id="@+id/guideline_empty_top"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:alpha="0.3"> android:orientation="horizontal"
app:layout_constraintGuide_percent="0.2" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_empty_top" android:id="@+id/guideline_empty_left"
android:layout_width="wrap_content" 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:layout_height="wrap_content"
android:orientation="horizontal" android:adjustViewBounds="true"
app:layout_constraintGuide_percent="0.2" /> android:src="@drawable/ic_playlist_add_check_24dp" />
<androidx.constraintlayout.widget.Guideline <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/guideline_empty_left"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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: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" </androidx.constraintlayout.widget.ConstraintLayout>
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>
</RelativeLayout> </RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>