From 216070c608b3de1e06df42bd20c93ae24793f448 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 28 Sep 2020 12:31:27 +0200 Subject: [PATCH] #A0000207567.60 Sistemata getListaArticoli in fase di picking articoli per lavorazione --- app/build.gradle | 4 +- .../rest/consumers/OrdiniRESTConsumer.java | 4 +- .../consumers/OrdiniRESTConsumerService.java | 2 +- .../rest/model}/GetPickingListDTO.java | 4 +- .../ProdOrdineLavorazioneElencoFragment.java | 131 +++-- .../core/ProdOrdineLavorazioneHelper.java | 86 ++-- .../dto/OrdineLavorazioneInevasoDTO.java | 447 ++++++++++++++++++ .../gest/vendita/MainVenditaFragment.java | 7 +- .../gest/vendita/core/VenditaHelper.java | 2 +- .../OrdiniVenditaRESTConsumerService.java | 2 +- 10 files changed, 547 insertions(+), 142 deletions(-) rename app/src/main/java/it/integry/integrywmsnative/{gest/vendita/dto => core/rest/model}/GetPickingListDTO.java (93%) create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/dto/OrdineLavorazioneInevasoDTO.java diff --git a/app/build.gradle b/app/build.gradle index 08d08078..90e94fc6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 152 - def appVersionName = '1.13.6' + def appVersionCode = 153 + def appVersionName = '1.13.7' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java index 91d7b5bd..77b03c5b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java @@ -11,7 +11,7 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; -import it.integry.integrywmsnative.gest.vendita.dto.GetPickingListDTO; +import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; import retrofit2.Call; @@ -21,7 +21,7 @@ import retrofit2.Response; @Singleton public class OrdiniRESTConsumer extends _BaseRESTConsumer { - public static void retrieveListaArticoliFromOrdiniVendita(List orders, RunnableArgs> onComplete, RunnableArgs onFailed) { + public static void retrieveListaArticoliFromOrdiniUscita(List orders, RunnableArgs> onComplete, RunnableArgs onFailed) { List getPickingListDTOs = Stream.of(orders) .map(x -> new GetPickingListDTO() diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java index 182097a0..7d699377 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java @@ -5,7 +5,7 @@ import java.util.List; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; -import it.integry.integrywmsnative.gest.vendita.dto.GetPickingListDTO; +import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.POST; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GetPickingListDTO.java similarity index 93% rename from app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/GetPickingListDTO.java index 67dcf99e..54e4ba50 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GetPickingListDTO.java @@ -1,6 +1,4 @@ -package it.integry.integrywmsnative.gest.vendita.dto; - -import java.util.Date; +package it.integry.integrywmsnative.core.rest.model; public class GetPickingListDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java index 3e921fbe..ead25331 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java @@ -5,31 +5,32 @@ import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.os.Bundle; - -import androidx.appcompat.widget.AppCompatTextView; -import androidx.databinding.DataBindingUtil; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; - import android.text.Html; import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.appcompat.widget.AppCompatTextView; +import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; + import com.annimon.stream.Stream; import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; +import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; @@ -39,7 +40,6 @@ import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.core.ProdOrdin import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.core.ProdOrdineLavorazioneListAdapter; import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; -import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTOOld; import it.integry.integrywmsnative.ui.ElevatedToolbar; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; @@ -88,7 +88,7 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi mBinding.ordineLavorazioneMainFab.setOnClickListener(v -> onVenditaMainFabClick()); - if(mToolbar != null) mToolbar.setRecyclerView(mBinding.ordineLavorazioneMainList); + if (mToolbar != null) mToolbar.setRecyclerView(mBinding.ordineLavorazioneMainList); init(); return mBinding.getRoot(); @@ -110,44 +110,37 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi } - - - private void init(){ + private void init() { final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new ProdOrdineLavorazioneHelper(getActivity()); // mViewModel = new VenditaViewModel(getActivity(), this, mBinding, mHelper); mHelper.loadOrdini(ordini -> { - if(ordini != null) { - UtilityToast.showToast("Caricati " + ordini.size() + " ordini"); - mOriginalOrderList = ordini; + if (ordini != null) { + UtilityToast.showToast("Caricati " + ordini.size() + " ordini"); + mOriginalOrderList = ordini; // mViewModel.setListOrder(ordini); - } + } - mBinding.ordineLavorazioneEmptyView.setVisibility(ordini != null && ordini.size() > 0 ? View.GONE : View.VISIBLE); + mBinding.ordineLavorazioneEmptyView.setVisibility(ordini != null && ordini.size() > 0 ? View.GONE : View.VISIBLE); - refreshOrdini(ordini); - initRecyclerView(); - progress.dismiss(); - }, ex -> { - mOriginalOrderList = new ArrayList<>(); - progress.dismiss(); + refreshOrdini(ordini); + initRecyclerView(); + progress.dismiss(); + }, ex -> { + mOriginalOrderList = new ArrayList<>(); + progress.dismiss(); - String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); - if(errorMessage == null) errorMessage = ex.getMessage(); - DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); - }); + String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); + if (errorMessage == null) errorMessage = ex.getMessage(); + DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); + }); } - - - - - public void refreshOrdini(List ordini) { mRenderedOrderList.clear(); @@ -166,28 +159,24 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi private RunnableArgs onSingleSelectionChanged = dto -> { List selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList); - if(!SettingsManager.iDB().isFlagMultiClienteOrdV()){ + if (!SettingsManager.iDB().isFlagMultiClienteOrdV()) { boolean allMatch = Stream.of(selectedOrders).allMatch(x -> dto.getCodAnagOrd().equalsIgnoreCase(x.getCodAnagOrd())); - if(!allMatch) { + if (!allMatch) { Stream.of(selectedOrders) .filter(x -> !x.getCodAnagOrd().equalsIgnoreCase(dto.getCodAnagOrd())) .forEach(x -> x.setSelected(false)); } } - if(selectedOrders != null && selectedOrders.size() > 0) { + if (selectedOrders != null && selectedOrders.size() > 0) { mBinding.ordineLavorazioneMainFab.show(); - } - else { + } else { mBinding.ordineLavorazioneMainFab.hide(); } }; - - - private void onVenditaMainFabClick() { List selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList); @@ -195,58 +184,50 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi String dataCons = null; - for(OrdineVenditaInevasoDTO ordine : selectedOrders){ - if(!barcodes.contains(ordine.getBarcode())) barcodes.add(ordine.getBarcode()); + for (OrdineVenditaInevasoDTO ordine : selectedOrders) { + if (!barcodes.contains(ordine.getBarcode())) barcodes.add(ordine.getBarcode()); - if(dataCons == null) dataCons = ordine.getDataConsS(); - else if(!dataCons.equalsIgnoreCase(ordine.getDataConsS())) dataCons = ""; + if (dataCons == null) dataCons = ordine.getDataConsS(); + else if (!dataCons.equalsIgnoreCase(ordine.getDataConsS())) dataCons = ""; } final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); - final String finalDataCons = dataCons; checkSelectedOrders(selectedOrders, () -> { + RunnableArgs> onPostGetListaArts = sitArtsDTO -> { + mHelper.getBancaliLavorazioneGiaRegistrati(selectedOrders, mtbColtList -> { + progress.dismiss(); - mHelper.retrievePickingList(barcodes, finalDataCons, ordini -> { + List codMarts = Stream.of(sitArtsDTO) + .distinctBy(SitArtOrdDTO::getCodMart) + .map(SitArtOrdDTO::getCodMart) + .toList(); - mHelper.getBancaliLavorazioneGiaRegistrati(selectedOrders, mtbColtList -> { - - progress.dismiss(); - - List codMarts = Stream.of(ordini) - .distinctBy(PickingObjectDTOOld::getCodMart) - .map(PickingObjectDTOOld::getCodMart) - .toList(); - - int alreadyRegisteredUL = mtbColtList.size(); + int alreadyRegisteredUL = mtbColtList.size(); + DialogSimpleMessageHelper.makeInfoDialog(getActivity(), + getText(R.string.orders).toString(), + Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, selectedOrders.size()), selectedOrders.size()) + + "
" + + "" + codMarts.size() + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, codMarts.size()) + + "
" + + "" + alreadyRegisteredUL + " " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)), + null, + () -> startPickingActivity(sitArtsDTO, selectedOrders, mtbColtList) + ).show(); + }, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); + }; - DialogSimpleMessageHelper.makeInfoDialog(getActivity(), - getText(R.string.orders).toString(), - Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, barcodes.size()), barcodes.size()) - + "
" + - "" + codMarts.size() + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, codMarts.size()) - + "
" + - "" + alreadyRegisteredUL + " " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)), - null, - () -> startPickingActivity(ordini, selectedOrders, mtbColtList) - ).show(); - - }, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); - - }, ex -> { - UtilityExceptions.defaultException(getActivity(), ex, progress); - }); - + OrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrders, onPostGetListaArts, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); }, progress::dismiss); } private void checkSelectedOrders(List selectedOrders, Runnable onComplete, Runnable onFailed) { - if(selectedOrders != null && selectedOrders.size() > 0) { + if (selectedOrders != null && selectedOrders.size() > 0) { //Definizione della gestione collo di default List foundGestioni = Stream.of(selectedOrders) @@ -276,7 +257,7 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi onComplete.run(); } - private void startPickingActivity(List ordini, List selectedOrders, List mtbColtList) { + private void startPickingActivity(List ordini, List selectedOrders, List mtbColtList) { Intent myIntent = new Intent(getActivity(), SpedizioneActivity.class); String keyPickingList = DataCache.addItem(ordini); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java index 1359cbbc..0e879fad 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.core; import android.content.Context; -import android.text.TextUtils; import android.util.Log; import com.annimon.stream.Stream; @@ -12,20 +11,19 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.rest.RESTBuilder; import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.rest.model.EsitoType; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityFirebase; import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; -import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTOOld; import it.integry.integrywmsnative.gest.vendita.rest.OrdiniVenditaRESTConsumerService; import retrofit2.Call; import retrofit2.Callback; @@ -96,53 +94,39 @@ public class ProdOrdineLavorazioneHelper { - public void retrievePickingList(List barcodeOrdini, String dateCons, RunnableArgs> onComplete, RunnableArgs onFailed){ - String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); - - String joinedBarcodes = TextUtils.join(",", barcodeOrdini); - - OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 90); - - Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_lavorazione"); - perfTrace.start(); - - service.getPickingList(codMdep, dateCons, joinedBarcodes).enqueue(new Callback>>() { - @Override - public void onResponse(Call>> call, Response>> response) { - if(response.isSuccessful()) { - - if(response.body() != null) { - if(response.body().getEsito() == EsitoType.OK) { - UtilityFirebase.stopPerformanceTrace(perfTrace, false); - onComplete.run(response.body().getDto()); - - } else { - Log.e("Ord Lavorazione", response.body().getErrorMessage()); - UtilityFirebase.stopPerformanceTrace(perfTrace, true); - onFailed.run(new Exception(response.body().getErrorMessage())); - } - } else { - Log.e("Ord Lavorazione", response.message()); - UtilityFirebase.stopPerformanceTrace(perfTrace, true); - onFailed.run(new Exception(response.message())); - } - } else { - UtilityFirebase.stopPerformanceTrace(perfTrace, true); - Log.e("Ord Lavorazione", "Status " + response.code() + ": " + response.message()); - onFailed.run(new Exception("Status " + response.code() + ": " + response.message())); - } - } - - @Override - public void onFailure(Call>> call, Throwable t) { - UtilityFirebase.stopPerformanceTrace(perfTrace, true); - Log.e("Ord Lavorazione", t.toString()); - UtilityLogger.errorMe(new Exception(t)); - onFailed.run(new Exception(t)); - } - }); - - } +// public void retrievePickingList(List orders, RunnableArgs> onComplete, RunnableArgs onFailed){ +// String codMdep = SettingsManager.i().userSession.depo.getCodMdep(); +// +// +// Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_lavorazione"); +// perfTrace.start(); +// +// List getPickingListDTOs = Stream.of(orders) +// .map(x -> new GetPickingListDTO() +// .setData(x.getDataOrdS()) +// .setGestione(x.getGestione()) +// .setNumero(x.getNumOrd()) +// .setDataConsegna(x.getDataConsS()) +// .setIdViaggio(x.getIdViaggio())) +// .toList(); +// +// OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90); +// service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback>>() { +// @Override +// public void onResponse(Call>> call, Response>> response) { +// analyzeAnswer(response, "retrieveListaArticoliFromOrdiniVendita", onComplete, onFailed); +// } +// +// @Override +// public void onFailure(Call>> call, Throwable t) { +// UtilityFirebase.stopPerformanceTrace(perfTrace, true); +// Log.e("Ord Lavorazione", t.toString()); +// UtilityLogger.errorMe(new Exception(t)); +// onFailed.run(new Exception(t)); +// } +// }); +// +// } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/dto/OrdineLavorazioneInevasoDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/dto/OrdineLavorazioneInevasoDTO.java new file mode 100644 index 00000000..acf1233f --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_pick_ord_lavorazione/dto/OrdineLavorazioneInevasoDTO.java @@ -0,0 +1,447 @@ +package it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.dto; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.util.Date; + +import it.integry.integrywmsnative.core.di.BindableBoolean; +import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; +import it.integry.integrywmsnative.core.utility.UtilityDate; + +public class OrdineLavorazioneInevasoDTO { + + private String data; + private Integer numero; + private Integer idViaggio; + private String gestione; + private String listino; + private String termCons; + private String codAuto; + private String codMdep; + private String descrizioneAuto; + private String codVvet; + private String descrizioneVettore; + private String dataInizTrasp; + private String descrizionePaga; + private String rifOrd; + private String codAnagOrd; + private String codJcom; + private String descrizioneCom; + private String ragSocCom; + private String ragSocOrd; + private String destinatario; + private String citta; + private String provincia; + private String indirizzo; + private BigDecimal pesoTotale; + private BigDecimal numCnfdaEvadere; + private BigDecimal numCnfDisp; + private String dataCons; + private String barcode; + private Integer numRighe; + private Integer righeInPartenza; + private BigDecimal saldoContabile; + private String codVzon; + private String ragSocOrdV; + private int colliRiservati; + private boolean existColloBoolean; + private boolean flagEvaso; + private String nomeAgente; + private String codJfas; + + public BindableBoolean selected; + + + public OrdineLavorazioneInevasoDTO() { + this.selected = new BindableBoolean(false); + } + + + public String getDataOrdS() { + return data; + } + + public Date getDataOrdD() { + return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS()); + } + + public OrdineLavorazioneInevasoDTO setData(String data) { + this.data = data; + return this; + } + + public Integer getNumOrd() { + return numero; + } + + public OrdineLavorazioneInevasoDTO setNumero(Integer numero) { + this.numero = numero; + return this; + } + + public Integer getIdViaggio() { + return idViaggio; + } + + public OrdineLavorazioneInevasoDTO setIdViaggio(Integer idViaggio) { + this.idViaggio = idViaggio; + return this; + } + + public String getGestione() { + return gestione; + } + + public GestioneEnum getGestioneEnum() { + return GestioneEnum.fromString(getGestione()); + } + + + public OrdineLavorazioneInevasoDTO setGestione(String gestione) { + this.gestione = gestione; + return this; + } + + public String getListino() { + return listino; + } + + public OrdineLavorazioneInevasoDTO setListino(String listino) { + this.listino = listino; + return this; + } + + public String getTermCons() { + return termCons; + } + + public OrdineLavorazioneInevasoDTO setTermCons(String termCons) { + this.termCons = termCons; + return this; + } + + public String getCodAuto() { + return codAuto; + } + + public OrdineLavorazioneInevasoDTO setCodAuto(String codAuto) { + this.codAuto = codAuto; + return this; + } + + public String getCodMdep() { + return codMdep; + } + + public OrdineLavorazioneInevasoDTO setCodMdep(String codMdep) { + this.codMdep = codMdep; + return this; + } + + public String getDescrizioneAuto() { + return descrizioneAuto; + } + + public OrdineLavorazioneInevasoDTO setDescrizioneAuto(String descrizioneAuto) { + this.descrizioneAuto = descrizioneAuto; + return this; + } + + public String getCodVvet() { + return codVvet; + } + + public OrdineLavorazioneInevasoDTO setCodVvet(String codVvet) { + this.codVvet = codVvet; + return this; + } + + public String getDescrizioneVettore() { + return descrizioneVettore; + } + + public OrdineLavorazioneInevasoDTO setDescrizioneVettore(String descrizioneVettore) { + this.descrizioneVettore = descrizioneVettore; + return this; + } + + public String getDataInizTraspS() { + return dataInizTrasp; + } + + public Date getDataInizTraspD() throws ParseException { + return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS()); + } + + public OrdineLavorazioneInevasoDTO setDataInizTrasp(String dataInizTrasp) { + this.dataInizTrasp = dataInizTrasp; + return this; + } + + public String getDescrizionePaga() { + return descrizionePaga; + } + + public OrdineLavorazioneInevasoDTO setDescrizionePaga(String descrizionePaga) { + this.descrizionePaga = descrizionePaga; + return this; + } + + public String getRifOrd() { + return rifOrd; + } + + public OrdineLavorazioneInevasoDTO setRifOrd(String rifOrd) { + this.rifOrd = rifOrd; + return this; + } + + public String getCodAnagOrd() { + return codAnagOrd; + } + + public OrdineLavorazioneInevasoDTO setCodAnagOrd(String codAnagOrd) { + this.codAnagOrd = codAnagOrd; + return this; + } + + public String getCodJcom() { + return codJcom; + } + + public OrdineLavorazioneInevasoDTO setCodJcom(String codJcom) { + this.codJcom = codJcom; + return this; + } + + public String getDescrizioneCom() { + return descrizioneCom; + } + + public OrdineLavorazioneInevasoDTO setDescrizioneCom(String descrizioneCom) { + this.descrizioneCom = descrizioneCom; + return this; + } + + public String getRagSocCom() { + return ragSocCom; + } + + public OrdineLavorazioneInevasoDTO setRagSocCom(String ragSocCom) { + this.ragSocCom = ragSocCom; + return this; + } + + public String getRagSocOrd() { + return ragSocOrd; + } + + public OrdineLavorazioneInevasoDTO setRagSocOrd(String ragSocOrd) { + this.ragSocOrd = ragSocOrd; + return this; + } + + public String getDestinatario() { + return destinatario; + } + + public OrdineLavorazioneInevasoDTO setDestinatario(String destinatario) { + this.destinatario = destinatario; + return this; + } + + public String getCitta() { + return citta; + } + + public OrdineLavorazioneInevasoDTO setCitta(String citta) { + this.citta = citta; + return this; + } + + public String getProvincia() { + return provincia; + } + + public OrdineLavorazioneInevasoDTO setProvincia(String provincia) { + this.provincia = provincia; + return this; + } + + public String getIndirizzo() { + return indirizzo; + } + + public OrdineLavorazioneInevasoDTO setIndirizzo(String indirizzo) { + this.indirizzo = indirizzo; + return this; + } + + public BigDecimal getPesoTotale() { + return pesoTotale; + } + + public OrdineLavorazioneInevasoDTO setPesoTotale(BigDecimal pesoTotale) { + this.pesoTotale = pesoTotale; + return this; + } + + public BigDecimal getNumCnfdaEvadere() { + return numCnfdaEvadere; + } + + public OrdineLavorazioneInevasoDTO setNumCnfdaEvadere(BigDecimal numCnfdaEvadere) { + this.numCnfdaEvadere = numCnfdaEvadere; + return this; + } + + public BigDecimal getNumCnfDisp() { + return numCnfDisp; + } + + public OrdineLavorazioneInevasoDTO setNumCnfDisp(BigDecimal numCnfDisp) { + this.numCnfDisp = numCnfDisp; + return this; + } + + public String getDataConsS() { + return dataCons; + } + + public Date getDataConsD() { + return UtilityDate.recognizeDateWithExceptionHandler(getDataConsS()); + } + + public OrdineLavorazioneInevasoDTO setDataCons(String dataCons) { + this.dataCons = dataCons; + return this; + } + + public String getBarcode() { + return barcode; + } + + public OrdineLavorazioneInevasoDTO setBarcode(String barcode) { + this.barcode = barcode; + return this; + } + + public Integer getNumRighe() { + return numRighe; + } + + public OrdineLavorazioneInevasoDTO setNumRighe(Integer numRighe) { + this.numRighe = numRighe; + return this; + } + + public Integer getRigheInPartenza() { + return righeInPartenza; + } + + public OrdineLavorazioneInevasoDTO setRigheInPartenza(Integer righeInPartenza) { + this.righeInPartenza = righeInPartenza; + return this; + } + + public BigDecimal getSaldoContabile() { + return saldoContabile; + } + + public OrdineLavorazioneInevasoDTO setSaldoContabile(BigDecimal saldoContabile) { + this.saldoContabile = saldoContabile; + return this; + } + + public String getCodVzon() { + return codVzon; + } + + public OrdineLavorazioneInevasoDTO setCodVzon(String codVzon) { + this.codVzon = codVzon; + return this; + } + + public String getRagSocOrdV() { + return ragSocOrdV; + } + + public OrdineLavorazioneInevasoDTO setRagSocOrdV(String ragSocOrdV) { + this.ragSocOrdV = ragSocOrdV; + return this; + } + + public int getColliRiservati() { + return colliRiservati; + } + + public OrdineLavorazioneInevasoDTO setColliRiservati(int colliRiservati) { + this.colliRiservati = colliRiservati; + return this; + } + + public boolean isExistColloBoolean() { + return existColloBoolean; + } + + public OrdineLavorazioneInevasoDTO setExistColloBoolean(boolean existColloBoolean) { + this.existColloBoolean = existColloBoolean; + return this; + } + + public boolean isFlagEvaso() { + return flagEvaso; + } + + public OrdineLavorazioneInevasoDTO setFlagEvaso(boolean flagEvaso) { + this.flagEvaso = flagEvaso; + return this; + } + + public String getNomeAgente() { + return nomeAgente; + } + + public OrdineLavorazioneInevasoDTO setNomeAgente(String nomeAgente) { + this.nomeAgente = nomeAgente; + return this; + } + + public String getCodJfas() { + return codJfas; + } + + public OrdineLavorazioneInevasoDTO setCodJfas(String codJfas) { + this.codJfas = codJfas; + return this; + } + + public boolean isSelected() { + return selected.get(); + } + + public OrdineLavorazioneInevasoDTO setSelected(boolean selected) { + this.selected.set(selected); + return this; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + OrdineLavorazioneInevasoDTO that = (OrdineLavorazioneInevasoDTO) o; + + if (!data.equals(that.data)) return false; + if (!numero.equals(that.numero)) return false; + return getGestione().equals(that.getGestione()); + } + + @Override + public int hashCode() { + int result = data.hashCode(); + result = 31 * result + numero.hashCode(); + result = 31 * result + getGestione().hashCode(); + return result; + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 372b8272..81e7b724 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -240,13 +240,8 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS }, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); }; - OrdiniRESTConsumer.retrieveListaArticoliFromOrdiniVendita(selectedOrders, onPostGetListaArts, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); + OrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrders, onPostGetListaArts, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); -// if(SettingsManager.iDB().isFlagUseNewPickingListSpedizione()) { -// mHelper.retrievePickingListNew(selectedOrders, onPostGetPickingList, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); -// } else { -// mHelper.retrievePickingList(barcodes, finalDataCons, onPostGetPickingList, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress)); -// } }, progress::dismiss); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index df1e1442..f8e33006 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -26,7 +26,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityFirebase; import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.gest.vendita.dto.GetPickingListDTO; +import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTOOld; import it.integry.integrywmsnative.gest.vendita.rest.OrdiniVenditaRESTConsumerService; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java index 46562c0f..459f5d71 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java @@ -4,7 +4,7 @@ import java.util.List; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.DtbOrdt; -import it.integry.integrywmsnative.gest.vendita.dto.GetPickingListDTO; +import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTOOld; import retrofit2.Call;