diff --git a/.idea/fileTemplates/Android Dialog.java b/.idea/fileTemplates/Android Dialog.java
index 910c9533..452a0f27 100644
--- a/.idea/fileTemplates/Android Dialog.java
+++ b/.idea/fileTemplates/Android Dialog.java
@@ -84,6 +84,11 @@ Create the following layout resource file [dialog_${dashName}.xml]
private Dialog${NAME}View() {
super();
+
+ MainApplication.appComponent
+ .dialog${NAME}Component()
+ .create()
+ .inject(this);
}
@@ -105,10 +110,6 @@ Create the following layout resource file [dialog_${dashName}.xml]
[b] into interface body
Dialog${NAME}Component.Factory dialog${NAME}Component();
*/
- MainApplication.appComponent
- .dialog${NAME}Component()
- .create()
- .inject(this);
setCancelable(false);
diff --git a/app/build.gradle b/app/build.gradle
index 13e15917..3d9d3a2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
- def appVersionCode = 431
- def appVersionName = '1.40.14'
+ def appVersionCode = 433
+ def appVersionName = '1.40.16'
signingConfigs {
release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 57b819d7..f5a45a2e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,31 +33,25 @@
android:requestLegacyExternalStorage="true">
@@ -68,28 +62,23 @@
+ android:screenOrientation="portrait" />
(observableBigDecimal, watcher));
view.addTextChangedListener(watcher);
}
+
BigDecimal newValue = observableBigDecimal.get();
- BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
+ BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
view.setText(UtilityNumber.decimalToString(newValue));
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
index 80f9adfd..34c53671 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
+import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -19,7 +20,7 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
-public class BaseDialogFragment extends DialogFragment implements DialogInterface.OnShowListener {
+public abstract class BaseDialogFragment extends DialogFragment implements DialogInterface.OnShowListener {
@Inject
public DialogProgressView mCurrentProgress;
@@ -111,7 +112,14 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac
@Override
public void onShow(DialogInterface dialogInterface) {
+ getDialog().getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
+
this.initialize();
+ this.onInit(dialogInterface);
+ }
+
+ public void onInit(DialogInterface dialogInterface) {
+
}
private void initialize() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java
index 0b078f69..990a1d02 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java
@@ -1,5 +1,7 @@
package it.integry.integrywmsnative.core.model;
+import com.google.gson.annotations.SerializedName;
+
import java.math.BigDecimal;
public class MtbTCol {
@@ -13,7 +15,7 @@ public class MtbTCol {
private BigDecimal taraKg;
private String descrizione;
private String codMart;
- private String flagUIUL;
+ private FlagUiUlEnum flagUIUL;
private String circuito;
public String getCodTcol() {
@@ -88,13 +90,12 @@ public class MtbTCol {
return this;
}
- public String getFlagUIUL() {
+ public FlagUiUlEnum getFlagUIUL() {
return flagUIUL;
}
- public MtbTCol setFlagUIUL(String flagUIUL) {
+ public void setFlagUIUL(FlagUiUlEnum flagUIUL) {
this.flagUIUL = flagUIUL;
- return this;
}
public String getCircuito() {
@@ -107,4 +108,29 @@ public class MtbTCol {
}
+ public enum FlagUiUlEnum {
+ @SerializedName("UI")
+ UI("UI"),
+
+ @SerializedName("UL")
+ UL("UL");
+
+ private final String text;
+ FlagUiUlEnum(String text) {
+ this.text = text;
+ }
+
+
+ public String getText() {
+ return this.text;
+ }
+
+ public static FlagUiUlEnum fromString(String text) {
+ for (FlagUiUlEnum b : FlagUiUlEnum.values()) {
+ if (b.text.equalsIgnoreCase(text)) return b;
+ }
+ return null;
+ }
+ }
+
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java
new file mode 100644
index 00000000..026ee993
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java
@@ -0,0 +1,95 @@
+package it.integry.integrywmsnative.core.model;
+
+import android.os.Parcelable;
+
+import java.math.BigDecimal;
+
+public class VtbVetr extends EntityBase {
+
+ public VtbVetr() {
+ type = "vtb_vetr";
+ }
+
+ private String codVvet;
+ private String codSpes;
+ private String idRiga;
+ private BigDecimal daQta;
+ private BigDecimal aQta;
+ private BigDecimal impUnt;
+ private BigDecimal impFisso;
+ private String codDivi;
+
+ public String getCodVvet() {
+ return codVvet;
+ }
+
+ public VtbVetr setCodVvet(String codVvet) {
+ this.codVvet = codVvet;
+ return this;
+ }
+
+ public String getCodSpes() {
+ return codSpes;
+ }
+
+ public VtbVetr setCodSpes(String codSpes) {
+ this.codSpes = codSpes;
+ return this;
+ }
+
+ public String getIdRiga() {
+ return idRiga;
+ }
+
+ public VtbVetr setIdRiga(String idRiga) {
+ this.idRiga = idRiga;
+ return this;
+ }
+
+ public BigDecimal getDaQta() {
+ return daQta;
+ }
+
+ public VtbVetr setDaQta(BigDecimal daQta) {
+ this.daQta = daQta;
+ return this;
+ }
+
+ public BigDecimal getaQta() {
+ return aQta;
+ }
+
+ public VtbVetr setaQta(BigDecimal aQta) {
+ this.aQta = aQta;
+ return this;
+ }
+
+ public BigDecimal getImpUnt() {
+ return impUnt;
+ }
+
+ public VtbVetr setImpUnt(BigDecimal impUnt) {
+ this.impUnt = impUnt;
+ return this;
+ }
+
+ public BigDecimal getImpFisso() {
+ return impFisso;
+ }
+
+ public VtbVetr setImpFisso(BigDecimal impFisso) {
+ this.impFisso = impFisso;
+ return this;
+ }
+
+ public String getCodDivi() {
+ return codDivi;
+ }
+
+ public VtbVetr setCodDivi(String codDivi) {
+ this.codDivi = codDivi;
+ return this;
+ }
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVett.java b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVett.java
new file mode 100644
index 00000000..2f30f8ef
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVett.java
@@ -0,0 +1,273 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class VtbVett extends EntityBase {
+
+ public VtbVett() {
+ type = "vtb_vett";
+ }
+
+ private String codVvet;
+ private String codLettVett;
+ private String codAnag;
+ private String ragSoc;
+ private String indirizzo;
+ private String cap;
+ private String citta;
+ private String prov;
+ private String nazione;
+ private String telefono;
+ private String fax;
+ private String partIva;
+ private String note;
+ private String eMail;
+ private String modStamp;
+ private BigDecimal coefVol;
+ private String flagAttivo;
+ private String numAutoriz;
+ private List vtbVetr;
+
+
+ public String getCodVvet() {
+ return codVvet;
+ }
+
+ public VtbVett setCodVvet(String codVvet) {
+ this.codVvet = codVvet;
+ return this;
+ }
+
+ public String getCodLettVett() {
+ return codLettVett;
+ }
+
+ public VtbVett setCodLettVett(String codLettVett) {
+ this.codLettVett = codLettVett;
+ return this;
+ }
+
+ public String getCodAnag() {
+ return codAnag;
+ }
+
+ public VtbVett setCodAnag(String codAnag) {
+ this.codAnag = codAnag;
+ return this;
+ }
+
+ public String getRagSoc() {
+ return ragSoc;
+ }
+
+ public VtbVett setRagSoc(String ragSoc) {
+ this.ragSoc = ragSoc;
+ return this;
+ }
+
+ public String getIndirizzo() {
+ return indirizzo;
+ }
+
+ public VtbVett setIndirizzo(String indirizzo) {
+ this.indirizzo = indirizzo;
+ return this;
+ }
+
+ public String getCap() {
+ return cap;
+ }
+
+ public VtbVett setCap(String cap) {
+ this.cap = cap;
+ return this;
+ }
+
+ public String getCitta() {
+ return citta;
+ }
+
+ public VtbVett setCitta(String citta) {
+ this.citta = citta;
+ return this;
+ }
+
+ public String getProv() {
+ return prov;
+ }
+
+ public VtbVett setProv(String prov) {
+ this.prov = prov;
+ return this;
+ }
+
+ public String getNazione() {
+ return nazione;
+ }
+
+ public VtbVett setNazione(String nazione) {
+ this.nazione = nazione;
+ return this;
+ }
+
+ public String getTelefono() {
+ return telefono;
+ }
+
+ public VtbVett setTelefono(String telefono) {
+ this.telefono = telefono;
+ return this;
+ }
+
+ public String getFax() {
+ return fax;
+ }
+
+ public VtbVett setFax(String fax) {
+ this.fax = fax;
+ return this;
+ }
+
+ public String getPartIva() {
+ return partIva;
+ }
+
+ public VtbVett setPartIva(String partIva) {
+ this.partIva = partIva;
+ return this;
+ }
+
+ public String getNote() {
+ return note;
+ }
+
+ public VtbVett setNote(String note) {
+ this.note = note;
+ return this;
+ }
+
+ public String geteMail() {
+ return eMail;
+ }
+
+ public VtbVett seteMail(String eMail) {
+ this.eMail = eMail;
+ return this;
+ }
+
+ public String getModStamp() {
+ return modStamp;
+ }
+
+ public VtbVett setModStamp(String modStamp) {
+ this.modStamp = modStamp;
+ return this;
+ }
+
+ public BigDecimal getCoefVol() {
+ return coefVol;
+ }
+
+ public VtbVett setCoefVol(BigDecimal coefVol) {
+ this.coefVol = coefVol;
+ return this;
+ }
+
+ public String getFlagAttivo() {
+ return flagAttivo;
+ }
+
+ public VtbVett setFlagAttivo(String flagAttivo) {
+ this.flagAttivo = flagAttivo;
+ return this;
+ }
+
+ public String getNumAutoriz() {
+ return numAutoriz;
+ }
+
+ public VtbVett setNumAutoriz(String numAutoriz) {
+ this.numAutoriz = numAutoriz;
+ return this;
+ }
+
+ public List getVtbVetr() {
+ return vtbVetr;
+ }
+
+ public VtbVett setVtbVetr(List vtbVetr) {
+ this.vtbVetr = vtbVetr;
+ return this;
+ }
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ VtbVett vtbVett = (VtbVett) o;
+
+ if (!getCodVvet().equals(vtbVett.getCodVvet())) return false;
+ if (getCodLettVett() != null ? !getCodLettVett().equals(vtbVett.getCodLettVett()) : vtbVett.getCodLettVett() != null)
+ return false;
+ if (getCodAnag() != null ? !getCodAnag().equals(vtbVett.getCodAnag()) : vtbVett.getCodAnag() != null)
+ return false;
+ if (getRagSoc() != null ? !getRagSoc().equals(vtbVett.getRagSoc()) : vtbVett.getRagSoc() != null)
+ return false;
+ if (getIndirizzo() != null ? !getIndirizzo().equals(vtbVett.getIndirizzo()) : vtbVett.getIndirizzo() != null)
+ return false;
+ if (getCap() != null ? !getCap().equals(vtbVett.getCap()) : vtbVett.getCap() != null)
+ return false;
+ if (getCitta() != null ? !getCitta().equals(vtbVett.getCitta()) : vtbVett.getCitta() != null)
+ return false;
+ if (getProv() != null ? !getProv().equals(vtbVett.getProv()) : vtbVett.getProv() != null)
+ return false;
+ if (getNazione() != null ? !getNazione().equals(vtbVett.getNazione()) : vtbVett.getNazione() != null)
+ return false;
+ if (getTelefono() != null ? !getTelefono().equals(vtbVett.getTelefono()) : vtbVett.getTelefono() != null)
+ return false;
+ if (getFax() != null ? !getFax().equals(vtbVett.getFax()) : vtbVett.getFax() != null)
+ return false;
+ if (getPartIva() != null ? !getPartIva().equals(vtbVett.getPartIva()) : vtbVett.getPartIva() != null)
+ return false;
+ if (getNote() != null ? !getNote().equals(vtbVett.getNote()) : vtbVett.getNote() != null)
+ return false;
+ if (geteMail() != null ? !geteMail().equals(vtbVett.geteMail()) : vtbVett.geteMail() != null)
+ return false;
+ if (getModStamp() != null ? !getModStamp().equals(vtbVett.getModStamp()) : vtbVett.getModStamp() != null)
+ return false;
+ if (getCoefVol() != null ? !getCoefVol().equals(vtbVett.getCoefVol()) : vtbVett.getCoefVol() != null)
+ return false;
+ if (getFlagAttivo() != null ? !getFlagAttivo().equals(vtbVett.getFlagAttivo()) : vtbVett.getFlagAttivo() != null)
+ return false;
+ if (getNumAutoriz() != null ? !getNumAutoriz().equals(vtbVett.getNumAutoriz()) : vtbVett.getNumAutoriz() != null)
+ return false;
+ return getVtbVetr() != null ? getVtbVetr().equals(vtbVett.getVtbVetr()) : vtbVett.getVtbVetr() == null;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getCodVvet().hashCode();
+ result = 31 * result + (getCodLettVett() != null ? getCodLettVett().hashCode() : 0);
+ result = 31 * result + (getCodAnag() != null ? getCodAnag().hashCode() : 0);
+ result = 31 * result + (getRagSoc() != null ? getRagSoc().hashCode() : 0);
+ result = 31 * result + (getIndirizzo() != null ? getIndirizzo().hashCode() : 0);
+ result = 31 * result + (getCap() != null ? getCap().hashCode() : 0);
+ result = 31 * result + (getCitta() != null ? getCitta().hashCode() : 0);
+ result = 31 * result + (getProv() != null ? getProv().hashCode() : 0);
+ result = 31 * result + (getNazione() != null ? getNazione().hashCode() : 0);
+ result = 31 * result + (getTelefono() != null ? getTelefono().hashCode() : 0);
+ result = 31 * result + (getFax() != null ? getFax().hashCode() : 0);
+ result = 31 * result + (getPartIva() != null ? getPartIva().hashCode() : 0);
+ result = 31 * result + (getNote() != null ? getNote().hashCode() : 0);
+ result = 31 * result + (geteMail() != null ? geteMail().hashCode() : 0);
+ result = 31 * result + (getModStamp() != null ? getModStamp().hashCode() : 0);
+ result = 31 * result + (getCoefVol() != null ? getCoefVol().hashCode() : 0);
+ result = 31 * result + (getFlagAttivo() != null ? getFlagAttivo().hashCode() : 0);
+ result = 31 * result + (getNumAutoriz() != null ? getNumAutoriz().hashCode() : 0);
+ result = 31 * result + (getVtbVetr() != null ? getVtbVetr().hashCode() : 0);
+ return result;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
index cbc9a42d..2259ec57 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java
@@ -61,7 +61,11 @@ public class RESTBuilder {
Gson gson = UtilityGson.createObject();
- Retrofit retrofit = new Retrofit.Builder().addConverterFactory(GsonConverterFactory.create(gson)).baseUrl(endpoint).client(client).build();
+ Retrofit retrofit = new Retrofit.Builder()
+ .addConverterFactory(GsonConverterFactory.create(gson))
+ .baseUrl(endpoint)
+ .client(client)
+ .build();
return retrofit.create(service);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java
index acb51b71..0541f82c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java
@@ -25,11 +25,9 @@ import retrofit2.Response;
@Singleton
public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
- private final SystemRESTConsumer mSystemRESTConsumer;
private final ArticoloRESTConsumer mArticoloRESTConsumer;
- public GiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
- this.mSystemRESTConsumer = systemRESTConsumer;
+ public GiacenzaRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
this.mArticoloRESTConsumer = articoloRESTConsumer;
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
new file mode 100644
index 00000000..5c899ef4
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumer.java
@@ -0,0 +1,92 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraCaricoImballiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraScaricoImballiRequestDTO;
+import retrofit2.Response;
+
+@Singleton
+public class ImballiRESTConsumer extends _BaseRESTConsumer {
+
+ private final ExecutorService executorService;
+
+ public ImballiRESTConsumer(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
+
+
+ public List retrieveTipiColloSyncronized(MtbTCol.FlagUiUlEnum tipoImballo) throws Exception {
+ ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+ Response>> response = service.retrieveTipiCollo(tipoImballo)
+ .execute();
+
+ return analyzeAnswer(response, "retrieveTipiCollo");
+ }
+
+ public void retrieveTipiCollo(MtbTCol.FlagUiUlEnum tipoImballo, RunnableArgs> onComplete, RunnableArgs onFailed) {
+ executorService.execute(() -> {
+ try {
+ var response = retrieveTipiColloSyncronized(tipoImballo);
+ if (onComplete != null) onComplete.run(response);
+ } catch (Exception ex) {
+ if (onFailed != null) onFailed.run(ex);
+ }
+ });
+ }
+
+
+ public void registraCaricoSyncronized(String codAnag, List imballi) throws Exception {
+ ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+ Response> response = service.registraCarico(
+ new RegistraCaricoImballiRequestDTO()
+ .setCodAnag(codAnag)
+ .setUsedImballi(imballi))
+ .execute();
+
+ analyzeAnswer(response, "registraCarico");
+ }
+
+ public void registraCarico(String codAnag, List imballi, Runnable onComplete, RunnableArgs onFailed) {
+ executorService.execute(() -> {
+ try {
+ registraCaricoSyncronized(codAnag, imballi);
+ if (onComplete != null) onComplete.run();
+ } catch (Exception ex) {
+ if (onFailed != null) onFailed.run(ex);
+ }
+ });
+ }
+
+
+ public void registraScaricoSyncronized(String codVettore, List imballi) throws Exception {
+ ImballiRESTConsumerService service = RESTBuilder.getService(ImballiRESTConsumerService.class);
+ Response> response = service.registraScarico(
+ new RegistraScaricoImballiRequestDTO()
+ .setCodVettore(codVettore)
+ .setUsedImballi(imballi))
+ .execute();
+
+ analyzeAnswer(response, "registraScarico");
+ }
+
+ public void registraScarico(String idVettore, List imballi, Runnable onComplete, RunnableArgs onFailed) {
+ executorService.execute(() -> {
+ try {
+ registraScaricoSyncronized(idVettore, imballi);
+ if (onComplete != null) onComplete.run();
+ } catch (Exception ex) {
+ if (onFailed != null) onFailed.run(ex);
+ }
+ });
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java
new file mode 100644
index 00000000..5b88224b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ImballiRESTConsumerService.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraCaricoImballiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.RegistraScaricoImballiRequestDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+
+public interface ImballiRESTConsumerService {
+
+
+ @GET("wms/imballi/retrieve/{tipo}")
+ Call>> retrieveTipiCollo(@Path("tipo") MtbTCol.FlagUiUlEnum tipo);
+
+ @POST("wms/imballi/registraCarico")
+ Call> registraCarico(@Body RegistraCaricoImballiRequestDTO registraCaricoImballiRequest);
+
+ @POST("wms/imballi/registraScarico")
+ Call> registraScarico(@Body RegistraScaricoImballiRequestDTO registraScaricoImballiRequest);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
index 2383218f..af1b4f46 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java
@@ -1,19 +1,11 @@
package it.integry.integrywmsnative.core.rest.consumers;
-import androidx.annotation.NonNull;
-
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.concurrent.ExecutorService;
import javax.inject.Singleton;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.DtbOrdt;
import it.integry.integrywmsnative.core.model.MtbPartitaMag;
-import it.integry.integrywmsnative.core.model.MtbTCol;
import it.integry.integrywmsnative.core.rest.RESTBuilder;
import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
@@ -24,56 +16,14 @@ import retrofit2.Response;
@Singleton
public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
+ private final ExecutorService executorService;
private final SystemRESTConsumer mSystemRESTConsumer;
- public MagazzinoRESTConsumer(SystemRESTConsumer mSystemRESTConsumer) {
+ public MagazzinoRESTConsumer(ExecutorService executorService, SystemRESTConsumer mSystemRESTConsumer) {
+ this.executorService = executorService;
this.mSystemRESTConsumer = mSystemRESTConsumer;
}
-
- public void getTipiCollo(RunnableArgs> onComplete, RunnableArgs onFailed) {
- String baseSql = "SELECT * " +
- "FROM mtb_tcol ";
-
- Type typeOfObjectsList = new TypeToken>() {
- }.getType();
-
- mSystemRESTConsumer.>processSql(baseSql, typeOfObjectsList, values -> {
- if (onComplete != null) {
- onComplete.run(values);
- }
- }, ex -> {
- if (onFailed != null) onFailed.run(ex);
- });
- }
-
-
- public void saveOrdine(SaveDTO saveDTO, RunnableArgs onComplete, RunnableArgs onFailed) {
- MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class, 240);
- service.saveOrdine(saveDTO)
- .enqueue(new Callback<>() {
- @Override
- public void onResponse(Call>> call, Response>> response) {
- if (response.body() != null && response.body().size() > 0) {
- analyzeListOfAnswers(response, "saveOrdine", dtoList -> {
- if (dtoList.size() > 0) {
- onComplete.run(dtoList.get(0));
- } else {
- onFailed.run(new Exception("Nessun ordine generato"));
- }
- }, onFailed);
- } else {
- onFailed.run(new Exception("Nessun ordine generato"));
- }
- }
-
- @Override
- public void onFailure(Call>> call, Throwable t) {
- onFailed.run(new Exception(t));
- }
- });
- }
-
public void saveTerminalinoWMS(SaveDTO saveDTO, Runnable onComplete, RunnableArgs onFailed) {
MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
service.saveTerminalinoWMS(saveDTO)
@@ -90,7 +40,8 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
});
}
- public MtbPartitaMag retrievePartitaMagSyncronized(String partitaMag, String codMart, RunnableArgs onFailed) throws Exception {
+
+ public MtbPartitaMag retrievePartitaMagSyncronized(String partitaMag, String codMart) throws Exception {
MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
Response> response = service.retrievePartitaMag(codMart, partitaMag)
.execute();
@@ -99,18 +50,13 @@ public class MagazzinoRESTConsumer extends _BaseRESTConsumer {
}
public void retrievePartitaMag(String partitaMag, String codMart, RunnableArgs onComplete, RunnableArgs onFailed) {
- MagazzinoRESTConsumerService service = RESTBuilder.getService(MagazzinoRESTConsumerService.class);
- service.retrievePartitaMag(codMart, partitaMag)
- .enqueue(new Callback<>() {
- @Override
- public void onResponse(@NonNull Call> call, @NonNull Response> response) {
- analyzeAnswer(response, "retrievePartitaMag", onComplete, onFailed);
- }
-
- @Override
- public void onFailure(@NonNull Call> call, @NonNull Throwable t) {
- onFailed.run(new Exception(t));
- }
- });
+ executorService.execute(() -> {
+ try {
+ var response = retrievePartitaMagSyncronized(partitaMag, codMart);
+ if (onComplete != null) onComplete.run(response);
+ } catch (Exception ex) {
+ if (onFailed != null) onFailed.run(ex);
+ }
+ });
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java
index f9075a85..2797ffee 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java
@@ -2,14 +2,15 @@ package it.integry.integrywmsnative.core.rest.consumers;
import java.util.List;
-import it.integry.integrywmsnative.core.model.DtbOrdt;
import it.integry.integrywmsnative.core.model.MtbPartitaMag;
+import it.integry.integrywmsnative.core.model.MtbTCol;
import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.POST;
+import retrofit2.http.Path;
import retrofit2.http.Query;
public interface MagazzinoRESTConsumerService {
@@ -17,11 +18,10 @@ public interface MagazzinoRESTConsumerService {
@POST("SM2SaveTerminalinoWMS")
Call> saveTerminalinoWMS(@Body SaveDTO saveDTO);
- @POST("SM2SaveTerminalino")
- Call>> saveOrdine(@Body SaveDTO saveDTO);
-
@GET("wms/partita-magazzino/retrievePartitaMag")
Call> retrievePartitaMag(@Query("codMart") String codMart,
@Query("partitaMag") String partitaMag);
+
+
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumer.java
new file mode 100644
index 00000000..b3fb1151
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumer.java
@@ -0,0 +1,44 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.VtbVett;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Response;
+
+@Singleton
+public class VettoriRESTConsumer extends _BaseRESTConsumer {
+
+ private final ExecutorService executorService;
+
+ public VettoriRESTConsumer(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
+
+
+ public List retrieveRecentlyUsedInOrdersSyncronized(GestioneEnum gestione) throws Exception {
+ var service = RESTBuilder.getService(VettoriRESTConsumerService.class);
+ Response>> response = service.retrieveRecentlyUsedInOrders(gestione)
+ .execute();
+
+ return analyzeAnswer(response, "retrieveRecentlyUsedInOrders");
+ }
+
+ public void retrieveRecentlyUsedInOrders(GestioneEnum gestione, RunnableArgs> onComplete, RunnableArgs onFailed) {
+ executorService.execute(() -> {
+ try {
+ var response = retrieveRecentlyUsedInOrdersSyncronized(gestione);
+ if (onComplete != null) onComplete.run(response);
+ } catch (Exception ex) {
+ if (onFailed != null) onFailed.run(ex);
+ }
+ });
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumerService.java
new file mode 100644
index 00000000..8d5639f0
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/VettoriRESTConsumerService.java
@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.VtbVett;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface VettoriRESTConsumerService {
+
+ @GET("wms/vettore/recentlyUsedInOrders")
+ Call>> retrieveRecentlyUsedInOrders(@Query("gestione") GestioneEnum gestioneEnum);
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbTcolFlagUiUlDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbTcolFlagUiUlDeserializer.java
new file mode 100644
index 00000000..c86545a6
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/MtbTcolFlagUiUlDeserializer.java
@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.core.rest.deserializer;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+import java.lang.reflect.Type;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class MtbTcolFlagUiUlDeserializer implements JsonDeserializer {
+ @Override
+ public MtbTCol.FlagUiUlEnum deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+ if (json.isJsonNull()) {
+ return null;
+ }
+
+ String text = json.getAsString();
+ return MtbTCol.FlagUiUlEnum.fromString(text);
+
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
index 98bcacec..daadfc14 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java
@@ -328,13 +328,13 @@ public class Ean128Model {
public String InternalPart;
///Informazioni interne
- public String Internal1;
+ public String Internal1; //Cod-Mart
///Informazioni interne
- public String Internal2;
+ public String Internal2; //IDLotto
///Informazioni interne
- public String Internal3;
+ public String Internal3; //Cod-Jfas
///Informazioni interne
public String Internal4;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/ImballoQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/ImballoQuantityDTO.java
new file mode 100644
index 00000000..9c51d167
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/ImballoQuantityDTO.java
@@ -0,0 +1,25 @@
+package it.integry.integrywmsnative.core.rest.model.imballi;
+
+public class ImballoQuantityDTO {
+
+ private String codMart;
+ private Integer qta;
+
+ public String getCodMart() {
+ return codMart;
+ }
+
+ public ImballoQuantityDTO setCodMart(String codMart) {
+ this.codMart = codMart;
+ return this;
+ }
+
+ public Integer getQta() {
+ return qta;
+ }
+
+ public ImballoQuantityDTO setQta(Integer qta) {
+ this.qta = qta;
+ return this;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/RegistraCaricoImballiRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/RegistraCaricoImballiRequestDTO.java
new file mode 100644
index 00000000..e268e4ad
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/RegistraCaricoImballiRequestDTO.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model.imballi;
+
+import java.util.List;
+
+public class RegistraCaricoImballiRequestDTO {
+
+ private String codAnag;
+ private List usedImballi;
+
+ public String getCodAnag() {
+ return codAnag;
+ }
+
+ public RegistraCaricoImballiRequestDTO setCodAnag(String codAnag) {
+ this.codAnag = codAnag;
+ return this;
+ }
+
+ public List getUsedImballi() {
+ return usedImballi;
+ }
+
+ public RegistraCaricoImballiRequestDTO setUsedImballi(List usedImballi) {
+ this.usedImballi = usedImballi;
+ return this;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/RegistraScaricoImballiRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/RegistraScaricoImballiRequestDTO.java
new file mode 100644
index 00000000..55104639
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/imballi/RegistraScaricoImballiRequestDTO.java
@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.rest.model.imballi;
+
+import java.util.List;
+
+public class RegistraScaricoImballiRequestDTO {
+
+ private String codVettore;
+ private List usedImballi;
+
+ public String getCodVettore() {
+ return codVettore;
+ }
+
+ public RegistraScaricoImballiRequestDTO setCodVettore(String codVettore) {
+ this.codVettore = codVettore;
+ return this;
+ }
+
+ public List getUsedImballi() {
+ return usedImballi;
+ }
+
+ public RegistraScaricoImballiRequestDTO setUsedImballi(List usedImballi) {
+ this.usedImballi = usedImballi;
+ return this;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CreateUDSRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CreateUDSRequestDTO.java
index f960809a..2e196794 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CreateUDSRequestDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CreateUDSRequestDTO.java
@@ -14,6 +14,7 @@ public class CreateUDSRequestDTO {
private String codAnag;
private String codVdes;
private String rifOrd;
+ private Integer idLotto;
private boolean orderRequired;
private List orders;
@@ -125,6 +126,14 @@ public class CreateUDSRequestDTO {
return this;
}
+ public Integer getIdLotto() {
+ return idLotto;
+ }
+
+ public CreateUDSRequestDTO setIdLotto(Integer idLotto) {
+ this.idLotto = idLotto;
+ return this;
+ }
public static class Causale {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/MtbTcolFlagUiUlSerializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/MtbTcolFlagUiUlSerializer.java
new file mode 100644
index 00000000..e22fd7c7
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/MtbTcolFlagUiUlSerializer.java
@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.rest.serializer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class MtbTcolFlagUiUlSerializer implements JsonSerializer {
+ @Override
+ public JsonElement serialize(MtbTCol.FlagUiUlEnum src, Type typeOfSrc, JsonSerializationContext context) {
+ return new JsonPrimitive(src.getText());
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index eeabce2d..0c1f0860 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -76,6 +76,9 @@ public class DBSettingsModel {
private boolean flagAccettazioneBollaUseQtaOrd = true;
private boolean flagWarningNewPartitaMag = false;
+ private boolean flagTracciamentoImballiCaricoEnabled = false;
+ private boolean flagTracciamentoImballiScaricoEnabled = false;
+
public boolean isFlagSpedizioneEnableFakeGiacenza() {
return flagSpedizioneEnableFakeGiacenza;
}
@@ -633,4 +636,22 @@ public class DBSettingsModel {
this.flagWarningNewPartitaMag = flagWarningNewPartitaMag;
return this;
}
+
+ public boolean isFlagTracciamentoImballiCaricoEnabled() {
+ return flagTracciamentoImballiCaricoEnabled;
+ }
+
+ public DBSettingsModel setFlagTracciamentoImballiCaricoEnabled(boolean flagTracciamentoImballiCaricoEnabled) {
+ this.flagTracciamentoImballiCaricoEnabled = flagTracciamentoImballiCaricoEnabled;
+ return this;
+ }
+
+ public boolean isFlagTracciamentoImballiScaricoEnabled() {
+ return flagTracciamentoImballiScaricoEnabled;
+ }
+
+ public DBSettingsModel setFlagTracciamentoImballiScaricoEnabled(boolean flagTracciamentoImballiScaricoEnabled) {
+ this.flagTracciamentoImballiScaricoEnabled = flagTracciamentoImballiScaricoEnabled;
+ return this;
+ }
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index edd9c725..bb2c9c7d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -24,6 +24,7 @@ import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO;
import it.integry.integrywmsnative.core.utility.UtilityFirebase;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.core.utility.UtilityString;
@Singleton
public class SettingsManager {
@@ -518,6 +519,22 @@ public class SettingsManager {
.setSetter(dbSettingsModelIstance::setFlagWarningNewPartitaMag)
.setDefaultValue(false));
+ stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+ .setGestName("PICKING")
+ .setSection("IMBALLI")
+ .setKeySection("COD_DTIP_CARICO")
+ .setSetter(data -> {
+ dbSettingsModelIstance.setFlagTracciamentoImballiCaricoEnabled(!UtilityString.isNullOrEmpty(data));
+ }));
+
+ stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
+ .setGestName("PICKING")
+ .setSection("IMBALLI")
+ .setKeySection("COD_DTIP_SCARICO")
+ .setSetter(data -> {
+ dbSettingsModelIstance.setFlagTracciamentoImballiScaricoEnabled(!UtilityString.isNullOrEmpty(data));
+ }));
+
String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java
index 66f5abb1..37dc03fa 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityGson.java
@@ -7,12 +7,15 @@ import java.lang.reflect.Modifier;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import it.integry.integrywmsnative.core.model.MtbTCol;
import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag;
import it.integry.integrywmsnative.core.rest.deserializer.LocalDateDeserializer;
import it.integry.integrywmsnative.core.rest.deserializer.LocalDateTimeDeserializer;
+import it.integry.integrywmsnative.core.rest.deserializer.MtbTcolFlagUiUlDeserializer;
import it.integry.integrywmsnative.core.rest.deserializer.StatoPartitaMagDeserializer;
import it.integry.integrywmsnative.core.rest.serializer.LocalDateSerializer;
import it.integry.integrywmsnative.core.rest.serializer.LocalDateTimeSerializer;
+import it.integry.integrywmsnative.core.rest.serializer.MtbTcolFlagUiUlSerializer;
import it.integry.integrywmsnative.core.rest.serializer.StatoPartitaMagSerializer;
public class UtilityGson {
@@ -27,6 +30,8 @@ public class UtilityGson {
.registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
.registerTypeAdapter(StatoPartitaMag.class, new StatoPartitaMagDeserializer())
.registerTypeAdapter(StatoPartitaMag.class, new StatoPartitaMagSerializer())
+ .registerTypeAdapter(MtbTCol.FlagUiUlEnum.class, new MtbTcolFlagUiUlDeserializer())
+ .registerTypeAdapter(MtbTCol.FlagUiUlEnum.class, new MtbTcolFlagUiUlSerializer())
.create();
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
index d726e2d4..3f549c78 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java
@@ -78,6 +78,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUView;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiView;
import it.integry.integrywmsnative.view.dialogs.versamento_automatico_ul_done.DialogVersamentoAutomaticoULDoneView;
public class AccettazioneOrdiniPickingActivity extends BaseActivity implements AccettazioneOrdiniPickingViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
@@ -151,28 +152,30 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
boolean useQtaOrd = SettingsManager.iDB().isFlagAccettazioneUseQtaOrd();
mViewModel.setListeners(this);
- mViewModel.init(
- mOrders,
- mSitArts,
- useQtaOrd);
+ mViewModel.init(mOrders, mSitArts, useQtaOrd);
}
private void initFab() {
- fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab,
- (Gravity.END | Gravity.BOTTOM),
- androidx.appcompat.R.attr.popupMenuStyle,
- com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
+ fabPopupMenu = new PopupMenu(this, this.mBindings.accettazioneOrdineInevasoFab, (Gravity.END | Gravity.BOTTOM), androidx.appcompat.R.attr.popupMenuStyle, com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
fabPopupMenu.setForceShowIcon(true);
fabPopupMenu.getMenuInflater().inflate(R.menu.accettazione_ordine_inevaso_fab_menu, fabPopupMenu.getMenu());
+ if (!SettingsManager.iDB().isFlagTracciamentoImballiCaricoEnabled())
+ fabPopupMenu.getMenu().removeItem(R.id.track_packaging);
+
fabPopupMenu.setOnMenuItemClickListener(item -> {
int itemId = item.getItemId();
if (itemId == R.id.show_created_ul) {
showCreatedUL();
+ return true;
+ } else if (itemId == R.id.track_packaging) {
+ trackPackaging();
+ return true;
} else if (itemId == R.id.create_ul) {
createNewLU();
+ return true;
}
return false;
@@ -192,17 +195,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
mAppliedFilterViewModel.getCurrentDescrPredicate().addOnPropertyChangedCallback(onPredicateChanged);
mAppliedFilterViewModel.getCurrentPosPredicate().addOnPropertyChangedCallback(onPredicateChanged);
- List filterList = Stream.of(AccettazioneOrdiniPickingBindings.AVAILABLE_FILTERS.entrySet())
- .map(Map.Entry::getValue)
- .sortBy(FilterChipDTO::getPosizione)
- .toList();
+ List filterList = Stream.of(AccettazioneOrdiniPickingBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
for (FilterChipDTO filterChipDTO : filterList) {
- FilterChipView filterChipView = new FilterChipView(
- this,
- filterChipDTO.getFilterChipText(),
- v -> initBottomSheetDialogFilter(filterChipDTO));
+ FilterChipView filterChipView = new FilterChipView(this, filterChipDTO.getFilterChipText(), v -> initBottomSheetDialogFilter(filterChipDTO));
switch (filterChipDTO.getID()) {
case AccettazioneOrdiniPickingBindings.COD_ART_FILTER_ID -> {
@@ -280,52 +277,20 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
private void initBottomSheetDialogFilter(FilterChipDTO filterChipDTO) {
- filterChipDTO
- .getFilterLayoutView()
- .setFilterName(filterChipDTO.getFilterChipText())
- .setContext(this);
+ filterChipDTO.getFilterLayoutView().setFilterName(filterChipDTO.getFilterChipText()).setContext(this);
- var filterLayoutView = filterChipDTO
- .getFilterLayoutView();
+ var filterLayoutView = filterChipDTO.getFilterLayoutView();
switch (filterChipDTO.getID()) {
case AccettazioneOrdiniPickingBindings.COD_ART_FILTER_ID ->
- ((FilterCodArtLayoutView) filterLayoutView)
- .setAll(mAppliedFilterViewModel.getAllCodArts())
- .setAvailable(mAppliedFilterViewModel.getAvailableCodArts())
- .setOnFilterApplied(mAppliedFilterViewModel::setCodArtFilter)
- .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
- .filter(mAppliedFilterViewModel.getCurrentCodArtPredicate().get() == null ?
- x -> false :
- mAppliedFilterViewModel.getCurrentCodArtPredicate().get())
- .map(x -> x.getSitArtOrdDTO().getCodMart())
- .toList());
+ ((FilterCodArtLayoutView) filterLayoutView).setAll(mAppliedFilterViewModel.getAllCodArts()).setAvailable(mAppliedFilterViewModel.getAvailableCodArts()).setOnFilterApplied(mAppliedFilterViewModel::setCodArtFilter).setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue())).filter(mAppliedFilterViewModel.getCurrentCodArtPredicate().get() == null ? x -> false : mAppliedFilterViewModel.getCurrentCodArtPredicate().get()).map(x -> x.getSitArtOrdDTO().getCodMart()).toList());
case AccettazioneOrdiniPickingBindings.DESCR_FILTER_ID ->
- ((FilterDescrLayoutView) filterLayoutView)
- .setAll(mAppliedFilterViewModel.getAllDescrs())
- .setAvailable(mAppliedFilterViewModel.getAvailableDescrs())
- .setOnFilterApplied(mAppliedFilterViewModel::setDescrFilter)
- .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
- .filter(mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null ?
- x -> false :
- mAppliedFilterViewModel.getCurrentDescrPredicate().get())
- .map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt())
- .toList());
+ ((FilterDescrLayoutView) filterLayoutView).setAll(mAppliedFilterViewModel.getAllDescrs()).setAvailable(mAppliedFilterViewModel.getAvailableDescrs()).setOnFilterApplied(mAppliedFilterViewModel::setDescrFilter).setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue())).filter(mAppliedFilterViewModel.getCurrentDescrPredicate().get() == null ? x -> false : mAppliedFilterViewModel.getCurrentDescrPredicate().get()).map(x -> x.getSitArtOrdDTO().getDescrizioneEstesaArt()).toList());
case AccettazioneOrdiniPickingBindings.POS_FILTER_ID ->
- ((FilterPosizioneLayoutView) filterLayoutView)
- .setAll(mAppliedFilterViewModel.getAllPos())
- .setAvailable(mAppliedFilterViewModel.getAvailablePos())
- .setOnFilterApplied(mAppliedFilterViewModel::setPosFilter)
- .setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue()))
- .filter(mAppliedFilterViewModel.getCurrentPosPredicate().get() == null ?
- x -> false :
- mAppliedFilterViewModel.getCurrentPosPredicate().get())
- .map(x -> x.getMtbAart().getPosizione())
- .toList());
+ ((FilterPosizioneLayoutView) filterLayoutView).setAll(mAppliedFilterViewModel.getAllPos()).setAvailable(mAppliedFilterViewModel.getAvailablePos()).setOnFilterApplied(mAppliedFilterViewModel::setPosFilter).setPreselected(Stream.of(Objects.requireNonNull(mViewModel.getPickingList().getValue())).filter(mAppliedFilterViewModel.getCurrentPosPredicate().get() == null ? x -> false : mAppliedFilterViewModel.getCurrentPosPredicate().get()).map(x -> x.getMtbAart().getPosizione()).toList());
}
- if (!filterLayoutView.isAdded())
- filterLayoutView.show(getSupportFragmentManager(), "TAG");
+ if (!filterLayoutView.isAdded()) filterLayoutView.show(getSupportFragmentManager(), "TAG");
}
@Override
@@ -374,9 +339,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
}
private void initBarcodeReader() {
- barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
- .setOnScanSuccessful(onScanSuccessful)
- .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
+ barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO().setOnScanSuccessful(onScanSuccessful).setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
}
private void initRecyclerView() {
@@ -417,9 +380,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
}
private List convertDataModelToListModel(List dataList) {
- List tmpList = Stream.of(dataList)
- .filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO))
- .toList();
+ List tmpList = Stream.of(dataList).filter(x -> !x.isHidden() && UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaDaEvadere(), BigDecimal.ZERO)).toList();
return switch (mCurrentOrderBy) {
case COD_ART_FOR -> convertDataModelToListModel__CodArtForn(tmpList);
@@ -430,133 +391,118 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
private List convertDataModelToListModel__CodArtForn(List dataList) {
ArrayList list = new ArrayList<>();
- Stream.of(dataList)
- .sortBy(x -> UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) +
- (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()))
- .forEach(x -> {
- AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
- accettazioneOrdiniPickingListModel.setActive(true);
+ Stream.of(dataList).sortBy(x -> UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa())).forEach(x -> {
+ AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
+ accettazioneOrdiniPickingListModel.setActive(true);
- accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) +
- (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
+ accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
- accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
- accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+ accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+ accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
- accettazioneOrdiniPickingListModel.setSubDescrizione1("Consegna: " + UtilityDate.formatDate(x.getSitArtOrdDTO().getDataCons(), UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH));
+ accettazioneOrdiniPickingListModel.setSubDescrizione1("Consegna: " + UtilityDate.formatDate(x.getSitArtOrdDTO().getDataCons(), UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH));
- accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
+ accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
- //Calc Num CNF
- BigDecimal numCnfEvasa = BigDecimal.ZERO;
+ //Calc Num CNF
+ BigDecimal numCnfEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getNumCnf)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- //Calc qta col
- BigDecimal qtaEvasa = BigDecimal.ZERO;
+ //Calc qta col
+ BigDecimal qtaEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getQtaCol)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
- accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
- } else {
- accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+ } else {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
- }
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ }
- accettazioneOrdiniPickingListModel.setOriginalModel(x);
+ accettazioneOrdiniPickingListModel.setOriginalModel(x);
- list.add(accettazioneOrdiniPickingListModel);
- });
+ list.add(accettazioneOrdiniPickingListModel);
+ });
return list;
}
private List convertDataModelToListModel__DescrArt(List dataList) {
ArrayList list = new ArrayList<>();
- Stream.of(dataList)
- .sortBy(x -> x.getMtbAart().getDescrizioneEstesa())
- .forEach(x -> {
- AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
- accettazioneOrdiniPickingListModel.setActive(true);
+ Stream.of(dataList).sortBy(x -> x.getMtbAart().getDescrizioneEstesa()).forEach(x -> {
+ AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
+ accettazioneOrdiniPickingListModel.setActive(true);
- accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart())
- + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
+ accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()) + (UtilityString.isNullOrEmpty(x.getMtbAart().getDescrizioneEstesa()) ? "" : " - " + x.getMtbAart().getDescrizioneEstesa()));
- accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
- accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+ accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+ accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
- accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
+ accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
- //Calc Num CNF
- BigDecimal numCnfEvasa = BigDecimal.ZERO;
+ //Calc Num CNF
+ BigDecimal numCnfEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getNumCnf)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- //Calc qta col
- BigDecimal qtaEvasa = BigDecimal.ZERO;
+ //Calc qta col
+ BigDecimal qtaEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getQtaCol)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
- accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
- } else {
- accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+ } else {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
- }
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ }
- accettazioneOrdiniPickingListModel.setOriginalModel(x);
+ accettazioneOrdiniPickingListModel.setOriginalModel(x);
- list.add(accettazioneOrdiniPickingListModel);
- });
+ list.add(accettazioneOrdiniPickingListModel);
+ });
return list;
}
@@ -564,136 +510,122 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
private List convertDataModelToListModel__RagSocCom(List dataList) {
ArrayList list = new ArrayList<>();
- Stream.of(dataList)
- .filter(x -> !UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) && !x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG))
- .sortBy(x -> x.getSitArtOrdDTO().getDescrizioneCommessa())
- .forEach(x -> {
- AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
- accettazioneOrdiniPickingListModel.setActive(true);
+ Stream.of(dataList).filter(x -> !UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) && !x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)).sortBy(x -> x.getSitArtOrdDTO().getDescrizioneCommessa()).forEach(x -> {
+ AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
+ accettazioneOrdiniPickingListModel.setActive(true);
- accettazioneOrdiniPickingListModel.setGroupTitle(x.getSitArtOrdDTO().getCodJcom() + (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) ? " - " + x.getSitArtOrdDTO().getDescrizioneCommessa() : ""));
+ accettazioneOrdiniPickingListModel.setGroupTitle(x.getSitArtOrdDTO().getCodJcom() + (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) ? " - " + x.getSitArtOrdDTO().getDescrizioneCommessa() : ""));
- accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
- accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+ accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
+ accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
- //Calc Num CNF
- BigDecimal numCnfEvasa = BigDecimal.ZERO;
+ //Calc Num CNF
+ BigDecimal numCnfEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getNumCnf)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- //Calc qta col
- BigDecimal qtaEvasa = BigDecimal.ZERO;
+ //Calc qta col
+ BigDecimal qtaEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getQtaCol)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
- accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
- } else {
- accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+ } else {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
- }
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ }
- accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneEstesaOrd());
+ accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneEstesaOrd());
- if (x.getMtbAart() != null) {
- accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
- }
+ if (x.getMtbAart() != null) {
+ accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
+ }
- accettazioneOrdiniPickingListModel.setOriginalModel(x);
+ accettazioneOrdiniPickingListModel.setOriginalModel(x);
- list.add(accettazioneOrdiniPickingListModel);
- });
+ list.add(accettazioneOrdiniPickingListModel);
+ });
- Stream.of(dataList)
- .filter(x -> UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) || x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG))
- .forEach(x -> {
- AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
- accettazioneOrdiniPickingListModel.setActive(true);
+ Stream.of(dataList).filter(x -> UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getDescrizioneCommessa()) || x.getSitArtOrdDTO().getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)).forEach(x -> {
+ AccettazioneOrdiniPickingListModel accettazioneOrdiniPickingListModel = new AccettazioneOrdiniPickingListModel();
+ accettazioneOrdiniPickingListModel.setActive(true);
- accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
+ accettazioneOrdiniPickingListModel.setGroupTitle(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
- accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
- accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
+ accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodArtFor(), x.getSitArtOrdDTO().getCodMart()));
+ accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
- //Calc Num CNF
- BigDecimal numCnfEvasa = BigDecimal.ZERO;
+ //Calc Num CNF
+ BigDecimal numCnfEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- numCnfEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getNumCnf)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getNumCnf).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- //Calc qta col
- BigDecimal qtaEvasa = BigDecimal.ZERO;
+ //Calc qta col
+ BigDecimal qtaEvasa = BigDecimal.ZERO;
- if (x.getWithdrawMtbColrs().size() > 0) {
- qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
- .map(MtbColr::getQtaCol)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
+ if (x.getWithdrawMtbColrs().size() > 0) {
+ qtaEvasa = Stream.of(x.getWithdrawMtbColrs()).map(MtbColr::getQtaCol).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
- if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
- accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setUntMis(UtilityResources.getString(R.string.unt_mis_col));
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
- } else {
- accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
- accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
- if (x.getMtbAart() != null)
- accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setSecUntMis(x.getMtbAart().getUntMis());
+ } else {
+ accettazioneOrdiniPickingListModel.setQtaEvasa(qtaEvasa);
+ accettazioneOrdiniPickingListModel.setQtaTot(x.getSitArtOrdDTO().getQtaDaEvadere());
+ if (x.getMtbAart() != null)
+ accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
- accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
- accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
- accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
- }
+ accettazioneOrdiniPickingListModel.setSecQtaEvasa(numCnfEvasa);
+ accettazioneOrdiniPickingListModel.setSecQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere());
+ accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
+ }
- if (x.getMtbAart() != null) {
- accettazioneOrdiniPickingListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
- accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
- }
+ if (x.getMtbAart() != null) {
+ accettazioneOrdiniPickingListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
+ accettazioneOrdiniPickingListModel.setUntMis(x.getMtbAart().getUntMis());
+ }
- accettazioneOrdiniPickingListModel.setOriginalModel(x);
+ accettazioneOrdiniPickingListModel.setOriginalModel(x);
- list.add(accettazioneOrdiniPickingListModel);
- });
+ list.add(accettazioneOrdiniPickingListModel);
+ });
return list;
}
private boolean isThereAnyItemToPick(List dataList) {
- return Stream.of(dataList)
- .anyMatch(x -> !x.isHidden());
+ return Stream.of(dataList).anyMatch(x -> !x.isHidden());
}
private final RunnableArgs onScanSuccessful = data -> {
@@ -718,20 +650,26 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
});
}
+ public void trackPackaging() {
+ this.fabPopupMenu.dismiss();
+
+ DialogTracciamentoImballiView.newInstance(data -> {
+ if (data != null && !data.isEmpty())
+ mViewModel.registraImballi(data);
+ }).show(getSupportFragmentManager(), DialogTracciamentoImballiView.class.getName());
+ }
+
+
public void showCreatedUL() {
this.fabPopupMenu.dismiss();
this.mViewModel.retrieveExistentLU(this::startListaBancaliRegistratiActivity);
}
private void showOrderByDialog() {
- AlertDialog dialog = new AlertDialog.Builder(this)
- .setTitle(this.getText(R.string.action_orderBy))
- .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(), (dialog12, which) -> {
- mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
- SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which);
- })
- .setPositiveButton(getText(R.string.ok), (dialog1, which) -> this.refreshList())
- .create();
+ AlertDialog dialog = new AlertDialog.Builder(this).setTitle(this.getText(R.string.action_orderBy)).setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, mCurrentOrderBy.getVal(), (dialog12, which) -> {
+ mCurrentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
+ SettingsManager.i().getUserSession().setDefaultOrdinamentoPickingAccettazione(which);
+ }).setPositiveButton(getText(R.string.ok), (dialog1, which) -> this.refreshList()).create();
dialog.show();
}
@@ -739,14 +677,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
Intent myIntent = ListaBancaliActivity.createIntent(this,
- Stream.of(mtbColts)
- .map(AlreadyRegisteredUDCDTO::getMtbColt)
- .toList(),
+ Stream.of(mtbColts).map(AlreadyRegisteredUDCDTO::getMtbColt).toList(),
- input -> Stream.of(mtbColts)
- .filter(x -> x.getMtbColt() == input)
- .findFirstOrElse(null)
- .isCanBeRecovered(),
+ input -> Stream.of(mtbColts).filter(x -> x.getMtbColt() == input).findFirstOrElse(null).isCanBeRecovered(),
ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
@@ -757,9 +690,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
public void onLUSuccessullyPrinted() {
Resources res = getResources();
String errorMessage = res.getText(R.string.alert_print_completed_message).toString();
- DialogSimpleMessageView
- .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null)
- .show(getSupportFragmentManager(), "tag");
+ DialogSimpleMessageView.makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(getSupportFragmentManager(), "tag");
}
@Override
@@ -769,13 +700,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
@Override
public void onLUPrintError(Exception ex, Runnable onComplete) {
this.onLoadingEnded();
- DialogSimpleMessageView.makeErrorDialog(
- new SpannableString(ex.getMessage()),
- null,
- null,
- R.string.button_ignore_print,
- onComplete)
- .show(getSupportFragmentManager(), "tag");
+ DialogSimpleMessageView.makeErrorDialog(new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, onComplete).show(getSupportFragmentManager(), "tag");
}
@Override
@@ -795,20 +720,12 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
@Override
public void onVersamentoAutomaticoULRequest(RunnableArgs onComplete) {
- runOnUiThread(() -> {
- DialogAskShouldVersamentoAutomaticoULView.newInstance(onComplete)
- .show(getSupportFragmentManager(), "tag");
- });
+ DialogAskShouldVersamentoAutomaticoULView.newInstance(onComplete).show(getSupportFragmentManager(), "tag");
}
@Override
public void onInfoAggiuntiveRequest(RunnableArgss onComplete) {
-// runOnUiThread(() -> {
-// DialogInfoAggiuntiveLU.newInstance(onComplete).show(getSupportFragmentManager(), "InfoAggiuntiveLUDialog");
-// });
-
- DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded)
- .show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
+ DialogInfoAggiuntiveLUView.newInstance(onComplete, this::onLoadingEnded).show(getSupportFragmentManager(), DialogInfoAggiuntiveLUView.class.getName());
}
@Override
@@ -826,41 +743,13 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
@Override
public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, String customArtDescription, RunnableArgss onComplete) {
- DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
- .setMtbAart(mtbAart)
- .setInitialNumCnf(initialNumCnf)
- .setInitialQtaCnf(initialQtaCnf)
- .setInitialQtaTot(initialQtaTot)
- .setTotalQtaOrd(totalQtaOrd)
- .setTotalNumCnfOrd(totalNumCnfOrd)
- .setQtaCnfOrd(qtaCnfOrd)
- .setTotalQtaToBeTaken(totalQtaToBeTaken)
- .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken)
- .setQtaCnfToBeTaken(qtaCnfToBeTaken)
- .setTotalQtaAvailable(totalQtaAvailable)
- .setTotalNumCnfAvailable(totalNumCnfAvailable)
- .setQtaCnfAvailable(qtaCnfAvailable)
- .setPartitaMag(partitaMag)
- .setDataScad(dataScad)
- .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
- .setCanLUBeClosed(true)
- .setCanOverflowOrderQuantity(canOverflowQuantity)
- .setCustomArtDescription(customArtDescription);
+ DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO().setMtbAart(mtbAart).setInitialNumCnf(initialNumCnf).setInitialQtaCnf(initialQtaCnf).setInitialQtaTot(initialQtaTot).setTotalQtaOrd(totalQtaOrd).setTotalNumCnfOrd(totalNumCnfOrd).setQtaCnfOrd(qtaCnfOrd).setTotalQtaToBeTaken(totalQtaToBeTaken).setTotalNumCnfToBeTaken(totalNumCnfToBeTaken).setQtaCnfToBeTaken(qtaCnfToBeTaken).setTotalQtaAvailable(totalQtaAvailable).setTotalNumCnfAvailable(totalNumCnfAvailable).setQtaCnfAvailable(qtaCnfAvailable).setPartitaMag(partitaMag).setDataScad(dataScad).setCanPartitaMagBeChanged(canPartitaMagBeChanged).setCanLUBeClosed(true).setCanOverflowOrderQuantity(canOverflowQuantity).setCustomArtDescription(customArtDescription);
if (!mDialogInputQuantityV2View.isVisible())
- mDialogInputQuantityV2View
- .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
- .setOnComplete((resultDTO, shouldCloseLU) -> {
- PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
- .setNumCnf(resultDTO.getNumCnf())
- .setQtaCnf(resultDTO.getQtaCnf())
- .setQtaTot(resultDTO.getQtaTot())
- .setPartitaMag(resultDTO.getPartitaMag())
- .setDataScad(resultDTO.getDataScad());
- onComplete.run(pickedQuantityDTO, shouldCloseLU);
- })
- .setOnAbort(() -> this.mViewModel.resetMatchedRows())
- .show(getSupportFragmentManager(), "tag");
+ mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO).setOnComplete((resultDTO, shouldCloseLU) -> {
+ PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO().setNumCnf(resultDTO.getNumCnf()).setQtaCnf(resultDTO.getQtaCnf()).setQtaTot(resultDTO.getQtaTot()).setPartitaMag(resultDTO.getPartitaMag()).setDataScad(resultDTO.getDataScad());
+ onComplete.run(pickedQuantityDTO, shouldCloseLU);
+ }).setOnAbort(() -> this.mViewModel.resetMatchedRows()).show(getSupportFragmentManager(), "tag");
}
@Override
@@ -894,9 +783,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
public void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
runOnUiThread(() -> {
- DialogVersamentoAutomaticoULDoneView
- .newInstance(versamentoAutomaticoULResponseDTO, onComplete)
- .show(getSupportFragmentManager(), "tag");
+ DialogVersamentoAutomaticoULDoneView.newInstance(versamentoAutomaticoULResponseDTO, onComplete).show(getSupportFragmentManager(), "tag");
});
}
@@ -905,11 +792,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
public void onMtbColrDeleteRequest(RunnableArgs onComplete) {
runOnUiThread(() -> {
String text = getResources().getString(R.string.alert_delete_mtb_colr);
- DialogSimpleMessageView.makeWarningDialog(new SpannableString(text),
- null,
- () -> onComplete.run(true),
- () -> onComplete.run(false)
- ).show(getSupportFragmentManager(), "tag");
+ DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false)).show(getSupportFragmentManager(), "tag");
});
}
@@ -925,15 +808,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
@Override
public void onLUClosed() {
- runOnUiThread(() -> {
- noLUPresent.set(true);
- this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
+ noLUPresent.set(true);
+ this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
+ this.refreshList();
-
- this.refreshList();
-
- if (this.mShouldCloseActivity) super.onBackPressed();
- });
+ if (this.mShouldCloseActivity) super.onBackPressed();
}
@Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java
index cbd87f03..416193b7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingModule.java
@@ -8,7 +8,7 @@ import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliAccettazioneRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
import it.integry.integrywmsnative.gest.accettazione_ordini_picking.rest.AccettazioneOrdiniPickingRESTConsumer;
import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
@@ -31,18 +31,19 @@ public class AccettazioneOrdiniPickingModule {
ArticoloRESTConsumer articoloRESTConsumer,
BarcodeRESTConsumer barcodeRESTConsumer,
ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
- PrinterRESTConsumer printerRESTConsumer,
AccettazioneOrdiniPickingRESTConsumer accettazioneOrdiniPickingRESTConsumer,
ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer,
ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
- Ean128Service ean128Service) {
+ Ean128Service ean128Service,
+ ImballiRESTConsumer imballiRESTConsumer) {
return new AccettazioneOrdiniPickingViewModel(articoloRESTConsumer,
barcodeRESTConsumer,
colliMagazzinoRESTConsumer,
- printerRESTConsumer,
accettazioneOrdiniPickingRESTConsumer,
colliAccettazioneRESTConsumer,
- colliLavorazioneRESTConsumer, ean128Service);
+ colliLavorazioneRESTConsumer,
+ ean128Service,
+ imballiRESTConsumer);
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
index 72a8ab5c..952a72b5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java
@@ -11,6 +11,7 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -40,11 +41,12 @@ import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliAccettazioneRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliCaricoRESTConsumerInterface;
import it.integry.integrywmsnative.core.rest.model.Ean128Model;
import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
import it.integry.integrywmsnative.core.rest.model.udc.CloseUDCRequestDTO;
import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestDTO;
import it.integry.integrywmsnative.core.rest.model.udc.CreateUDCRequestOrderDTO;
@@ -66,17 +68,18 @@ import it.integry.integrywmsnative.gest.accettazione_ordini_picking.rest.Accetta
import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
import it.integry.integrywmsnative.gest.spedizione.exceptions.NotCurrentYearLUException;
import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO;
public class AccettazioneOrdiniPickingViewModel {
private final ArticoloRESTConsumer mArticoloRESTConsumer;
private final BarcodeRESTConsumer mBarcodeRESTConsumer;
private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
- private final PrinterRESTConsumer mPrinterRESTConsumer;
private final AccettazioneOrdiniPickingRESTConsumer mAccettazioneOrdiniPickingRESTConsumer;
private final ColliAccettazioneRESTConsumer mColliAccettazioneRESTConsumer;
private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer;
private final Ean128Service mEan128Service;
+ private final ImballiRESTConsumer mImballiRESTConsumer;
private ColliCaricoRESTConsumerInterface mColliCaricoRESTConsumer;
@@ -88,6 +91,7 @@ public class AccettazioneOrdiniPickingViewModel {
private MtbColt mCurrentMtbColt = null;
private GestioneEnum defaultGestioneOfUL = null;
+ private String foundCodAnag = null;
private final List mHistoryUsedAarts = new ArrayList<>();
@@ -95,19 +99,19 @@ public class AccettazioneOrdiniPickingViewModel {
public AccettazioneOrdiniPickingViewModel(ArticoloRESTConsumer articoloRESTConsumer,
BarcodeRESTConsumer barcodeRESTConsumer,
ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
- PrinterRESTConsumer printerRESTConsumer,
AccettazioneOrdiniPickingRESTConsumer accettazioneOrdiniPickingRESTConsumer,
ColliAccettazioneRESTConsumer colliAccettazioneRESTConsumer,
ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
- Ean128Service ean128Service) {
+ Ean128Service ean128Service,
+ ImballiRESTConsumer imballiRESTConsumer) {
this.mArticoloRESTConsumer = articoloRESTConsumer;
this.mBarcodeRESTConsumer = barcodeRESTConsumer;
this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
- this.mPrinterRESTConsumer = printerRESTConsumer;
this.mAccettazioneOrdiniPickingRESTConsumer = accettazioneOrdiniPickingRESTConsumer;
this.mColliAccettazioneRESTConsumer = colliAccettazioneRESTConsumer;
this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
this.mEan128Service = ean128Service;
+ this.mImballiRESTConsumer = imballiRESTConsumer;
}
@@ -131,6 +135,15 @@ public class AccettazioneOrdiniPickingViewModel {
.findFirst()
.get();
+ //Definizione codAnag
+ var codAnagsOrd = mOrders.stream()
+ .map(OrdineAccettazioneInevasoDTO::getCodAnagOrd)
+ .distinct()
+ .collect(Collectors.toList());
+
+ if(codAnagsOrd.size() == 1) foundCodAnag = codAnagsOrd.get(0);
+
+
//Definizione della gestione collo di default
List foundGestioni = Stream.of(mOrders)
.map(OrdineAccettazioneInevasoDTO::getGestioneEnum)
@@ -275,7 +288,7 @@ public class AccettazioneOrdiniPickingViewModel {
null,
false,
() -> {
- if(UtilityString.isNullOrEmpty(customSSCC))
+ if (UtilityString.isNullOrEmpty(customSSCC))
processBarcodeAlreadyOpenedLU(barcodeScanDTO, onComplete);
else onComplete.run();
});
@@ -767,9 +780,6 @@ public class AccettazioneOrdiniPickingViewModel {
} else {
postCloseOperations();
}
-
- this.sendLUClosed();
- this.sendOnLoadingEnded();
};
sendVersamentoAutomaticoULRequest(response -> {
@@ -821,7 +831,7 @@ public class AccettazioneOrdiniPickingViewModel {
BigDecimal qtaEvasa = BigDecimal.ZERO;
BigDecimal numCnf = BigDecimal.ZERO;
- if (withdrawMtbColrs.size() > 0) {
+ if (!withdrawMtbColrs.isEmpty()) {
qtaEvasa = Stream.of(withdrawMtbColrs)
.map(MtbColr::getQtaCol)
.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -887,6 +897,22 @@ public class AccettazioneOrdiniPickingViewModel {
return optional.isPresent() ? optional.get() : null;
}
+ public void registraImballi(List data) {
+ this.sendOnLoadingStarted();
+
+
+ var inputData = data.stream()
+ .map(x -> new ImballoQuantityDTO()
+ .setQta(x.getQta().get())
+ .setCodMart(x.getCodMart().get()))
+ .collect(Collectors.toList());
+
+ mImballiRESTConsumer.registraCarico(foundCodAnag, inputData, () -> {
+ this.sendOnLoadingEnded();
+ }, this::sendError);
+ }
+
+
private void sendOnLoadingStarted() {
if (this.mListener != null) mListener.onLoadingStarted();
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index 6e3cb997..3ceab727 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -6,6 +6,7 @@ import com.annimon.stream.Stream;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -355,6 +356,7 @@ public class DocInterniEditFormViewModel {
row.setQtaCnf(resultDTO.getQtaCnf().floatValue());
row.setNumCnf(resultDTO.getNumCnf().floatValue());
row.setQtaCol(resultDTO.getQtaTot().floatValue());
+ row.setDatetimeRow(new Date());
row.setNote(resultDTO.getNote());
row.setDataScad(resultDTO.getDataScad());
row.setPartitaMag(resultDTO.getPartitaMag());
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
index 4d3c07f1..2b10d80b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
@@ -55,6 +55,7 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView;
import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteView;
import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdView;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto.DialogAskLineaProdResponse;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrList;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
@@ -297,7 +298,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
}
@Override
- public void onLULineaProdRequired(RunnableArgs onComplete, Runnable onAbort) {
+ public void onLULineaProdRequired(RunnableArgs onComplete, Runnable onAbort) {
DialogAskLineaProdView.newInstance(onComplete, onAbort)
.show(getParentFragmentManager(), DialogAskLineaProdView.class.getName());
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
index e7692971..171877f8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
@@ -55,6 +55,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto.DialogAskLineaProdResponse;
public class PickingLiberoViewModel {
@@ -324,25 +325,27 @@ public class PickingLiberoViewModel {
private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, Runnable onComplete) {
if (this.mFlagAskLineaProd) {
- this.sendLULineaProdRequired(codJfas -> {
- createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, codJfas, onComplete);
- }, () -> {
+ this.sendLULineaProdRequired(response -> {
+ createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete);
+ }, () -> {
+ this.sendOnLoadingEnded();
});
} else {
- createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, onComplete);
+ createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, null, onComplete);
}
}
- private void createNewLU_PostLineaProdAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJfas, Runnable onComplete) {
+ private void createNewLU_PostLineaProdAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJfas, Integer idLotto, Runnable onComplete) {
this.sendOnLoadingStarted();
var createUDSRequest = new CreateUDSRequestDTO()
- .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE ? "PICKING LIBERO" : null)
+ .setRifOrd(mDefaultGestione == GestioneEnum.LAVORAZIONE && !mFlagAskLineaProd ? "PICKING LIBERO" : null)
.setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
.setCausaleCollo(CreateUDSRequestDTO.Causale.SCARICO)
- .setOrderRequired(mFlagAskLineaProd);
+ .setIdLotto(idLotto)
+ .setOrderRequired(false);
if (customNumCollo != null) {
createUDSRequest.setNumCollo(customNumCollo);
@@ -948,7 +951,7 @@ public class PickingLiberoViewModel {
if (this.mListener != null) mListener.onLUClienteRequired(onComplete, onAbort);
}
- private void sendLULineaProdRequired(RunnableArgs onComplete, Runnable onAbort) {
+ private void sendLULineaProdRequired(RunnableArgs onComplete, Runnable onAbort) {
if (this.mListener != null) mListener.onLULineaProdRequired(onComplete, onAbort);
}
@@ -1008,7 +1011,7 @@ public class PickingLiberoViewModel {
void onLUClienteRequired(RunnableArgss onComplete, Runnable onAbort);
- void onLULineaProdRequired(RunnableArgs onComplete, Runnable onAbort);
+ void onLULineaProdRequired(RunnableArgs onComplete, Runnable onAbort);
void onArtSelectionRequest(List mtbColrsToPick, MtbAart mtbAart, RunnableArgs> onComplete, Runnable onAbort);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/AutoCompleteFornitoreAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/AutoCompleteFornitoreAdapter.java
index 104b95e1..63481063 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/AutoCompleteFornitoreAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/ui/AutoCompleteFornitoreAdapter.java
@@ -1,17 +1,18 @@
package it.integry.integrywmsnative.gest.rettifica_giacenze.ui;
import android.content.Context;
-import androidx.databinding.DataBindingUtil;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Filter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+
import java.util.ArrayList;
-import java.util.ConcurrentModificationException;
+import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.databinding.RettificaGiacenzeAutocompleteFornitoreLayoutBinding;
@@ -24,7 +25,7 @@ public class AutoCompleteFornitoreAdapter extends ArrayAdapter {
private ArrayList suggestions;
public AutoCompleteFornitoreAdapter(@NonNull Context context, @NonNull ArrayList items) {
- super(context, 0 , items);
+ super(context, 0, items);
this.items = items;
this.itemsAll = (ArrayList) items.clone();
this.suggestions = new ArrayList<>();
@@ -33,7 +34,7 @@ public class AutoCompleteFornitoreAdapter extends ArrayAdapter {
@NonNull
@Override
public Filter getFilter() {
- return fornitoreFilter;
+ return new FornitoreFilter(itemsAll);
}
@NonNull
@@ -49,55 +50,53 @@ public class AutoCompleteFornitoreAdapter extends ArrayAdapter {
return binding.getRoot();
}
+ private class FornitoreFilter extends Filter {
+ private ArrayList sourceObjects;
- private Filter fornitoreFilter = new Filter() {
- @Override
- protected FilterResults performFiltering(CharSequence constraint) {
- if(constraint != null) {
- suggestions.clear();
- for (FornitoreDTO fornitore : itemsAll) {
- String tmpDescr = fornitore.getCodAlis() + " " + fornitore.getDescrizione();
+ public FornitoreFilter(List objects) {
+ if (objects == null) return;
+ sourceObjects = new ArrayList<>();
- if(tmpDescr.toLowerCase().contains(constraint.toString().toLowerCase())){
- suggestions.add(fornitore);
- }
- }
- FilterResults filterResults = new FilterResults();
- filterResults.values = suggestions;
- filterResults.count = suggestions.size();
- return filterResults;
- } else {
- return new FilterResults();
+ synchronized (this) {
+ sourceObjects.addAll(objects);
}
}
+ @Override
+ protected FilterResults performFiltering(CharSequence constraint) {
+ FilterResults result = new FilterResults();
+ if (constraint != null) {
+ suggestions.clear();
+ for (FornitoreDTO fornitore : sourceObjects) {
+ String tmpDescr = fornitore.getCodAlis() + " " + fornitore.getDescrizione();
+
+ if (tmpDescr.toLowerCase().contains(constraint.toString().toLowerCase())) {
+ suggestions.add(fornitore);
+ }
+ }
+ result.values = suggestions;
+ result.count = suggestions.size();
+ } else {
+ // add all objects
+ synchronized (this) {
+ result.values = sourceObjects;
+ result.count = sourceObjects.size();
+ }
+ }
+ return result;
+ }
@Override
protected void publishResults(CharSequence constraint, FilterResults results) {
-
- boolean error;
-
- do {
- try {
- ArrayList filteredList = (ArrayList) results.values;
- if (results.count > 0) {
- clear();
-
- for (FornitoreDTO c : filteredList) {
- add(c);
- }
-
- notifyDataSetChanged();
-
- }
- error = false;
- } catch (ConcurrentModificationException ex) {
- error = true;
- }
- } while (error);
-
-
+ if(constraint != null && constraint.length() > 2) {
+ ArrayList filtered = (ArrayList) results.values;
+ notifyDataSetChanged();
+ clear();
+ for (int i = 0, l = filtered.size(); i < l; i++)
+ add(filtered.get(i));
+ notifyDataSetInvalidated();
+ }
}
@@ -105,5 +104,6 @@ public class AutoCompleteFornitoreAdapter extends ArrayAdapter {
public CharSequence convertResultToString(Object resultValue) {
return ((FornitoreDTO) resultValue).getCodAlis();
}
- };
+ }
+
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index 83beb96f..d2022ba4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -6,8 +6,10 @@ import android.content.SharedPreferences;
import android.content.res.Resources;
import android.os.Bundle;
import android.text.SpannableString;
+import android.view.Gravity;
import android.widget.Toast;
+import androidx.appcompat.widget.PopupMenu;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ObservableArrayList;
import androidx.preference.PreferenceManager;
@@ -68,6 +70,7 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
+import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreView;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView;
@@ -78,6 +81,7 @@ import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUV
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiView;
import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
public class SpedizioneActivity extends BaseActivity implements SpedizioneViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
@@ -99,7 +103,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
public BindableBoolean noItemsToPick = new BindableBoolean(false);
public BindableBoolean noLUPresent = new BindableBoolean(true);
public BindableBoolean bottomSheetEnabled = new BindableBoolean(false);
- public BindableBoolean closeOrderButtonEnabled = new BindableBoolean(false);
private boolean mEnableFakeGiacenza;
private boolean mFlagShowCodForn;
@@ -119,6 +122,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
private final int PICK_UL_REQUEST = 1;
+ private PopupMenu fabPopupMenu;
+
public static void startActivity(Context context,
List ordini,
List selectedOrders,
@@ -196,13 +201,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
this.initVars();
this.initBarcodeReader();
+ this.initFab();
this.initRecyclerView();
- closeOrderButtonEnabled.set(SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()
- || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()
- || (this.isOrdTrasf() && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV()))
- );
-
String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
mEnableFakeGiacenza = SettingsManager.iDB().isFlagSpedizioneEnableFakeGiacenza();
@@ -223,17 +224,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
mGestioneCol, mSegnoCol, mDefaultCausaleUL,
mEnableQuantityReset,
useQtaOrd);
- }
-
- private boolean isOrdTrasf() {
-
- return mTestateOrdini != null && !mTestateOrdini.isEmpty() && Stream.of(mTestateOrdini)
- .map(OrdineUscitaInevasoDTO::isOrdTrasf)
- .withoutNulls()
- .distinctBy(x -> x)
- .findFirst()
- .get();
}
@Override
@@ -271,6 +262,48 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
BarcodeManager.enable();
}
+
+ private void initFab() {
+ fabPopupMenu = new PopupMenu(this,
+ this.mBindings.spedizioneOrdineInevasoFab, (Gravity.END | Gravity.BOTTOM),
+ androidx.appcompat.R.attr.popupMenuStyle,
+ com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
+
+ fabPopupMenu.setForceShowIcon(true);
+ fabPopupMenu.getMenuInflater().inflate(R.menu.spedizione_ordine_inevaso_fab_menu, fabPopupMenu.getMenu());
+
+ boolean isCloseOrderEnabled = SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()
+ || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()
+ || (mViewmodel.isOrdTrasf() && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV()));
+
+ if (!isCloseOrderEnabled) {
+ fabPopupMenu.getMenu().removeItem(R.id.close_order);
+ }
+
+ if(!SettingsManager.iDB().isFlagTracciamentoImballiScaricoEnabled())
+ fabPopupMenu.getMenu().removeItem(R.id.track_packaging);
+
+ fabPopupMenu.setOnMenuItemClickListener(item -> {
+ int itemId = item.getItemId();
+
+ if (itemId == R.id.close_order) {
+ closeOrder();
+ return true;
+ } else if (itemId == R.id.show_created_ul) {
+ showCreatedUL();
+ return true;
+ } else if (itemId == R.id.track_packaging) {
+ trackPackaging();
+ return true;
+ } else if (itemId == R.id.create_ul) {
+ createNewUL();
+ return true;
+ }
+
+ return false;
+ });
+ }
+
private void initRecyclerView() {
this.mViewmodel.getPickingList().observe(this, updatedData -> {
this.mSpedizioneMutableData.clear();
@@ -383,7 +416,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
MtbColr mtbColrToDispatch = mtbColtToPick.getMtbColr() != null && mtbColtToPick.getMtbColr().size() > 0 ? mtbColtToPick.getMtbColr().get(0) : null;
if (mtbColrToDispatch != null) {
- if(!UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag()))
+ if (!UtilityString.isNullOrEmpty(mtbColrToDispatch.getPartitaMag()))
cloneModel.setSubDescrizione1(String.format(getString(R.string.batch_lot_text), mtbColrToDispatch.getPartitaMag()));
if (!UtilityString.isNullOrEmpty(x.getSitArtOrdDTO().getCodJcom())) {
@@ -642,13 +675,18 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
return sortedList;
}
+
+ public void showFabMenu() {
+ fabPopupMenu.show();
+ }
+
private String getCommessa(String codJcom) {
var commessaMagazzino = SettingsManager.iDB().getCommessaMagazzino();
- if(UtilityString.isNullOrEmpty(commessaMagazzino)) {
+ if (UtilityString.isNullOrEmpty(commessaMagazzino)) {
return UtilityString.isNull(codJcom, "Magazzino").toUpperCase();
} else {
- if(commessaMagazzino.equalsIgnoreCase(codJcom) || codJcom == null)
+ if (commessaMagazzino.equalsIgnoreCase(codJcom) || codJcom == null)
return "Magazzino".toUpperCase();
else
return codJcom.toUpperCase();
@@ -698,7 +736,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
public void createNewUL() {
- this.mBindings.spedizioneFab.close(true);
+ this.fabPopupMenu.dismiss();
this.onLoadingStarted();
@@ -707,8 +745,23 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
});
}
+
+ public void trackPackaging() {
+ this.fabPopupMenu.dismiss();
+
+ DialogTracciamentoImballiView.newInstance(imballiData -> {
+
+ if (imballiData != null && !imballiData.isEmpty()) {
+ DialogAskVettoreView.newInstance(mViewmodel.getDefaultVettore(), vettoreData -> {
+ mViewmodel.registraImballi(vettoreData, imballiData);
+ })
+ .show(getSupportFragmentManager(), DialogAskVettoreView.class.getName());
+ }
+ }).show(getSupportFragmentManager(), DialogTracciamentoImballiView.class.getName());
+ }
+
public void showCreatedUL() {
- this.mBindings.spedizioneFab.close(true);
+ this.fabPopupMenu.dismiss();
ArrayList createdMtbColts = this.mViewmodel.getCreatedMtbColts();
@@ -718,7 +771,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
public void closeOrder() {
- this.mBindings.spedizioneFab.close(true);
+ this.fabPopupMenu.dismiss();
this.mViewmodel.closeOrder();
}
@@ -727,7 +780,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
public void onLUOpened(MtbColt mtbColt) {
this.addExtraItemsEnabled.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione());
noLUPresent.set(false);
- closeOrderButtonEnabled.set(false);
FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
@@ -739,7 +791,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
this.addExtraItemsEnabled.set(false);
noLUPresent.set(true);
this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
- closeOrderButtonEnabled.set(SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose());
if (this.mShouldCloseActivity) super.onBackPressed();
}
@@ -776,7 +827,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
R.string.button_ignore_print,
onComplete)
.show(getSupportFragmentManager(), "tag");
- ;
}
@Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
index 0cec1e2d..dad4a875 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
@@ -9,6 +9,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsu
import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
@@ -34,7 +35,8 @@ public class SpedizioneModule {
DocumentRESTConsumer documentRESTConsumer,
ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer,
ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
- MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer) {
+ MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer,
+ ImballiRESTConsumer imballiRESTConsumer) {
return new SpedizioneViewModel(articoloRESTConsumer,
barcodeRESTConsumer,
colliDataRecoverService,
@@ -45,7 +47,8 @@ public class SpedizioneModule {
documentRESTConsumer,
colliSpedizioneRESTConsumer,
colliLavorazioneRESTConsumer,
- magazzinoAutomaticoRESTConsumer);
+ magazzinoAutomaticoRESTConsumer,
+ imballiRESTConsumer);
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index 0e1af15c..7a5cdf3d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -3,16 +3,16 @@ package it.integry.integrywmsnative.gest.spedizione;
import androidx.databinding.ObservableArrayList;
import androidx.lifecycle.MutableLiveData;
-import com.annimon.stream.Optional;
-import com.annimon.stream.Stream;
-
import org.apache.commons.lang3.NotImplementedException;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -42,6 +42,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
import it.integry.integrywmsnative.core.model.MtbPartitaMag;
import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.model.VtbVett;
import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
@@ -51,6 +52,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsu
import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
@@ -61,6 +63,7 @@ import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
+import it.integry.integrywmsnative.core.rest.model.imballi.ImballoQuantityDTO;
import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemRequestDTO;
import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickItemsRequestDTO;
import it.integry.integrywmsnative.core.rest.model.magazzino_automatico.MagazzinoAutomaticoPickOrderRequestDTO;
@@ -86,6 +89,7 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadExceptio
import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO;
public class SpedizioneViewModel {
@@ -101,6 +105,7 @@ public class SpedizioneViewModel {
private String mDefaultCodMdep = null;
private final List mDefaultFiltroOrdine = new ArrayList<>();
private Integer mDefaultCausaleOfUL = null;
+ private VtbVett mDefaultVettore = null;
private boolean mEnableGiacenza;
private boolean mEnableCheckPartitaMag;
@@ -124,13 +129,24 @@ public class SpedizioneViewModel {
private final DocumentRESTConsumer mDocumentRESTConsumer;
private final ColliSpedizioneRESTConsumer mColliSpedizioneRESTConsumer;
private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer;
-
private final MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer;
+ private final ImballiRESTConsumer mImballiRESTConsumer;
private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer;
@Inject
- public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, ColliDataRecoverService colliDataRecoverService, OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, DocumentRESTConsumer documentRESTConsumer, ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer, ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer, MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer) {
+ public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer,
+ BarcodeRESTConsumer barcodeRESTConsumer,
+ ColliDataRecoverService colliDataRecoverService,
+ OrdiniRESTConsumer ordiniRESTConsumer,
+ ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+ PrinterRESTConsumer printerRESTConsumer,
+ PosizioniRESTConsumer posizioniRESTConsumer,
+ DocumentRESTConsumer documentRESTConsumer,
+ ColliSpedizioneRESTConsumer colliSpedizioneRESTConsumer,
+ ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
+ MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer,
+ ImballiRESTConsumer imballiRESTConsumer) {
this.mArticoloRESTConsumer = articoloRESTConsumer;
this.mBarcodeRESTConsumer = barcodeRESTConsumer;
this.mColliDataRecoverService = colliDataRecoverService;
@@ -142,6 +158,7 @@ public class SpedizioneViewModel {
this.mColliSpedizioneRESTConsumer = colliSpedizioneRESTConsumer;
this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
this.mMagazzinoAutomaticoRESTConsumer = mMagazzinoAutomaticoRESTConsumer;
+ this.mImballiRESTConsumer = imballiRESTConsumer;
}
@@ -159,10 +176,6 @@ public class SpedizioneViewModel {
this.mEnableQuantityReset = enableQuantityReset;
this.mUseQtaOrd = useQtaOrd;
- if (testateOrdini != null && testateOrdini.size() > 0) {
- this.mIsOrdTrasf = Stream.of(testateOrdini).map(OrdineUscitaInevasoDTO::isOrdTrasf).withoutNulls().distinctBy(x -> x).findFirst().get();
- }
-
if (enableGiacenza) {
mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> {
this.mPickingList.postValue(pickingObjectList);
@@ -183,38 +196,67 @@ public class SpedizioneViewModel {
private void getEmptyPickingList(List sitArtOrdList, RunnableArgs> onComplete) {
- List codMarts = Stream.of(sitArtOrdList).map(x -> x.getCodMart().trim()).toList();
+ List codMarts = sitArtOrdList.stream()
+ .map(x -> x.getCodMart().trim())
+ .collect(Collectors.toList());
this.mArticoloRESTConsumer.getByCodMarts(codMarts, listMtbAarts -> {
- List pickingList = Stream.of(sitArtOrdList).map(sitArtOrdDTO -> {
- MtbAart mtbAart = null;
+ List pickingList = sitArtOrdList.stream()
+ .map(sitArtOrdDTO -> {
+ MtbAart mtbAart = null;
- for (MtbAart mtbAartItem : listMtbAarts) {
- if (mtbAartItem.getCodMart().trim().equalsIgnoreCase(sitArtOrdDTO.getCodMart().trim())) {
- mtbAart = mtbAartItem;
- break;
- }
- }
+ for (MtbAart mtbAartItem : listMtbAarts) {
+ if (mtbAartItem.getCodMart().trim().equalsIgnoreCase(sitArtOrdDTO.getCodMart().trim())) {
+ mtbAart = mtbAartItem;
+ break;
+ }
+ }
- return new PickingObjectDTO().setSitArtOrdDTO(sitArtOrdDTO).setMtbAart(mtbAart);
- }).toList();
+ return new PickingObjectDTO().setSitArtOrdDTO(sitArtOrdDTO).setMtbAart(mtbAart);
+ }).collect(Collectors.toList());
onComplete.run(pickingList);
}, this::sendError);
}
private void initDefaultVars() {
- if (this.mTestateOrdini != null && this.mTestateOrdini.size() > 0) {
+ if (this.mTestateOrdini != null && !this.mTestateOrdini.isEmpty()) {
- List foundRagSoc = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getRagSocOrd).distinctBy(x -> x).toList();
+ this.mIsOrdTrasf = mTestateOrdini.stream()
+ .map(OrdineUscitaInevasoDTO::isOrdTrasf)
+ .filter(Objects::nonNull)
+ .distinct()
+ .findFirst()
+ .orElse(false);
- if (foundRagSoc != null && foundRagSoc.size() == 1) {
+ List foundRagSoc = mTestateOrdini.stream()
+ .map(OrdineUscitaInevasoDTO::getRagSocOrd)
+ .distinct()
+ .collect(Collectors.toList());
+
+ if (foundRagSoc.size() == 1) {
mDefaultRagSocOfUL = foundRagSoc.get(0);
}
+ List foundVett = mTestateOrdini.stream()
+ .filter(x -> !UtilityString.isNullOrEmpty(x.getCodVvet()))
+ .map(x -> new VtbVett()
+ .setCodVvet(x.getCodVvet())
+ .setRagSoc(x.getDescrizioneVettore()))
+ .distinct()
+ .collect(Collectors.toList());
+
+ if (foundVett.size() == 1) {
+ mDefaultVettore = foundVett.get(0);
+ }
+
if (mDefaultGestioneOfUL == null) {
//Definizione della gestione collo di default
- List foundGestioni = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getGestioneEnum).withoutNulls().distinct().toList();
+ List foundGestioni = mTestateOrdini.stream()
+ .map(OrdineUscitaInevasoDTO::getGestioneEnum)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
if (foundGestioni.size() > 1) {
return;
@@ -254,6 +296,11 @@ public class SpedizioneViewModel {
}
}
+
+ public boolean isOrdTrasf() {
+ return mIsOrdTrasf;
+ }
+
private void onOrderClosedPrintingDone() {
if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {
this.sendCreateDocsRequest();
@@ -492,7 +539,8 @@ public class SpedizioneViewModel {
}
} else {
- boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep())
+ boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep()
+ .stream()
.anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
if (codMdepIsValid) {
@@ -537,7 +585,7 @@ public class SpedizioneViewModel {
mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
- boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep())
+ boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
.anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
if (codMdepIsValid) {
@@ -560,7 +608,7 @@ public class SpedizioneViewModel {
if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
if (mtbColt.getSegno() != -1) {
- boolean codMdepIsValid = Stream.of(SettingsManager.iDB().getAvailableCodMdep())
+ boolean codMdepIsValid = SettingsManager.iDB().getAvailableCodMdep().stream()
.anyMatch(x -> x.getCodMdep().equalsIgnoreCase(mtbColt.getCodMdep()));
if (codMdepIsValid) {
@@ -633,26 +681,28 @@ public class SpedizioneViewModel {
}
private void executeMagazzinoAutomatico(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete) {
- var magazzinoAutomaticoPickableArts = Stream.of(Objects.requireNonNull(this.mPickingList.getValue()))
- .filter(x -> Stream.of(x.getMtbColts()).anyMatch(y -> y.getPosizione() != null && y.getPosizione().equalsIgnoreCase(mtbDepoPosizione.getPosizione())) &&
+ var magazzinoAutomaticoPickableArts = Objects.requireNonNull(this.mPickingList.getValue())
+ .stream()
+ .filter(x -> x.getMtbColts().stream()
+ .anyMatch(y -> y.getPosizione() != null && y.getPosizione().equalsIgnoreCase(mtbDepoPosizione.getPosizione())) &&
x.getSitArtOrdDTO() != null &&
UtilityBigDecimal.greaterThan(x.getSitArtOrdDTO().getQtaOrd(), BigDecimal.ZERO))
- .toList();
+ .collect(Collectors.toList());
- var mtbAarts = Stream.of(magazzinoAutomaticoPickableArts)
+ var mtbAarts = magazzinoAutomaticoPickableArts.stream()
.map(PickingObjectDTO::getMtbAart)
- .toList();
+ .collect(Collectors.toList());
this.sendChooseArtsRequest(mtbAarts, selectedArts -> {
- final List orders = Stream.of(this.mTestateOrdini)
+ final List orders = this.mTestateOrdini.stream()
.map(x -> new MagazzinoAutomaticoPickOrderRequestDTO(UtilityDate.toLocalDate(x.getDataOrdD()), x.getGestione(), x.getNumOrd())
.setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null))
- .toList();
+ .collect(Collectors.toList());
final List magazzinoAutomaticoPickItemRequestDTOList = new ArrayList<>();
for (MtbAart selectedArt : selectedArts) {
- final PickingObjectDTO pickingObjectDTO = Stream.of(magazzinoAutomaticoPickableArts)
+ final PickingObjectDTO pickingObjectDTO = magazzinoAutomaticoPickableArts.stream()
.filter(x -> x.getMtbAart().getCodMart().equalsIgnoreCase(selectedArt.getCodMart()))
.findFirst()
.orElse(null);
@@ -682,10 +732,10 @@ public class SpedizioneViewModel {
}
public void executeEmptyMagazzinoAutomaticoRequest(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete) {
- final List orders = Stream.of(this.mTestateOrdini)
+ final List orders = this.mTestateOrdini.stream()
.map(x -> new MagazzinoAutomaticoPickOrderRequestDTO(UtilityDate.toLocalDate(x.getDataOrdD()), x.getGestione(), x.getNumOrd())
.setDataCons(UtilityDate.toLocalDate(x.getDataConsD())))
- .toList();
+ .collect(Collectors.toList());
var magazzinoAutomaticoPickRequest = new MagazzinoAutomaticoPickItemsRequestDTO()
.setShouldCreateUDS(true)
@@ -703,21 +753,22 @@ 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))) {
+ pickingList
+ .forEach(pickingObjectDTO -> {
+ if (pickingObjectDTO.getMtbColts().stream()
+ .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);
- }
- });
+ matchPickingObject.add(pickingObjectDTO);
+ }
+ });
}
//Controllo se nel collo ho degli articoli che corrispondono per codice / taglia / colore / lotto
- Stream.of(scannedUL.getMtbColr()).filter(x -> !UtilityString.isNullOrEmpty(x.getCodMart())).forEach(x -> {
+ scannedUL.getMtbColr().stream().filter(x -> !UtilityString.isNullOrEmpty(x.getCodMart())).forEach(x -> {
for (PickingObjectDTO pickingObject : pickingList) {
//Da verificare se il controllo per partita deve essere sempre effettuato
@@ -736,7 +787,7 @@ public class SpedizioneViewModel {
ObservableArrayList cloneMtbColrs = (ObservableArrayList) cloneMtbColt.getMtbColr().clone();
- Stream.of(cloneMtbColt.getMtbColr())
+ cloneMtbColt.getMtbColr().stream()
.filter(x -> !(UtilityString.equalsIgnoreCase(x.getCodMart(), matchedObject.getSitArtOrdDTO().getCodMart()) &&
UtilityString.equalsIgnoreCase(x.getCodTagl(), matchedObject.getSitArtOrdDTO().getCodTagl()) &&
UtilityString.equalsIgnoreCase(x.getCodCol(), matchedObject.getSitArtOrdDTO().getCodCol()) &&
@@ -760,12 +811,12 @@ public class SpedizioneViewModel {
private void searchArtFromAnag(MtbAart mtbAart, PickDataDTO pickData, Runnable onComplete) {
final List pickingList = mPickingList.getValue();
- List matchPickingObject = Stream.of(pickingList)
+ List matchPickingObject = pickingList.stream()
.filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitArtOrdDTO().getCodMart()))
.filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt()).filter(x -> {
MtbPartitaMag mtbPartitaMag = pickData != null && pickData.getManualPickDTO() != null && pickData.getManualPickDTO().getMtbPartitaMag() != null ? pickData.getManualPickDTO().getMtbPartitaMag() : null;
return !mEnableCheckPartitaMag || (mtbPartitaMag != null && UtilityString.equalsIgnoreCase(x.getSitArtOrdDTO().getPartitaMag(), mtbPartitaMag.getPartitaMag()));
- }).toList();
+ }).collect(Collectors.toList());
for (PickingObjectDTO pickingObjectDTO : matchPickingObject) {
pickingObjectDTO.setTempPickData(pickData);
@@ -787,7 +838,7 @@ public class SpedizioneViewModel {
List pickingList = mPickingList.getValue();
- Stream.of(pickingList).filter(x -> x != matchedItem).forEach(x -> x.setHidden(true));
+ pickingList.stream().filter(x -> x != matchedItem).forEach(x -> x.setHidden(true));
this.sendFilterApplied(null);
this.getPickingList().postValue(pickingList);
@@ -828,14 +879,14 @@ public class SpedizioneViewModel {
List scannedMtbColrs = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr();
- List availableBatchLots = Stream.of(scannedMtbColrs)
+ List availableBatchLots = scannedMtbColrs.stream()
.filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
(x.getPartitaMag() == null || x.getMtbPartitaMag().getDataScad() == null ||
UtilityDate.getNow().isBefore(x.getMtbPartitaMag().getDataScad())))
- .distinctBy(MtbColr::getPartitaMag)
.map(x -> x.getPartitaMag() == null ? new MtbPartitaMag().setCodMart(x.getMtbAart().getCodMart()) : x.getMtbPartitaMag())
- .toList();
+ .distinct()
+ .collect(Collectors.toList());
//Controllo se una delle partite combacia con quella che voglio evadere
// if (refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) {
@@ -854,24 +905,30 @@ public class SpedizioneViewModel {
List tmp = new ArrayList<>();
- if (Stream.of(availableBatchLots).anyMatch(x -> x.getDataScad() != null)) {
- tmp.addAll(Stream.of(availableBatchLots)
+ if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() != null)) {
+ tmp.addAll(availableBatchLots.stream()
.filter(x -> x.getDataScad() != null && UtilityDate.getNow().isBefore(x.getDataScad()))
- .sortBy(MtbPartitaMag::getDataScad).
- toList());
+ .sorted(Comparator.comparing(MtbPartitaMag::getDataScad))
+ .collect(Collectors.toList()));
}
- if (Stream.of(availableBatchLots).anyMatch(x -> x.getDataScad() == null)) {
- tmp.addAll(Stream.of(availableBatchLots)
+ if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() == null)) {
+ tmp.addAll(availableBatchLots.stream()
.filter(x -> x.getDataScad() == null)
- .sortBy(x -> UtilityString.isNull(x.getPartitaMag(), "")).toList());
+ .sorted(Comparator.comparing(MtbPartitaMag::getPartitaMag))
+ .collect(Collectors.toList()));
}
this.sendBatchLotSelectionRequest(tmp, selected -> {
this.sendOnLoadingEnded();
if (selected != null) {
- MtbColr scannedMtbColr = Stream.of(pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr()).filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) && ((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag())) || (x.getPartitaMag() == null && selected.getPartitaMag() == null))).toList().get(0);
+ MtbColr scannedMtbColr = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().stream()
+ .filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
+ ((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag()))
+ || (x.getPartitaMag() == null && selected.getPartitaMag() == null)))
+ .findFirst()
+ .orElse(null);
dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColr, canPartitaMagBeChanged);
}
@@ -894,10 +951,11 @@ public class SpedizioneViewModel {
AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
AtomicBigDecimal qtaColWithdrawRows = new AtomicBigDecimal();
- Stream.of(pickingObjectDTO.getWithdrawMtbColrs()).forEach(row -> {
- numCnfWithdrawRows.addAndGet(row.getNumCnf());
- qtaColWithdrawRows.addAndGet(row.getQtaCol());
- });
+ pickingObjectDTO.getWithdrawMtbColrs().stream()
+ .forEach(row -> {
+ numCnfWithdrawRows.addAndGet(row.getNumCnf());
+ qtaColWithdrawRows.addAndGet(row.getQtaCol());
+ });
BigDecimal numCnfDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd().subtract(numCnfWithdrawRows.getBigDecimalValue());
BigDecimal qtaDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getQtaOrd().subtract(qtaColWithdrawRows.getBigDecimalValue());
@@ -1158,7 +1216,10 @@ public class SpedizioneViewModel {
public void dispatchRowEdit(final MtbColr mtbColrToEdit) {
this.sendOnLoadingStarted();
- Optional optionalPickingObjectDTO = Stream.of(this.mPickingList.getValue()).filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToEdit)).findSingle();
+ Optional optionalPickingObjectDTO =
+ this.mPickingList.getValue().stream()
+ .filter(x -> x.getWithdrawMtbColrs().stream().anyMatch(y -> y == mtbColrToEdit))
+ .findFirst();
PickingObjectDTO pickingObjectDTO = null;
@@ -1187,10 +1248,11 @@ public class SpedizioneViewModel {
AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal(0);
AtomicBigDecimal qtaColWithdrawRows = new AtomicBigDecimal(0);
- Stream.of(finalPickingObjectDTO.getWithdrawMtbColrs()).forEach(row -> {
- numCnfWithdrawRows.addAndGet(row.getNumCnf());
- qtaColWithdrawRows.addAndGet(row.getQtaCol());
- });
+ finalPickingObjectDTO.getWithdrawMtbColrs()
+ .forEach(row -> {
+ numCnfWithdrawRows.addAndGet(row.getNumCnf());
+ qtaColWithdrawRows.addAndGet(row.getQtaCol());
+ });
numCnfDaEvadere = totalNumCnfOrd.subtract(numCnfWithdrawRows.getBigDecimalValue()).add(mtbColrToEdit.getNumCnf());
qtaDaEvadere = totalQtaOrd.subtract(qtaColWithdrawRows.getBigDecimalValue()).add(mtbColrToEdit.getQtaCol());
@@ -1215,7 +1277,13 @@ public class SpedizioneViewModel {
if (mtbColrRifs != null && mtbColrRifs.size() > 0) {
//TODO: Da capire se è necessario controllare anche il cod_jcom
- Optional optionalMtbColr = Stream.of(mtbColrRifs).filter(x -> UtilityString.equalsIgnoreCase(x.getCodMart(), mtbColrToEdit.getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodCol(), mtbColrToEdit.getCodCol()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), mtbColrToEdit.getCodTagl()) && UtilityString.equalsIgnoreCase(x.getPartitaMag(), mtbColrToEdit.getPartitaMag())).findSingle();
+ Optional optionalMtbColr =
+ mtbColrRifs.stream()
+ .filter(x -> UtilityString.equalsIgnoreCase(x.getCodMart(), mtbColrToEdit.getCodMart()) &&
+ UtilityString.equalsIgnoreCase(x.getCodCol(), mtbColrToEdit.getCodCol()) &&
+ UtilityString.equalsIgnoreCase(x.getCodTagl(), mtbColrToEdit.getCodTagl()) &&
+ UtilityString.equalsIgnoreCase(x.getPartitaMag(), mtbColrToEdit.getPartitaMag()))
+ .findFirst();
mtbColrRif = optionalMtbColr.isPresent() ? optionalMtbColr.get() : null;
}
@@ -1270,15 +1338,16 @@ public class SpedizioneViewModel {
public void createNewLU(Integer customNumCollo, String customSerCollo, Runnable onComplete) {
int causaleCollo = 0;
- if (mDefaultGestioneOfUL == GestioneEnum.LAVORAZIONE && mDefaultSegnoCol == +1) causaleCollo = 1;
+ if (mDefaultGestioneOfUL == GestioneEnum.LAVORAZIONE && mDefaultSegnoCol == +1)
+ causaleCollo = 1;
- final List orders = Stream.of(this.mTestateOrdini)
+ final List orders = this.mTestateOrdini.stream()
.map(x -> new CreateUDSRequestOrderDTO()
.setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null)
.setDataOrd(UtilityDate.toLocalDate(x.getDataOrdD()))
.setGestione(x.getGestione())
.setNumOrd(x.getNumOrd()))
- .toList();
+ .collect(Collectors.toList());
final CreateUDSRequestDTO createUDSRequestDTO = new CreateUDSRequestDTO()
.setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
@@ -1407,9 +1476,10 @@ public class SpedizioneViewModel {
.setQtaCnf(savedMtbColr.getQtaCnf())
.setQtaCol(savedMtbColr.getQtaCol());
- Optional pickingObjectDTO = Stream.of(this.mPickingList.getValue())
- .filter(x -> Stream.of(x.getWithdrawMtbColrs())
- .anyMatch(y -> y == mtbColrToUpdate)).findSingle();
+ Optional pickingObjectDTO = this.mPickingList.getValue().stream()
+ .filter(x -> x.getWithdrawMtbColrs().stream()
+ .anyMatch(y -> y == mtbColrToUpdate))
+ .findFirst();
if (pickingObjectDTO.isPresent()) {
pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToUpdate);
@@ -1437,9 +1507,9 @@ public class SpedizioneViewModel {
.setMtbColrToDelete(mtbColrToDelete);
this.mColliScaricoRESTConsumer.deleteUDSRow(deleteUDSRowRequestoDTO, () -> {
- Optional pickingObjectDTO = Stream.of(this.mPickingList.getValue())
- .filter(x -> Stream.of(x.getWithdrawMtbColrs()).anyMatch(y -> y == mtbColrToDelete))
- .findSingle();
+ Optional pickingObjectDTO = this.mPickingList.getValue().stream()
+ .filter(x -> x.getWithdrawMtbColrs().stream().anyMatch(y -> y == mtbColrToDelete))
+ .findFirst();
if (pickingObjectDTO.isPresent()) {
pickingObjectDTO.get().getWithdrawMtbColrs().remove(mtbColrToDelete);
@@ -1485,7 +1555,7 @@ public class SpedizioneViewModel {
positionedMtbColts -> {
this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts, () -> {
- Stream.of(positionedMtbColts)
+ positionedMtbColts.stream()
.filter(x -> !this.mColliRegistrati.contains(x))
.forEach(x -> this.mColliRegistrati.add(x));
@@ -1514,7 +1584,8 @@ public class SpedizioneViewModel {
clonedLuToClose.setMtbColr(null);
String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
- if(mTestateOrdini != null && !mTestateOrdini.isEmpty()) codMdep = mTestateOrdini.get(0).getCodMdep();
+ if (mTestateOrdini != null && !mTestateOrdini.isEmpty())
+ codMdep = mTestateOrdini.get(0).getCodMdep();
var closeUDSRequestDto = new CloseUDSRequestDTO()
.setMtbColt(clonedLuToClose)
@@ -1716,7 +1787,7 @@ public class SpedizioneViewModel {
private void postCloseOperations(List mtbColtList) {
if (mTestateOrdini != null) {
for (MtbColt mtbColt : mtbColtList) {
- Stream.of(mTestateOrdini)
+ mTestateOrdini.stream()
.filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrdD().equals(mtbColt.getDataOrdD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum())
.forEach(x -> x.setExistColloBoolean(true));
}
@@ -1735,7 +1806,17 @@ public class SpedizioneViewModel {
if (pickingObjectDTO.getMtbColts() != null) {
- Optional optionalMtbColrReference = Stream.of(pickingObjectDTO.getMtbColts()).filter(y -> withdrawMtbColr.getRefMtbColr() != null && withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) && withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) && withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) && withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) && UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodMart() : null) && UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodTagl(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodTagl() : null) && UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodCol(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodCol() : null)).map(y -> y.getMtbColr().get(0)).findFirst();
+ Optional optionalMtbColrReference = pickingObjectDTO.getMtbColts().stream()
+ .filter(y -> withdrawMtbColr.getRefMtbColr() != null &&
+ withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) &&
+ withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) &&
+ withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) &&
+ withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) &&
+ UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && !y.getMtbColr().isEmpty() ? y.getMtbColr().get(0).getCodMart() : null) &&
+ UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodTagl(), y.getMtbColr() != null && !y.getMtbColr().isEmpty() ? y.getMtbColr().get(0).getCodTagl() : null) &&
+ UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodCol(), y.getMtbColr() != null && !y.getMtbColr().isEmpty() ? y.getMtbColr().get(0).getCodCol() : null))
+ .map(y -> y.getMtbColr().get(0))
+ .findFirst();
if (optionalMtbColrReference.isPresent()) {
@@ -1783,11 +1864,13 @@ public class SpedizioneViewModel {
onOrderClosedPrintingDone();
return;
}
- List closedOrders = Stream.of(this.mTestateOrdini).map(ord -> {
- DtbOrdt ordV = new DtbOrdt();
- ordV.setDataOrd(ord.getDataOrdS()).setNumOrd(ord.getNumOrd()).setGestione(ord.getGestione()).setCodAnag(ord.getCodAnagOrd());
- return ordV;
- }).toList();
+ List closedOrders = this.mTestateOrdini.stream()
+ .map(ord -> new DtbOrdt()
+ .setDataOrd(ord.getDataOrdS())
+ .setNumOrd(ord.getNumOrd())
+ .setGestione(ord.getGestione())
+ .setCodAnag(ord.getCodAnagOrd())
+ ).toList();
dto.setPrintList(closedOrders);
printClosedOrders(dto, this::onOrderClosedPrintingDone, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));
@@ -1798,6 +1881,23 @@ public class SpedizioneViewModel {
}
+ public void registraImballi(VtbVett vettore, List imballi) {
+ this.sendOnLoadingStarted();
+
+ var inputData = imballi.stream()
+ .map(x -> new ImballoQuantityDTO()
+ .setQta(x.getQta().get())
+ .setCodMart(x.getCodMart().get()))
+ .collect(Collectors.toList());
+
+ mImballiRESTConsumer.registraScarico(
+ vettore != null ? vettore.getCodVvet() : null, inputData,
+ () -> {
+ this.sendOnLoadingEnded();
+ }, this::sendError);
+ }
+
+
public MutableLiveData> getPickingList() {
return mPickingList;
}
@@ -1806,11 +1906,24 @@ public class SpedizioneViewModel {
return (ArrayList) this.mColliRegistrati;
}
- void createDocs() {
+ public VtbVett getDefaultVettore() {
+ return mDefaultVettore;
+ }
+ void createDocs() {
var loadCollidto = new LoadColliDTO();
- var codAnag = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getCodAnagOrd).withoutNulls().distinctBy(x -> x).findFirst().get();
- var codVdes = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getCodVdes).withoutNulls().distinctBy(x -> x).findFirst().get();
+
+ var codAnag = mTestateOrdini.stream().map(OrdineUscitaInevasoDTO::getCodAnagOrd)
+ .filter(Objects::nonNull)
+ .distinct()
+ .findFirst()
+ .get();
+
+ var codVdes = mTestateOrdini.stream().map(OrdineUscitaInevasoDTO::getCodVdes)
+ .filter(Objects::nonNull)
+ .distinct()
+ .findFirst()
+ .get();
loadCollidto.setColli(getCreatedMtbColts());
loadCollidto.setCodDtip(SettingsManager.iDB().getCodDtipOrdTrasfV());
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownAdapter.java b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownAdapter.java
new file mode 100644
index 00000000..54f9078d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownAdapter.java
@@ -0,0 +1,121 @@
+package it.integry.integrywmsnative.ui.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Filter;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.databinding.ArrayAdapterTwoLinesItemBinding;
+
+public class SimpleAutoCompleteTwoLinesDropdownAdapter extends ArrayAdapter> {
+
+ private List> mObjects;
+
+ public SimpleAutoCompleteTwoLinesDropdownAdapter(@NonNull Context context, int resource) {
+ super(context, resource);
+ }
+
+ public SimpleAutoCompleteTwoLinesDropdownAdapter(@NonNull Context context, @NonNull SimpleAutoCompleteTwoLinesDropdownListModel[] objects) {
+ super(context, R.layout.array_adapter_two_lines_item, objects);
+ mObjects = Arrays.asList(objects);
+ }
+
+ public SimpleAutoCompleteTwoLinesDropdownAdapter(@NonNull Context context, @NonNull List> objects) {
+ super(context, R.layout.array_adapter_two_lines_item, objects);
+ mObjects = objects;
+ }
+
+ @NonNull
+ @Override
+ public Filter getFilter() {
+ return new StringFilter(mObjects);
+ }
+
+
+ @NonNull
+ @Override
+ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+ SimpleAutoCompleteTwoLinesDropdownListModel item = mObjects.get(position);
+ // Check if an existing view is being reused, otherwise inflate the view
+ ArrayAdapterTwoLinesItemBinding bindings = ArrayAdapterTwoLinesItemBinding.inflate(LayoutInflater.from(getContext()), parent, false);
+
+// if (convertView == null) {
+// bindings = ArrayAdapterTwoLinesItemBinding.inflate(LayoutInflater.from(getContext()), parent, false);
+// convertView = bindings.getRoot();
+// convertView.setTag(bindings);
+// } else {
+// bindings = (ArrayAdapterTwoLinesItemBinding) convertView.getTag();
+// }
+
+ // Populate the data into the template view using the data object
+ bindings.itemTitle.setText(item.getTitle());
+ bindings.itemDescription.setText(item.getDescription());
+
+ return bindings.getRoot();
+ }
+
+ private class StringFilter extends Filter {
+
+ private ArrayList> sourceObjects;
+
+ public StringFilter(List> objects) {
+ if(objects == null) return;
+ sourceObjects = new ArrayList<>();
+
+ synchronized (this) {
+ sourceObjects.addAll(objects);
+ }
+ }
+
+ @Override
+ protected FilterResults performFiltering(CharSequence chars) {
+ String filterSeq = chars.toString().toLowerCase();
+ FilterResults result = new FilterResults();
+ if (!filterSeq.isEmpty()) {
+ ArrayList> filter = new ArrayList<>();
+
+ for (SimpleAutoCompleteTwoLinesDropdownListModel object : sourceObjects) {
+ // the filtering itself:
+ if (object.getDescription().toLowerCase().contains(filterSeq) ||
+ object.getTitle().toLowerCase().contains(filterSeq))
+ filter.add(object);
+ }
+
+ result.count = filter.size();
+ result.values = filter;
+ } else {
+ // add all objects
+ synchronized (this) {
+ result.values = sourceObjects;
+ result.count = sourceObjects.size();
+ }
+ }
+ return result;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void publishResults(CharSequence constraint,
+ FilterResults results) {
+ // NOTE: this function is *always* called from the UI thread.
+ if(constraint != null && constraint.length() > 2) {
+ ArrayList> filtered = (ArrayList>) results.values;
+ notifyDataSetChanged();
+ clear();
+ for (int i = 0, l = filtered.size(); i < l; i++)
+ add(filtered.get(i));
+ notifyDataSetInvalidated();
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownListModel.java b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownListModel.java
new file mode 100644
index 00000000..9b3bbe4f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/adapter/SimpleAutoCompleteTwoLinesDropdownListModel.java
@@ -0,0 +1,36 @@
+package it.integry.integrywmsnative.ui.adapter;
+
+public class SimpleAutoCompleteTwoLinesDropdownListModel {
+
+ private String title;
+ private String description;
+
+ private T originalModel;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public SimpleAutoCompleteTwoLinesDropdownListModel setTitle(String title) {
+ this.title = title;
+ return this;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public SimpleAutoCompleteTwoLinesDropdownListModel setDescription(String description) {
+ this.description = description;
+ return this;
+ }
+
+ public T getOriginalModel() {
+ return originalModel;
+ }
+
+ public SimpleAutoCompleteTwoLinesDropdownListModel setOriginalModel(T originalModel) {
+ this.originalModel = originalModel;
+ return this;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdModule.java
index 2abc462d..2458266c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdModule.java
@@ -2,13 +2,14 @@ package it.integry.integrywmsnative.view.dialogs.ask_linea_prod;
import dagger.Module;
import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@Module(subcomponents = DialogAskLineaProdComponent.class)
public class DialogAskLineaProdModule {
@Provides
- DialogAskLineaProdViewModel providesDialogAskLineaProdViewModel() {
- return new DialogAskLineaProdViewModel();
+ DialogAskLineaProdViewModel providesDialogAskLineaProdViewModel(BarcodeRESTConsumer barcodeRESTConsumer) {
+ return new DialogAskLineaProdViewModel(barcodeRESTConsumer);
}
}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdView.java
index 91d2885b..2b0709b0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdView.java
@@ -21,13 +21,14 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.databinding.DialogAskLineaProdBinding;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto.DialogAskLineaProdResponse;
public class DialogAskLineaProdView extends BaseDialogFragment implements DialogAskLineaProdViewModel.Listener {
@Inject
DialogAskLineaProdViewModel mViewModel;
- private final RunnableArgs onComplete;
+ private final RunnableArgs onComplete;
private final Runnable onAbort;
private DialogAskLineaProdBinding mBindings;
@@ -37,11 +38,11 @@ public class DialogAskLineaProdView extends BaseDialogFragment implements Dialog
private int mBarcodeScannerIstanceID;
//Pass here all external parameters
- public static DialogAskLineaProdView newInstance(RunnableArgs onComplete, Runnable onAbort) {
+ public static DialogAskLineaProdView newInstance(RunnableArgs onComplete, Runnable onAbort) {
return new DialogAskLineaProdView(onComplete, onAbort);
}
- private DialogAskLineaProdView(RunnableArgs onComplete, Runnable onAbort) {
+ private DialogAskLineaProdView(RunnableArgs onComplete, Runnable onAbort) {
super();
this.onComplete = onComplete;
this.onAbort = onAbort;
@@ -101,8 +102,8 @@ public class DialogAskLineaProdView extends BaseDialogFragment implements Dialog
};
@Override
- public void onProductionLineSelected(String codJfas) {
- this.onComplete.run(codJfas);
+ public void onProductionLineSelected(DialogAskLineaProdResponse response) {
+ this.onComplete.run(response);
requireActivity().runOnUiThread(this::dismiss);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java
index c7510621..2c518cd1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java
@@ -1,37 +1,86 @@
package it.integry.integrywmsnative.view.dialogs.ask_linea_prod;
+import javax.inject.Inject;
+
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import it.integry.integrywmsnative.core.exception.InvalidLineaProdBarcodeException;
import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityPosizione;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto.DialogAskLineaProdResponse;
public class DialogAskLineaProdViewModel {
private Listener mListener;
+ private final BarcodeRESTConsumer barcodeRESTConsumer;
+
+ @Inject
+ public DialogAskLineaProdViewModel(BarcodeRESTConsumer barcodeRESTConsumer) {
+ this.barcodeRESTConsumer = barcodeRESTConsumer;
+ }
+
+
public void processBarcodeDTO(BarcodeScanDTO data, Runnable onComplete) {
- if (UtilityBarcode.isEtichettaPosizione(data)) {
-
- MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(data.getStringValue());
-
- if (foundPosizione == null || !foundPosizione.isFlagLineaProduzione()) {
- this.sendError(new InvalidLineaProdBarcodeException(data.getStringValue()));
- onComplete.run();
- return;
- }
-
- onComplete.run();
- this.sendOnProductionLineSelected(foundPosizione.getPosizione());
-
+ if (UtilityBarcode.isEtichetta128(data)) {
+ this.executeEtichettaEan128(data, onComplete);
+ } else if (UtilityBarcode.isEtichettaPosizione(data)) {
+ executeEtichettaPosizione(data, onComplete);
} else {
this.sendError(new NoResultFromBarcodeException());
onComplete.run();
}
}
+ private void executeEtichettaEan128(BarcodeScanDTO data, Runnable onComplete) {
+ this.barcodeRESTConsumer.decodeEan128(data, ean128Model -> {
+
+ if (UtilityString.isNullOrEmpty(ean128Model.Internal2)) {
+ this.sendError(new InvalidLineaProdBarcodeException("Id lotto non presente"));
+ onComplete.run();
+ return;
+ }
+
+ if (UtilityString.isNullOrEmpty(ean128Model.Internal3)) {
+ this.sendError(new InvalidLineaProdBarcodeException("Fase non presente"));
+ onComplete.run();
+ return;
+ }
+
+ MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(ean128Model.Internal3);
+
+ if (foundPosizione == null || !foundPosizione.isFlagLineaProduzione()) {
+ this.sendError(new InvalidLineaProdBarcodeException(ean128Model.Internal3));
+ onComplete.run();
+ return;
+ }
+
+ onComplete.run();
+ this.sendOnProductionLineSelected(
+ new DialogAskLineaProdResponse(foundPosizione.getPosizione(), Integer.parseInt(ean128Model.Internal2)));
+
+
+ }, this::sendError);
+ }
+
+ private void executeEtichettaPosizione(BarcodeScanDTO data, Runnable onComplete) {
+ MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(data.getStringValue());
+
+ if (foundPosizione == null || !foundPosizione.isFlagLineaProduzione()) {
+ this.sendError(new InvalidLineaProdBarcodeException(data.getStringValue()));
+ onComplete.run();
+ return;
+ }
+
+ onComplete.run();
+ this.sendOnProductionLineSelected(new DialogAskLineaProdResponse(foundPosizione.getPosizione(), null));
+ }
+
+
public DialogAskLineaProdViewModel setListener(Listener listener) {
this.mListener = listener;
return this;
@@ -45,8 +94,8 @@ public class DialogAskLineaProdViewModel {
if (this.mListener != null) mListener.onLoadingEnded();
}
- private void sendOnProductionLineSelected(String codJfas) {
- if (this.mListener != null) mListener.onProductionLineSelected(codJfas);
+ private void sendOnProductionLineSelected(DialogAskLineaProdResponse response) {
+ if (this.mListener != null) mListener.onProductionLineSelected(response);
}
private void sendError(Exception ex) {
@@ -55,6 +104,7 @@ public class DialogAskLineaProdViewModel {
public interface Listener extends ILoadingListener {
void onError(Exception ex);
- void onProductionLineSelected(String codJfas);
+
+ void onProductionLineSelected(DialogAskLineaProdResponse response);
}
}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/dto/DialogAskLineaProdResponse.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/dto/DialogAskLineaProdResponse.java
new file mode 100644
index 00000000..4bb3585d
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/dto/DialogAskLineaProdResponse.java
@@ -0,0 +1,23 @@
+package it.integry.integrywmsnative.view.dialogs.ask_linea_prod.dto;
+
+public class DialogAskLineaProdResponse {
+
+
+ private String posizione;
+ private final Integer idLotto;
+
+
+ public DialogAskLineaProdResponse(String posizione, Integer idLotto) {
+ this.posizione = posizione;
+ this.idLotto = idLotto;
+ }
+
+ public String getPosizione() {
+ return posizione;
+ }
+
+ public Integer getIdLotto() {
+ return idLotto;
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_versamento_automatico_ul/DialogAskShouldVersamentoAutomaticoULView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_versamento_automatico_ul/DialogAskShouldVersamentoAutomaticoULView.java
index f201a127..b9e78f1b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_versamento_automatico_ul/DialogAskShouldVersamentoAutomaticoULView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_versamento_automatico_ul/DialogAskShouldVersamentoAutomaticoULView.java
@@ -1,17 +1,14 @@
package it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul;
-import android.content.DialogInterface;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
+import android.app.Dialog;
+import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.jetbrains.annotations.NotNull;
@@ -22,10 +19,9 @@ import it.integry.integrywmsnative.databinding.DialogAskShouldVersamentoAutomati
public class DialogAskShouldVersamentoAutomaticoULView extends BaseDialogFragment {
- private RunnableArgs mOnDismiss;
+ private final RunnableArgs mOnDismiss;
private DialogAskShouldVersamentoAutomaticoUlBinding mBindings;
-
- private boolean returnValue = false;
+ private Context mContext;
public static DialogAskShouldVersamentoAutomaticoULView newInstance(@NotNull RunnableArgs onDismiss) {
return new DialogAskShouldVersamentoAutomaticoULView(onDismiss);
@@ -37,39 +33,32 @@ public class DialogAskShouldVersamentoAutomaticoULView extends BaseDialogFragmen
this.mOnDismiss = onDismiss;
}
- @Nullable
+
+ @NonNull
@Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_should_versamento_automatico_ul, container, false);
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ this.mContext = requireContext();
+
+ mBindings = DialogAskShouldVersamentoAutomaticoUlBinding.inflate(LayoutInflater.from(this.mContext), null, false);
mBindings.setLifecycleOwner(this);
-
- getDialog().setCanceledOnTouchOutside(false);
- getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
- getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-
mBindings.setView(this);
- return mBindings.getRoot();
- }
+ setCancelable(false);
- @Override
- public void onDismiss(@NonNull DialogInterface dialog) {
- super.onDismiss(dialog);
+ var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+ .setView(mBindings.getRoot())
+ .setCancelable(isCancelable())
+ .setNegativeButton(R.string.no, (dialog, which) -> {
+ this.mOnDismiss.run(false);
+ })
+ .setPositiveButton(R.string.yes, (dialog, which) -> {
+ this.mOnDismiss.run(true);
+ })
+ .create();
- if (mOnDismiss != null) {
- this.mOnDismiss.run(returnValue);
- }
- }
-
-
- public void confirm() {
- this.returnValue = true;
- dismiss();
- }
-
- public void abort() {
- this.returnValue = false;
- dismiss();
+ alertDialog.setCanceledOnTouchOutside(isCancelable());
+ alertDialog.setOnShowListener(this);
+ return alertDialog;
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreComponent.java
new file mode 100644
index 00000000..b82c278f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_vettore;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskVettoreComponent {
+
+ @Subcomponent.Factory
+ interface Factory {
+ DialogAskVettoreComponent create();
+ }
+
+ void inject(DialogAskVettoreView dialogAskVettoreView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreModule.java
new file mode 100644
index 00000000..611e0827
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreModule.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.view.dialogs.ask_vettore;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.VettoriRESTConsumer;
+
+@Module(subcomponents = DialogAskVettoreComponent.class)
+public class DialogAskVettoreModule {
+
+ @Provides
+ DialogAskVettoreViewModel providesDialogAskVettoreViewModel(VettoriRESTConsumer vettoriRESTConsumer) {
+ return new DialogAskVettoreViewModel(vettoriRESTConsumer);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreView.java
new file mode 100644
index 00000000..b2a0adca
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreView.java
@@ -0,0 +1,147 @@
+package it.integry.integrywmsnative.view.dialogs.ask_vettore;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.ListPopupWindow;
+import androidx.databinding.ObservableField;
+import androidx.databinding.ObservableList;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Comparator;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.VtbVett;
+import it.integry.integrywmsnative.databinding.DialogAskVettoreBinding;
+import it.integry.integrywmsnative.ui.adapter.SimpleAutoCompleteTwoLinesDropdownAdapter;
+import it.integry.integrywmsnative.ui.adapter.SimpleAutoCompleteTwoLinesDropdownListModel;
+
+public class DialogAskVettoreView extends BaseDialogFragment implements DialogAskVettoreViewModel.Listener {
+
+
+ @Inject
+ DialogAskVettoreViewModel mViewModel;
+
+ private ListPopupWindow listPopupWindow;
+
+ private DialogAskVettoreBinding mBindings;
+ private Context mContext;
+
+ private final RunnableArgs onComplete;
+
+ public ObservableField selectedVettore = new ObservableField<>();
+
+ //Pass here all external parameters
+ public static DialogAskVettoreView newInstance(VtbVett preselectedVett, @NotNull RunnableArgs onComplete) {
+ return new DialogAskVettoreView(preselectedVett, onComplete);
+ }
+
+ private DialogAskVettoreView(VtbVett preselectedVett, @NotNull RunnableArgs onComplete) {
+ super();
+
+ this.selectedVettore.set(preselectedVett);
+ this.onComplete = onComplete;
+
+ MainApplication.appComponent
+ .dialogAskVettoreComponent()
+ .create()
+ .inject(this);
+ }
+
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ this.mContext = requireContext();
+
+ mBindings = DialogAskVettoreBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+ mBindings.setLifecycleOwner(this);
+ mBindings.setView(this);
+ mBindings.setViewmodel(mViewModel);
+
+ setCancelable(false);
+
+ var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+ .setView(mBindings.getRoot())
+ .setNeutralButton(R.string.skip, (dialog, which) -> {
+ if(this.onComplete != null) this.onComplete.run(null);
+ })
+ .setPositiveButton(R.string.confirm, (dialog, which) -> {
+ if(this.onComplete != null) this.onComplete.run(selectedVettore.get());
+ })
+ .setCancelable(isCancelable())
+ .create();
+
+ alertDialog.setCanceledOnTouchOutside(isCancelable());
+ alertDialog.setOnShowListener(this);
+ return alertDialog;
+ }
+
+
+ @Override
+ public void onInit(DialogInterface dialogInterface) {
+ super.onInit(dialogInterface);
+
+ mViewModel
+ .setListener(this)
+ .init();
+
+ listPopupWindow = new ListPopupWindow(requireActivity());
+ listPopupWindow.setAnchorView(mBindings.buttonVettore);
+
+ mViewModel.getVettoriDisponibili().addOnListChangedCallback(new OnListGeneralChangedCallback() {
+ @Override
+ public void onChanged(ObservableList sender) {
+ var list = mViewModel.getVettoriDisponibili().stream()
+ .sorted(Comparator.comparing(VtbVett::getCodVvet))
+ .map(x -> new SimpleAutoCompleteTwoLinesDropdownListModel()
+ .setTitle(x.getCodVvet())
+ .setDescription(x.getRagSoc())
+ .setOriginalModel(x))
+ .collect(Collectors.toList());
+
+ list.add(0, new SimpleAutoCompleteTwoLinesDropdownListModel()
+ .setTitle("")
+ .setDescription("Nessuna selezione")
+ .setOriginalModel(null));
+
+ requireActivity().runOnUiThread(() -> {
+
+ listPopupWindow.setAdapter(new SimpleAutoCompleteTwoLinesDropdownAdapter<>(requireActivity(), list));
+
+ listPopupWindow.setOnItemClickListener((parent, view, position, id) -> {
+ if(position == 0)
+ selectedVettore.set(null);
+ else selectedVettore.set(list.get(position).getOriginalModel());
+
+ listPopupWindow.dismiss();
+ });
+ });
+ }
+ });
+
+
+ }
+
+ public void togglePopupShow() {
+ if(this.listPopupWindow.isShowing())
+ this.listPopupWindow.dismiss();
+ else
+ this.listPopupWindow.show();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreViewModel.java
new file mode 100644
index 00000000..7774a507
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_vettore/DialogAskVettoreViewModel.java
@@ -0,0 +1,58 @@
+package it.integry.integrywmsnative.view.dialogs.ask_vettore;
+
+import androidx.databinding.ObservableArrayList;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.VtbVett;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.rest.consumers.VettoriRESTConsumer;
+
+public class DialogAskVettoreViewModel {
+
+ private final VettoriRESTConsumer vettoriRESTConsumer;
+
+ private final ObservableArrayList vettoriDisponibili = new ObservableArrayList<>();
+
+ private Listener mListener;
+
+ public DialogAskVettoreViewModel(VettoriRESTConsumer vettoriRESTConsumer) {
+ this.vettoriRESTConsumer = vettoriRESTConsumer;
+ }
+
+
+ public void init() {
+ this.vettoriRESTConsumer.retrieveRecentlyUsedInOrders(GestioneEnum.VENDITA, recentlyUsedVett -> {
+
+ if (recentlyUsedVett == null || recentlyUsedVett.isEmpty())
+ return;
+
+ vettoriDisponibili.addAll(recentlyUsedVett);
+ }, this::sendError);
+ }
+
+ public ObservableArrayList getVettoriDisponibili() {
+ return vettoriDisponibili;
+ }
+
+ private void sendOnLoadingStarted() {
+ if (this.mListener != null) mListener.onLoadingStarted();
+ }
+
+ private void sendOnLoadingEnded() {
+ if (this.mListener != null) mListener.onLoadingEnded();
+ }
+
+ private void sendError(Exception ex) {
+ if (this.mListener != null) mListener.onError(ex);
+ }
+
+ public DialogAskVettoreViewModel setListener(Listener listener) {
+ this.mListener = listener;
+ return this;
+ }
+
+ interface Listener extends ILoadingListener {
+ void onError(Exception ex);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java
index 0f4aea1d..27bb2a77 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUModule.java
@@ -2,14 +2,14 @@ package it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu;
import dagger.Module;
import dagger.Provides;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
@Module(subcomponents = DialogInfoAggiuntiveLUComponent.class)
public class DialogInfoAggiuntiveLUModule {
@Provides
- DialogInfoAggiuntiveLUViewModel providesDialogInfoAggiuntiveLUViewModel(MagazzinoRESTConsumer magazzinoRESTConsumer) {
- return new DialogInfoAggiuntiveLUViewModel(magazzinoRESTConsumer);
+ DialogInfoAggiuntiveLUViewModel providesDialogInfoAggiuntiveLUViewModel(ImballiRESTConsumer imballiRESTConsumer) {
+ return new DialogInfoAggiuntiveLUViewModel(imballiRESTConsumer);
}
}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java
index ef85fd11..3adbb8f6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUView.java
@@ -6,6 +6,7 @@ import android.content.DialogInterface;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.WindowManager;
import android.widget.AdapterView;
import androidx.annotation.NonNull;
@@ -98,19 +99,20 @@ public class DialogInfoAggiuntiveLUView extends BaseDialogFragment implements Di
alertDialog.setCanceledOnTouchOutside(isCancelable());
alertDialog.setOnShowListener(this);
+
+ alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
return alertDialog;
}
@Override
- public void onShow(DialogInterface dialogInterface) {
- super.onShow(dialogInterface);
+ public void onInit(DialogInterface dialogInterface) {
+ super.onInit(dialogInterface);
this.init();
this.mViewModel.init();
}
-
private void init() {
if (this.currentMtbColt != null)
this.additionalNotes.set(currentMtbColt.getAnnotazioni());
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java
index 267649a3..08710e40 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/info_aggiuntive_lu/DialogInfoAggiuntiveLUViewModel.java
@@ -2,32 +2,33 @@ package it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu;
import androidx.lifecycle.MutableLiveData;
+import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
import it.integry.integrywmsnative.core.model.MtbTCol;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
public class DialogInfoAggiuntiveLUViewModel {
private final MutableLiveData> tipiCollo = new MutableLiveData<>();
private Listener mListener;
- private final MagazzinoRESTConsumer mMagazzinoRESTConsumer;
+ private final ImballiRESTConsumer imballiRESTConsumer;
@Inject
- public DialogInfoAggiuntiveLUViewModel(MagazzinoRESTConsumer mMagazzinoRESTConsumer) {
- this.mMagazzinoRESTConsumer = mMagazzinoRESTConsumer;
+ public DialogInfoAggiuntiveLUViewModel(ImballiRESTConsumer imballiRESTConsumer) {
+ this.imballiRESTConsumer = imballiRESTConsumer;
}
public void init() {
this.sendOnLoadingStarted();
- mMagazzinoRESTConsumer.getTipiCollo(tipiCollo -> {
- this.tipiCollo.postValue(tipiCollo);
+ imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> {
+ this.tipiCollo.postValue(tipiCollo == null ? new ArrayList<>() : tipiCollo);
this.sendOnLoadingEnded();
}, this::sendError);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdModule.java
index 53bac67c..90cad7d9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdModule.java
@@ -2,15 +2,15 @@ package it.integry.integrywmsnative.view.dialogs.input_lu_prod;
import dagger.Module;
import dagger.Provides;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
@Module(subcomponents = DialogInputLUProdComponent.class)
public class DialogInputLUProdModule {
@Provides
- DialogInputLUProdViewModel providesDialogInputLUProdViewModel(MagazzinoRESTConsumer magazzinoRESTConsumer, MesRESTConsumer mesRESTConsumer) {
- return new DialogInputLUProdViewModel(magazzinoRESTConsumer, mesRESTConsumer);
+ DialogInputLUProdViewModel providesDialogInputLUProdViewModel(ImballiRESTConsumer imballiRESTConsumer, MesRESTConsumer mesRESTConsumer) {
+ return new DialogInputLUProdViewModel(imballiRESTConsumer, mesRESTConsumer);
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
index f87b2999..4f198759 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
@@ -12,12 +12,12 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
import it.integry.integrywmsnative.core.model.JtbFasi;
import it.integry.integrywmsnative.core.model.MtbAart;
import it.integry.integrywmsnative.core.model.MtbTCol;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
import it.integry.integrywmsnative.view.dialogs.exception.InvalidGrossWeightQuantityException;
-import it.integry.integrywmsnative.view.dialogs.exception.InvalidProductionLineException;
import it.integry.integrywmsnative.view.dialogs.exception.InvalidNumCnfQuantityException;
+import it.integry.integrywmsnative.view.dialogs.exception.InvalidProductionLineException;
public class DialogInputLUProdViewModel {
@@ -50,19 +50,19 @@ public class DialogInputLUProdViewModel {
private Listener mListener;
- private final MagazzinoRESTConsumer mMagazzinoRESTConsumer;
+ private final ImballiRESTConsumer imballiRESTConsumer;
private final MesRESTConsumer mMesRESTConsumer;
@Inject
- public DialogInputLUProdViewModel(MagazzinoRESTConsumer magazzinoRESTConsumer, MesRESTConsumer mesRESTConsumer) {
- this.mMagazzinoRESTConsumer = magazzinoRESTConsumer;
+ public DialogInputLUProdViewModel(ImballiRESTConsumer imballiRESTConsumer, MesRESTConsumer mesRESTConsumer) {
+ this.imballiRESTConsumer = imballiRESTConsumer;
this.mMesRESTConsumer = mesRESTConsumer;
}
public void init(String codJfasParent) {
- new Thread(this::sendOnLoadingStarted).start();
+ this.sendOnLoadingStarted();
- mMagazzinoRESTConsumer.getTipiCollo(tipiCollo -> {
+ imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, tipiCollo -> {
this.mTipiColloLiveData.postValue(tipiCollo);
mMesRESTConsumer.getLineeProduzione(codJfasParent, jtbFasi -> {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
index b2e7a787..da86ff71 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java
@@ -24,7 +24,7 @@ import it.integry.integrywmsnative.core.di.BindableString;
import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
import it.integry.integrywmsnative.core.model.MtbTCol;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityNumber;
import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
@@ -35,7 +35,7 @@ public class DialogInputPesoLUView extends BaseDialogFragment {
DialogInputPesoLUViewModel mViewModel;
@Inject
- MagazzinoRESTConsumer magazzinoRESTConsumer;
+ ImballiRESTConsumer imballiRESTConsumer;
private DialogInputPesoLuBinding mBindings;
private Context mContext;
@@ -98,7 +98,7 @@ public class DialogInputPesoLUView extends BaseDialogFragment {
private void init() {
- magazzinoRESTConsumer.getTipiCollo(codTcols -> {
+ imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UL, codTcols -> {
this.codTcolList = codTcols;
List codTcolDescriptions = Stream.of(codTcols)
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
index 42609532..6b7af810 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
@@ -641,8 +641,7 @@ public class DialogInputQuantityV2ViewModel {
}
private MtbPartitaMag retrievePartitaMag(String partitaMag, String codMart) throws Exception {
- return mMagazzinoRESTConsumer.retrievePartitaMagSyncronized(partitaMag, codMart, this::sendError);
-
+ return mMagazzinoRESTConsumer.retrievePartitaMagSyncronized(partitaMag, codMart);
}
public DialogInputQuantityV2ResultDTO getResult() {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
index 8e0e9f72..ffd5aae7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
@@ -107,7 +107,7 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
var alertDialog = new MaterialAlertDialogBuilder(requireContext())
.setView(mBindings.getRoot())
- .setCancelable(false)
+ .setCancelable(isCancelable())
.create();
alertDialog.setCanceledOnTouchOutside(false);
alertDialog.setOnShowListener(this);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiComponent.java
new file mode 100644
index 00000000..ecfb042b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogTracciamentoImballiComponent {
+
+ @Subcomponent.Factory
+ interface Factory {
+ DialogTracciamentoImballiComponent create();
+ }
+
+ void inject(DialogTracciamentoImballiView dialogTracciamentoImballiView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java
new file mode 100644
index 00000000..37e35e76
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiModule.java
@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
+
+@Module(subcomponents = DialogTracciamentoImballiComponent.class)
+public class DialogTracciamentoImballiModule {
+
+ @Provides
+ DialogTracciamentoImballiViewModel providesDialogTracciamentoImballiViewModel(ImballiRESTConsumer imballiRESTConsumer) {
+ return new DialogTracciamentoImballiViewModel(imballiRESTConsumer);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiView.java
new file mode 100644
index 00000000..8c6a7cf2
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiView.java
@@ -0,0 +1,207 @@
+package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.databinding.ObservableBoolean;
+import androidx.databinding.ObservableList;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.OnGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.databinding.DialogTracciamentoImballiBinding;
+import it.integry.integrywmsnative.databinding.DialogTracciamentoImballiListItemModelBinding;
+import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.adapter.DialogTracciamentoImballi_TipoColloAdapter;
+
+public class DialogTracciamentoImballiView extends BaseDialogFragment implements DialogTracciamentoImballiViewModel.Listener {
+
+ @Inject
+ DialogTracciamentoImballiViewModel mViewModel;
+
+
+ public final ObservableBoolean canAddMoreItems = new ObservableBoolean(true);
+ public DialogTracciamentoImballi_TipoColloAdapter tipoColloAdapter;
+
+
+ private DialogTracciamentoImballiBinding mBindings;
+ private Context mContext;
+ private final RunnableArgs> onComplete;
+
+ //Pass here all external parameters
+ public static DialogTracciamentoImballiView newInstance(@NotNull RunnableArgs> onComplete) {
+ return new DialogTracciamentoImballiView(onComplete);
+ }
+
+ private DialogTracciamentoImballiView(@NotNull RunnableArgs> onComplete) {
+ super();
+
+ this.onComplete = onComplete;
+
+ MainApplication.appComponent
+ .dialogTracciamentoImballiComponent()
+ .create()
+ .inject(this);
+
+ }
+
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ this.mContext = requireContext();
+
+ mBindings = DialogTracciamentoImballiBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+ mBindings.setLifecycleOwner(this);
+ mBindings.setViewmodel(this.mViewModel);
+ mBindings.setView(this);
+
+ setCancelable(false);
+
+ var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+ .setView(mBindings.getRoot())
+ .setCancelable(isCancelable())
+ .setNeutralButton(R.string.action_close, null)
+ .setPositiveButton(R.string.confirm, (dialog, which) -> {
+ this.onComplete.run(this.mViewModel.getImballiRegistrati().getValue());
+ })
+ .create();
+
+ alertDialog.setCanceledOnTouchOutside(isCancelable());
+ alertDialog.setOnShowListener(this);
+ return alertDialog;
+ }
+
+
+ @Override
+ public void onInit(DialogInterface dialogInterface) {
+ super.onInit(dialogInterface);
+
+ this.initAdapter();
+ this.initRecyclerView();
+
+ this.mViewModel.getImballiRegistrati().observe(this, data -> {
+ onEditableChangedCallback.run();
+
+ data.forEach(x -> {
+ x.getEditable().removeOnPropertyChangedCallback(onEditableChangedCallback);
+ x.getEditable().addOnPropertyChangedCallback(onEditableChangedCallback);
+ });
+ });
+
+ this.mViewModel
+ .setListener(this)
+ .init();
+ }
+
+ private void initAdapter() {
+ mViewModel.getImballiDisponibili().addOnListChangedCallback(new OnListGeneralChangedCallback<>() {
+ @Override
+ public void onChanged(ObservableList sender) {
+ var list = mViewModel.getImballiDisponibili();
+
+ tipoColloAdapter = new DialogTracciamentoImballi_TipoColloAdapter(mContext, R.layout.array_adapter_single_item, list);
+ }
+ });
+
+ }
+
+ private final OnGeneralChangedCallback onEditableChangedCallback = new OnGeneralChangedCallback() {
+ @Override
+ public void run() {
+ var allNotEditable = mViewModel.getImballiRegistrati().getValue()
+ .stream()
+ .noneMatch(TracciamentoImballoDTO::isEditable);
+ canAddMoreItems.set(allNotEditable);
+ }
+ };
+
+ @Override
+ public void onShow(DialogInterface dialogInterface) {
+ super.onShow(dialogInterface);
+
+ //StackOverflow
+ //The problem seems to be (at least in my case), that since the place where you enter text
+ // is hidden initially (or nested or something), AlertDialog is automatically setting the
+ // flag WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM (or some combination of that and
+ // WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) so that things don't trigger
+ // a soft input to show up.
+ getDialog().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+
+
+ getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+ }
+
+
+ private void initRecyclerView() {
+ var itemType = new Type(R.layout.dialog_tracciamento_imballi__list_item_model, BR.item);
+ itemType.onBind(dialogTracciamentoImballiListItemModelBindingHolder -> {
+ var itemBinding = dialogTracciamentoImballiListItemModelBindingHolder.getBinding();
+
+ itemBinding.filledExposedDropdownArticolo.setText("");
+ itemBinding.textInputQta.setText("");
+
+ itemBinding.filledExposedDropdownArticolo.setAdapter(tipoColloAdapter);
+ itemBinding.filledExposedDropdownArticolo.setOnItemClickListener((adapterView, view, i, l) -> {
+
+ var tipoCollo = ((DialogTracciamentoImballi_TipoColloAdapter.ListModel) adapterView.getItemAtPosition(i)).getOriginalModel();
+
+ itemBinding.getItem().setCodMart(tipoCollo.getCodMart())
+ .setDescrizione(tipoCollo.getDescrizione())
+ .setCodMart(tipoCollo.getCodMart());
+ });
+
+ return null;
+ });
+ itemType.onLongClick(dialogTracciamentoImballiListItemModelBindingHolder -> {
+ var popupMenu = new PopupMenu(requireContext(), dialogTracciamentoImballiListItemModelBindingHolder.itemView);
+ var inflater = popupMenu.getMenuInflater();
+ inflater.inflate(R.menu.edit_delete_menu, popupMenu.getMenu());
+
+ popupMenu.setOnMenuItemClickListener(item -> {
+ int itemId = item.getItemId();
+
+ if (itemId == R.id.edit) {
+ dialogTracciamentoImballiListItemModelBindingHolder.getBinding().getItem().setEditable(true);
+ return true;
+ } else if (itemId == R.id.delete) {
+ var itemToDelete = dialogTracciamentoImballiListItemModelBindingHolder.getBinding().getItem();
+ mViewModel.deleteImballo(itemToDelete);
+ return true;
+ }
+
+ return false;
+ });
+
+ popupMenu.show();
+
+ return null;
+ });
+ itemType.areContentsTheSame(TracciamentoImballoDTO::equals);
+
+ new LiveAdapter(this.mViewModel.getImballiRegistrati(), this)
+ .map(TracciamentoImballoDTO.class, itemType)
+ .into(this.mBindings.recyclerview);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java
new file mode 100644
index 00000000..dcfdb4aa
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/DialogTracciamentoImballiViewModel.java
@@ -0,0 +1,92 @@
+package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi;
+
+import androidx.databinding.ObservableArrayList;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer;
+
+public class DialogTracciamentoImballiViewModel {
+
+ private final ImballiRESTConsumer imballiRESTConsumer;
+
+ private final MutableLiveData> imballiRegistrati = new MutableLiveData<>(new ArrayList<>());
+ private final ObservableArrayList imballiDisponibili = new ObservableArrayList<>();
+
+ private Listener mListener;
+
+ public DialogTracciamentoImballiViewModel(ImballiRESTConsumer imballiRESTConsumer) {
+ this.imballiRESTConsumer = imballiRESTConsumer;
+ }
+
+
+ public void init() {
+ this.imballiRESTConsumer.retrieveTipiCollo(MtbTCol.FlagUiUlEnum.UI, tipiCollo -> {
+
+ if (tipiCollo == null || tipiCollo.isEmpty())
+ return;
+
+ imballiDisponibili.addAll(tipiCollo);
+ }, this::sendError);
+ }
+
+
+ public LiveData> getImballiRegistrati() {
+ return imballiRegistrati;
+ }
+
+ public ObservableArrayList getImballiDisponibili() {
+ return imballiDisponibili;
+ }
+
+ public void addNew() {
+ var tmp = imballiRegistrati.getValue();
+ tmp.add(new TracciamentoImballoDTO());
+
+ imballiRegistrati.postValue(tmp);
+ }
+
+ public void saveCurrent() {
+ var currentOpened = imballiRegistrati.getValue().stream()
+ .filter(TracciamentoImballoDTO::isEditable)
+ .findFirst()
+ .orElse(null);
+
+ currentOpened.setEditable(!currentOpened.isEditable());
+ }
+
+
+ public void deleteImballo(TracciamentoImballoDTO imballoToRemove) {
+ Objects.requireNonNull(this.imballiRegistrati.getValue()).remove(imballoToRemove);
+ imballiRegistrati.postValue(imballiRegistrati.getValue());
+ }
+
+
+ private void sendOnLoadingStarted() {
+ if (this.mListener != null) mListener.onLoadingStarted();
+ }
+
+ private void sendOnLoadingEnded() {
+ if (this.mListener != null) mListener.onLoadingEnded();
+ }
+
+ private void sendError(Exception ex) {
+ if (this.mListener != null) mListener.onError(ex);
+ }
+
+ public DialogTracciamentoImballiViewModel setListener(Listener listener) {
+ this.mListener = listener;
+ return this;
+ }
+
+ interface Listener extends ILoadingListener {
+ void onError(Exception ex);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java
new file mode 100644
index 00000000..94e39eb8
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java
@@ -0,0 +1,84 @@
+package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi;
+
+import androidx.databinding.ObservableBoolean;
+import androidx.databinding.ObservableField;
+
+public class TracciamentoImballoDTO {
+
+ private final ObservableField codTcol = new ObservableField<>();
+ private final ObservableField descrizione = new ObservableField<>();
+ private final ObservableField codMart = new ObservableField<>();
+ private final ObservableField qta = new ObservableField();
+
+ private final ObservableBoolean editable = new ObservableBoolean(true);
+
+ public ObservableField getCodTcol() {
+ return codTcol;
+ }
+
+ public ObservableField getDescrizione() {
+ return descrizione;
+ }
+
+ public ObservableField getCodMart() {
+ return codMart;
+ }
+
+ public ObservableField getQta() {
+ return qta;
+ }
+
+ public TracciamentoImballoDTO setCodTcol(String codTcol) {
+ this.codTcol.set(codTcol);
+ return this;
+ }
+
+ public TracciamentoImballoDTO setDescrizione(String descrizione) {
+ this.descrizione.set(descrizione);
+ return this;
+ }
+
+ public TracciamentoImballoDTO setCodMart(String codMart) {
+ this.codMart.set(codMart);
+ return this;
+ }
+
+ public TracciamentoImballoDTO setQta(Integer qta) {
+ this.qta.set(qta);
+ return this;
+ }
+
+ public ObservableBoolean getEditable() {
+ return editable;
+ }
+
+ public boolean isEditable() {
+ return editable.get();
+ }
+
+ public void setEditable(boolean editable) {
+ this.editable.set(editable);
+ }
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ TracciamentoImballoDTO that = (TracciamentoImballoDTO) o;
+
+ if (!getCodTcol().equals(that.getCodTcol())) return false;
+ if (!getDescrizione().equals(that.getDescrizione())) return false;
+ if (!getCodMart().equals(that.getCodMart())) return false;
+ if (!getQta().equals(that.getQta())) return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getCodTcol() != null ? getCodTcol().hashCode() : 0;
+ result = 31 * result + (getQta() != null ? getQta().hashCode() : 0);
+ return result;
+ }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java
new file mode 100644
index 00000000..a01e93e4
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/adapter/DialogTracciamentoImballi_TipoColloAdapter.java
@@ -0,0 +1,48 @@
+package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.adapter;
+
+import android.content.Context;
+import android.widget.ArrayAdapter;
+
+import androidx.annotation.NonNull;
+
+import com.annimon.stream.Stream;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbTCol;
+
+public class DialogTracciamentoImballi_TipoColloAdapter extends ArrayAdapter {
+
+ public DialogTracciamentoImballi_TipoColloAdapter(@NonNull Context context, int resource, List inputData) {
+ super(context, resource);
+
+ if(inputData == null) return;
+
+ List mDataset = Stream.of(inputData)
+ .map(x -> new ListModel()
+ .setOriginalModel(x))
+ .toList();
+
+ addAll(mDataset);
+ }
+
+ public static class ListModel {
+
+ private MtbTCol originalModel;
+
+ public MtbTCol getOriginalModel() {
+ return originalModel;
+ }
+ public ListModel setOriginalModel(MtbTCol originalModel) {
+ this.originalModel = originalModel;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return this.getOriginalModel().getDescrizione();
+ //return this.getOriginalModel().getCodDtip() + " - " + this.getOriginalModel().getDescrizione();
+ }
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/versamento_automatico_ul_done/DialogVersamentoAutomaticoULDoneView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/versamento_automatico_ul_done/DialogVersamentoAutomaticoULDoneView.java
index d54c7d2f..e288dd1d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/versamento_automatico_ul_done/DialogVersamentoAutomaticoULDoneView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/versamento_automatico_ul_done/DialogVersamentoAutomaticoULDoneView.java
@@ -1,26 +1,23 @@
package it.integry.integrywmsnative.view.dialogs.versamento_automatico_ul_done;
+import android.app.Dialog;
+import android.content.Context;
import android.content.DialogInterface;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
-import androidx.databinding.DataBindingUtil;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.jetbrains.annotations.NotNull;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
-import it.integry.integrywmsnative.core.utility.UtilityDialog;
import it.integry.integrywmsnative.databinding.DialogVersamentoAutomaticoUlDoneBinding;
public class DialogVersamentoAutomaticoULDoneView extends BaseDialogFragment {
@@ -29,6 +26,7 @@ public class DialogVersamentoAutomaticoULDoneView extends BaseDialogFragment {
private final Runnable mOnDismiss;
private DialogVersamentoAutomaticoUlDoneBinding mBindings;
+ private Context mContext;
public static DialogVersamentoAutomaticoULDoneView newInstance(@NotNull VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, @NotNull Runnable onDismiss) {
return new DialogVersamentoAutomaticoULDoneView(versamentoAutomaticoULResponseDTO, onDismiss);
@@ -41,36 +39,40 @@ public class DialogVersamentoAutomaticoULDoneView extends BaseDialogFragment {
this.mOnDismiss = onDismiss;
}
- @Nullable
+
+ @NonNull
@Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_versamento_automatico_ul_done, container, false);
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ this.mContext = requireContext();
+
+ mBindings = DialogVersamentoAutomaticoUlDoneBinding.inflate(LayoutInflater.from(this.mContext), null, false);
mBindings.setLifecycleOwner(this);
-
- getDialog().setCanceledOnTouchOutside(false);
- getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
- getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-
- UtilityDialog.setTo95PercentWidth(requireContext(), this);
-
mBindings.setView(this);
+ setCancelable(false);
+
+ var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+ .setView(mBindings.getRoot())
+ .setCancelable(isCancelable())
+ .setNeutralButton(R.string.action_close, (dialog, which) -> this.mOnDismiss.run())
+ .setPositiveButton(R.string.ok, (dialog, which) -> {
+ this.mOnDismiss.run();
+ })
+ .create();
+
+ alertDialog.setCanceledOnTouchOutside(isCancelable());
+ alertDialog.setOnShowListener(this);
+ return alertDialog;
+ }
+
+ @Override
+ public void onInit(DialogInterface dialogInterface) {
+ super.onInit(dialogInterface);
+
this.initTitle();
this.initContent();
-
- return mBindings.getRoot();
}
- @Override
- public void onDismiss(@NonNull DialogInterface dialog) {
- super.onDismiss(dialog);
-
- if (mOnDismiss != null) {
- this.mOnDismiss.run();
- }
- }
-
-
private void initTitle() {
int colorBackgroundTitle = -1;
@@ -82,8 +84,7 @@ public class DialogVersamentoAutomaticoULDoneView extends BaseDialogFragment {
colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.yellow_600);
}
-
- mBindings.base.setBackgroundColor(colorBackgroundTitle);
+ mBindings.icon.setColorFilter(colorBackgroundTitle);
}
private void initContent() {
@@ -99,72 +100,6 @@ public class DialogVersamentoAutomaticoULDoneView extends BaseDialogFragment {
}
mBindings.descriptionText.setText(Html.fromHtml(text));
-
-
-
-
-// var notCompletedListAdapter = new BaseAdapter() {
-//
-// @Override
-// public View getView(int position, View convertView, ViewGroup parent) {
-//
-// var mtbColr = versamentoAutomaticoULResponseDTO.getFailed().get(position);
-//
-// var inflater = LayoutInflater.from(requireContext());
-// DialogVersamentoAutomaticoUlDoneNotCompletedListItemBinding binding = null;
-//
-// if(convertView == null) {
-// binding = DataBindingUtil.inflate(inflater, R.layout.dialog_versamento_automatico_ul_done__not_completed_list_item, parent, false);
-// } else {
-// binding = DataBindingUtil.findBinding(convertView);
-// }
-//
-// binding.setItem(mtbColr);
-//
-// convertView = binding.getRoot();
-//
-// //Setting qty with unt_mis
-// if (!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())) {
-// String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
-//
-//
-// if (mtbColr.getMtbAart() != null) {
-// text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
-// }
-//
-// binding.qtaTextview.setText(text);
-// } else {
-// binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
-// }
-//
-// return convertView;
-// }
-//
-// @Override
-// public long getItemId(int position) {
-// return position;
-// }
-//
-// @Override
-// public Object getItem(int position) {
-// return position;
-// }
-//
-// @Override
-// public int getCount() {
-// return versamentoAutomaticoULResponseDTO.getFailed().size();
-// }
-// };
-//
-//
-// mBindings.detailsNotCompletedList.setAdapter(notCompletedListAdapter);
-
}
-
-// public void toggleDetailVisibility() {
-// mBindings.detailsContainer.toggle(true);
-// }
-
-
}
diff --git a/app/src/main/res/drawable/circular_background.xml b/app/src/main/res/drawable/circular_background.xml
new file mode 100644
index 00000000..839d093c
--- /dev/null
+++ b/app/src/main/res/drawable/circular_background.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_to_inbox.xml b/app/src/main/res/drawable/ic_add_to_inbox.xml
new file mode 100644
index 00000000..9609a558
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_to_inbox.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_assignment_turned_in_24.xml b/app/src/main/res/drawable/ic_baseline_assignment_turned_in_24.xml
index 7e570421..5d5680e4 100644
--- a/app/src/main/res/drawable/ic_baseline_assignment_turned_in_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_assignment_turned_in_24.xml
@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
- android:tint="@color/colorPrimary">
+ android:tint="?attr/colorControlNormal">
diff --git a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
index bd3f67a7..590b41e2 100644
--- a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
+++ b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
diff --git a/app/src/main/res/layout/accettazione_main_list_group_model.xml b/app/src/main/res/layout/accettazione_main_list_group_model.xml
index 71c42cc4..b4f75028 100644
--- a/app/src/main/res/layout/accettazione_main_list_group_model.xml
+++ b/app/src/main/res/layout/accettazione_main_list_group_model.xml
@@ -6,25 +6,23 @@
name="selected"
type="it.integry.integrywmsnative.core.di.BindableBoolean" />
-
-
+ android:paddingStart="2dp"
+ android:paddingEnd="4dp"
+ android:paddingVertical="2dp">
-
-
+ android:layout_height="wrap_content"
+ android:paddingStart="2dp"
+ android:background="@color/mainGreen">
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
index efca9ac0..bb2b26fa 100644
--- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
+++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
diff --git a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
index 079e221e..2c5a9d4b 100644
--- a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
+++ b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
@@ -81,7 +81,7 @@
@@ -245,11 +245,13 @@
android:visibility="visible">
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/activity_picking_inventario.xml b/app/src/main/res/layout/activity_picking_inventario.xml
index 93a609bc..d1e97950 100644
--- a/app/src/main/res/layout/activity_picking_inventario.xml
+++ b/app/src/main/res/layout/activity_picking_inventario.xml
@@ -67,7 +67,7 @@
android:id="@+id/profile_root_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorPrimary"
+ android:background="?colorPrimary"
android:orientation="horizontal"
android:padding="16dp">
diff --git a/app/src/main/res/layout/activity_picking_inventario__list_item.xml b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
index d79129ad..ea6b85ec 100644
--- a/app/src/main/res/layout/activity_picking_inventario__list_item.xml
+++ b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
@@ -114,7 +114,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
index 5d1fd624..7deee321 100644
--- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
+++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
@@ -314,11 +314,13 @@
app:layout_constraintEnd_toEndOf="parent">
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 7ef59bc9..638dcf06 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorPrimary"
+ android:background="?colorPrimary"
tools:context=".SplashActivity">
-
+ app:layout_constraintTop_toBottomOf="@id/imageView"/>
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
index f09f70ac..afa38080 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -119,7 +119,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/dialog_ask_cliente__page1.xml b/app/src/main/res/layout/dialog_ask_cliente__page1.xml
index b89e8b23..88b55468 100644
--- a/app/src/main/res/layout/dialog_ask_cliente__page1.xml
+++ b/app/src/main/res/layout/dialog_ask_cliente__page1.xml
@@ -97,7 +97,7 @@
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/input_commessa"
- app:strokeColor="@color/colorPrimary" />
+ app:strokeColor="?colorPrimary" />
+ app:strokeColor="?colorPrimary" />
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
+ android:text="Scansiona il codice a barre di una linea/lotto di produzione"/>
diff --git a/app/src/main/res/layout/dialog_ask_magazzino_prossimita.xml b/app/src/main/res/layout/dialog_ask_magazzino_prossimita.xml
index d08f7eb4..f0936ed2 100644
--- a/app/src/main/res/layout/dialog_ask_magazzino_prossimita.xml
+++ b/app/src/main/res/layout/dialog_ask_magazzino_prossimita.xml
@@ -162,7 +162,7 @@
android:layout_height="wrap_content"
style="@style/Button.PrimaryOutline"
app:icon="@drawable/ic_clear_24dp"
- app:strokeColor="@color/colorPrimary"
+ app:strokeColor="?colorPrimary"
android:layout_marginEnd="8dp"
android:text="@string/abort"/>
diff --git a/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml b/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml
index ccec187b..b724206d 100644
--- a/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml
+++ b/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml
@@ -1,31 +1,33 @@
+
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml b/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml
index 0f986634..f92a05ae 100644
--- a/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml
+++ b/app/src/main/res/layout/dialog_ask_position_of_lu__page2.xml
@@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Button.PrimaryOutline"
- app:strokeColor="@color/colorPrimary"
+ app:strokeColor="?colorPrimary"
android:layout_marginEnd="8dp"
android:text="@string/abort"/>
diff --git a/app/src/main/res/layout/dialog_ask_should_print.xml b/app/src/main/res/layout/dialog_ask_should_print.xml
index 4a2d6653..2bdd284f 100644
--- a/app/src/main/res/layout/dialog_ask_should_print.xml
+++ b/app/src/main/res/layout/dialog_ask_should_print.xml
@@ -81,7 +81,7 @@
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:strokeColor="@color/colorPrimary" />
+ app:strokeColor="?colorPrimary" />
+
@@ -13,101 +14,41 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
- app:cardCornerRadius="12dp"
+ app:cardCornerRadius="16dp"
app:cardElevation="0dp">
+
+ android:orientation="vertical"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="16dp">
-
+
+
+
+ android:layout_marginBottom="16dp"
+ android:gravity="center_horizontal"
+ android:text="@string/versamento_automatico" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:gravity="center_horizontal"
+ android:text="@string/ask_should_versamento_automatico" />
diff --git a/app/src/main/res/layout/dialog_ask_vettore.xml b/app/src/main/res/layout/dialog_ask_vettore.xml
new file mode 100644
index 00000000..6c1f6da7
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ask_vettore.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_available_intventario_items__item_model.xml b/app/src/main/res/layout/dialog_available_intventario_items__item_model.xml
index fe443ded..fdb769ac 100644
--- a/app/src/main/res/layout/dialog_available_intventario_items__item_model.xml
+++ b/app/src/main/res/layout/dialog_available_intventario_items__item_model.xml
@@ -35,7 +35,7 @@
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/already_inventariato"
android:text="@{item.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml
index 800e6e51..c7a6743f 100644
--- a/app/src/main/res/layout/dialog_base.xml
+++ b/app/src/main/res/layout/dialog_base.xml
@@ -191,7 +191,7 @@
-
+
@@ -236,7 +236,7 @@
-
+
diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
index 5e0d56e5..76a632d1 100644
--- a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text"
@@ -121,7 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml
index a50e5ef3..2cb0bacc 100644
--- a/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:layout_gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/dialog_basket_lu__page2.xml b/app/src/main/res/layout/dialog_basket_lu__page2.xml
index 604a52ba..17a80322 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page2.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__page2.xml
@@ -116,7 +116,7 @@
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:strokeColor="@color/colorPrimary" />
+ app:strokeColor="?colorPrimary" />
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml
index 53dac773..df2d8991 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -112,7 +112,7 @@
android:layout_marginStart="12dp"
android:gravity="center_horizontal"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:visibility="@{item.qta != null ? View.VISIBLE : View.GONE}">
@@ -116,7 +116,7 @@
android:layout_marginStart="8dp"
android:padding="6dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="@{item.mtbColr.qtaCol != null ? View.VISIBLE : View.GONE}">
@@ -125,7 +125,7 @@
diff --git a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
index 52185c8f..2b7a4ffe 100644
--- a/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
+++ b/app/src/main/res/layout/dialog_info_aggiuntive_lu.xml
@@ -53,7 +53,7 @@
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/title_text"
app:layout_constraintBottom_toTopOf="@id/level_number_layout"
- android:visibility="@{viewModel.tipiCollo.empty ? View.GONE : View.VISIBLE}"
+ android:visibility="@{viewModel.tipiCollo == null || viewModel.tipiCollo.empty ? View.GONE : View.VISIBLE}"
android:hint="@string/lu_type">
-
+ app:trackCornerRadius="4dp"/>
diff --git a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
index 7609120b..491b3e73 100644
--- a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
@@ -147,7 +147,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp"
@@ -158,7 +158,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textAllCaps="true"
@@ -186,7 +186,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue())}"
android:textAllCaps="true"
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
index 396ec500..810b1cfa 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
@@ -200,7 +200,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp"
@@ -211,7 +211,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textAllCaps="true"
@@ -239,7 +239,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue())}"
android:textAllCaps="true"
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
index 4b2232a9..eca0c6ce 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
@@ -66,7 +66,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp"
@@ -77,7 +77,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textAllCaps="true"
@@ -106,7 +106,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qtaOrd, item.mtbAart.firstUntMis.cifreDec.intValue())}"
android:textAllCaps="true"
diff --git a/app/src/main/res/layout/dialog_input_general.xml b/app/src/main/res/layout/dialog_input_general.xml
index d155b2a7..1c5d054f 100644
--- a/app/src/main/res/layout/dialog_input_general.xml
+++ b/app/src/main/res/layout/dialog_input_general.xml
@@ -98,7 +98,7 @@
app:layout_constraintEnd_toStartOf="@id/guide_half_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/guide_buttons_top"
- app:strokeColor="@color/colorPrimary" />
+ app:strokeColor="?colorPrimary" />
@@ -612,7 +612,7 @@
android:layout_marginStart="2dp"
android:layout_weight="0.5"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:orientation="vertical"
android:padding="8dp"
android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}">
@@ -983,7 +983,7 @@
android:layout_weight="1"
android:onClick="@{() -> view.saveAndCloseLU()}"
android:text="@string/action_close_ul"
- app:strokeColor="@color/colorPrimary"
+ app:strokeColor="?colorPrimary"
app:visibility="@{view.enabledLUCloseButton}" />
diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml
index b5236a63..c112153b 100644
--- a/app/src/main/res/layout/dialog_progress.xml
+++ b/app/src/main/res/layout/dialog_progress.xml
@@ -47,14 +47,15 @@
tools:text="@string/loading" />
-
+ app:trackCornerRadius="4dp"/>
diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
index cce298cc..2b8a8472 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -63,7 +63,7 @@
android:layout_toStartOf="@id/unt_mis"
android:ellipsize="end"
android:text="@{view.articolo.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
tools:text="020100514" />
@@ -516,7 +516,7 @@
android:layout_marginStart="2dp"
android:layout_weight="1"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:orientation="vertical"
android:padding="8dp">
diff --git a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
index bea176ef..936337a8 100644
--- a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
@@ -36,19 +36,12 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
-
-
-
-
-
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
diff --git a/app/src/main/res/layout/dialog_scan_art.xml b/app/src/main/res/layout/dialog_scan_art.xml
index 2d8a7115..0816d677 100644
--- a/app/src/main/res/layout/dialog_scan_art.xml
+++ b/app/src/main/res/layout/dialog_scan_art.xml
@@ -42,11 +42,13 @@
android:orientation="horizontal">
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
@@ -117,7 +117,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp">
@@ -127,7 +127,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{row.codAlis}"
android:textAllCaps="true"
diff --git a/app/src/main/res/layout/dialog_select_doc_rows__item_model.xml b/app/src/main/res/layout/dialog_select_doc_rows__item_model.xml
index 9a797b51..119eadb1 100644
--- a/app/src/main/res/layout/dialog_select_doc_rows__item_model.xml
+++ b/app/src/main/res/layout/dialog_select_doc_rows__item_model.xml
@@ -73,7 +73,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{row.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -114,7 +114,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp">
@@ -124,7 +124,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(row.qtaOrd)}"
android:textAllCaps="true"
diff --git a/app/src/main/res/layout/dialog_start_production.xml b/app/src/main/res/layout/dialog_start_production.xml
index a06b151c..32dd4146 100644
--- a/app/src/main/res/layout/dialog_start_production.xml
+++ b/app/src/main/res/layout/dialog_start_production.xml
@@ -52,11 +52,13 @@
android:orientation="horizontal">
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_tracciamento_imballi__list_item_model.xml b/app/src/main/res/layout/dialog_tracciamento_imballi__list_item_model.xml
new file mode 100644
index 00000000..789abf41
--- /dev/null
+++ b/app/src/main/res/layout/dialog_tracciamento_imballi__list_item_model.xml
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml b/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml
index 351b80bc..6a25b854 100644
--- a/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml
+++ b/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml
@@ -110,7 +110,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/buttons_guideline"
- app:strokeColor="@color/colorPrimary"
+ app:strokeColor="?colorPrimary"
android:text="@string/reset"/>
diff --git a/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml b/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml
index da065392..958ae6fd 100644
--- a/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml
+++ b/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml
@@ -110,7 +110,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/buttons_guideline"
- app:strokeColor="@color/colorPrimary"
+ app:strokeColor="?colorPrimary"
android:text="@string/reset"/>
diff --git a/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml b/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml
index b46625db..82decb44 100644
--- a/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml
+++ b/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml
@@ -5,7 +5,9 @@
xmlns:tools="http://schemas.android.com/tools">
+
+
@@ -17,66 +19,44 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
- app:cardBackgroundColor="@android:color/transparent"
- app:cardCornerRadius="24dp"
+ app:cardCornerRadius="16dp"
app:cardElevation="0dp">
-
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="16dp">
-
+
+
+
+ android:layout_marginBottom="16dp"
+ android:gravity="center_horizontal"
+ android:text="@string/versamento_automatico" />
+
+
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml b/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml
index 7cfb6f1c..ac7e4df6 100644
--- a/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml
+++ b/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml
@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -130,7 +130,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
index 6f1115b2..c3d9cb4c 100644
--- a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
+++ b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{Html.fromHtml(listModel.preDescriptionText)}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="N° X del dd/mm/yyyy" />
@@ -148,7 +148,7 @@
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
- tools:backgroundTint="@color/colorPrimary"
+ tools:backgroundTint="?colorPrimary"
tools:text="280.45\nCONF" />
diff --git a/app/src/main/res/layout/fragment_doc_interni.xml b/app/src/main/res/layout/fragment_doc_interni.xml
index e6cad8a7..a3d5c315 100644
--- a/app/src/main/res/layout/fragment_doc_interni.xml
+++ b/app/src/main/res/layout/fragment_doc_interni.xml
@@ -46,7 +46,7 @@
diff --git a/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml b/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml
index 32906207..66ecb739 100644
--- a/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml
+++ b/app/src/main/res/layout/fragment_elenco_inventario_list_single_item.xml
@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:paddingLeft="8dp"
android:paddingTop="2dp"
android:paddingRight="8dp"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 7c062d15..113a1ee6 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -74,7 +74,7 @@
android:id="@+id/profile_root_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorPrimary"
+ android:background="?colorPrimary"
android:orientation="vertical"
android:padding="16dp">
@@ -146,7 +146,7 @@
android:src="@drawable/ic_black_recover"
android:tint="@android:color/white" />
-
@@ -158,16 +158,17 @@
android:text="@string/recovering_data"
android:textColor="@android:color/white" />
-
-
-
+ app:trackThickness="8dp"
+ app:trackCornerRadius="4dp"
+ app:indicatorColor="@android:color/white"
+ app:trackColor="@color/colorPrimaryDark"/>
-
+
diff --git a/app/src/main/res/layout/fragment_main_accettazione_bolla__list_model.xml b/app/src/main/res/layout/fragment_main_accettazione_bolla__list_model.xml
index 2ee259a8..24b09ea3 100644
--- a/app/src/main/res/layout/fragment_main_accettazione_bolla__list_model.xml
+++ b/app/src/main/res/layout/fragment_main_accettazione_bolla__list_model.xml
@@ -1,31 +1,30 @@
-
+ android:orientation="horizontal"
+ android:paddingStart="12dp">
+
-
-
-
+
diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
index 79da9a1a..9c27e3ea 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -52,7 +52,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:orientation="horizontal">
-
+
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
-
+
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
index bea40a90..c905122d 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
index 92b760ba..b156f7c0 100644
--- a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
+++ b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
@@ -37,11 +37,13 @@
android:gravity="center_horizontal">
-
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:trackCornerRadius="4dp"/>
diff --git a/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml b/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
index f9e8bcd5..267b37df 100644
--- a/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{articolo.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="18sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -117,7 +117,7 @@
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
- tools:backgroundTint="@color/colorPrimary"
+ tools:backgroundTint="?colorPrimary"
tools:text="280.45\nCONF" />
diff --git a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml
index da4cc753..b302b979 100644
--- a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml
@@ -31,7 +31,7 @@
android:layout_height="wrap_content"
tools:text="BADGE 1"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/lista_bancali_list_model.xml b/app/src/main/res/layout/lista_bancali_list_model.xml
index 33f36c99..16c3038b 100644
--- a/app/src/main/res/layout/lista_bancali_list_model.xml
+++ b/app/src/main/res/layout/lista_bancali_list_model.xml
@@ -48,7 +48,7 @@
android:text="@{mtbColt.numCollo.toString()}"
tools:text="22222"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
index d88e851a..07b4338e 100644
--- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
+++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -133,7 +133,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml b/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml
index 34257fb5..f5f57f4d 100644
--- a/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml
+++ b/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml
index b9a30bcb..2c5ec710 100644
--- a/app/src/main/res/layout/lista_picking_libero_list_model.xml
+++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small"
@@ -101,7 +101,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
index d864f80a..8aa96ad4 100644
--- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
+++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text"
@@ -119,7 +119,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_header.xml b/app/src/main/res/layout/prod_recupero_materiale_list_header.xml
index 93825056..5566fdb6 100644
--- a/app/src/main/res/layout/prod_recupero_materiale_list_header.xml
+++ b/app/src/main/res/layout/prod_recupero_materiale_list_header.xml
@@ -12,7 +12,7 @@
android:layout_marginVertical="8dp"
android:paddingTop="8dp"
android:textAllCaps="true"
- android:textColor="@color/colorPrimary"
+ android:textColor="?colorPrimary"
tools:text="Linea 1" />
diff --git a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
index 1d693f4a..dd474c2f 100644
--- a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
+++ b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
@@ -189,7 +189,7 @@
android:layout_marginStart="8dp"
android:adjustViewBounds="true"
android:background="@drawable/ic_info_78dp"
- android:backgroundTint="@color/colorPrimary"
+ android:backgroundTint="?colorPrimary"
android:clickable="true"
android:focusable="true"
android:onClick="@{() -> view.onInfoClick(item)}"
diff --git a/app/src/main/res/layout/spedizione_main_list__group_header.xml b/app/src/main/res/layout/spedizione_main_list__group_header.xml
index ec7b8ecb..edc45a6f 100644
--- a/app/src/main/res/layout/spedizione_main_list__group_header.xml
+++ b/app/src/main/res/layout/spedizione_main_list__group_header.xml
@@ -3,7 +3,6 @@
-
diff --git a/app/src/main/res/menu/accettazione_ordine_inevaso_fab_menu.xml b/app/src/main/res/menu/accettazione_ordine_inevaso_fab_menu.xml
index 4cdf80f4..d1de3a7d 100644
--- a/app/src/main/res/menu/accettazione_ordine_inevaso_fab_menu.xml
+++ b/app/src/main/res/menu/accettazione_ordine_inevaso_fab_menu.xml
@@ -4,6 +4,10 @@
android:id="@+id/show_created_ul"
android:icon="@drawable/ic_inventory_2_material3"
android:title="@string/action_show_created_ul" />
+ -
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/spedizione_ordine_inevaso_fab_menu.xml b/app/src/main/res/menu/spedizione_ordine_inevaso_fab_menu.xml
new file mode 100644
index 00000000..f1c8dfa5
--- /dev/null
+++ b/app/src/main/res/menu/spedizione_ordine_inevaso_fab_menu.xml
@@ -0,0 +1,20 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8a79a67e..c53e1467 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -59,6 +59,7 @@
Filtra
Ordina
Crea nuova UL
+ Registra imballi
Inserisci quantità
Inserisci peso
Inserisci le informazioni del TIPO UL e il peso NETTO e LORDO
@@ -69,6 +70,7 @@
Cancella UL
Stampa
Conferma
+ Salta
Salva
Note Aggiuntive
Inserisci eventuali note aggiuntive della tua UL
@@ -345,6 +347,7 @@
Recupero materiale
Seleziona un elemento per continuare
+ Seleziona un vettore
Prima di procedere seleziona un cliente
Prima di procedere seleziona un destinatario
Cliente non valido
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72ec40f4..1f91c0ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,6 +90,7 @@
Filter
Order
Create new LU
+ Track packaging
Insert quantity
Insert weight
Close order
@@ -114,6 +115,7 @@
Print LU
Print
Confirm
+ Skip
Save
Additional notes
Enter any additional notes in your logistics unit
@@ -350,6 +352,7 @@
Please select an item before proceed
+ Select a carrier
Please, select a customer before proceeding
Please, select a recipient before proceeding
Invalid customer
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 356a54fb..7590de2b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -46,10 +46,7 @@
- true
-
-
-