Completata gestione dei bancali gia registrati in vendita

app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java

@@ -76,4 +76,7 @@ public class ColliMagazzinoRESTConsumer {
 
     }
 
+
+
+
 }

app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java

@@ -5,7 +5,9 @@ import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,19 +18,21 @@ import com.annimon.stream.Stream;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.REST.CommonRESTException;
-import it.integry.integrywmsnative.core.coollection.Coollection;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding;
 import it.integry.integrywmsnative.gest.accettazione.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.gest.vendita.core.MainListVenditaAdapter;
 import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
 
 public class MainVenditaFragment extends Fragment implements ITitledFragment {
@@ -77,9 +81,14 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment {
 
         ButterKnife.bind(this, mBinding.getRoot());
 
+        initActionBar();
+
         return mBinding.getRoot();
     }
 
+    private void initActionBar() {
+//        ((AppCompatActivity)getActivity()).getSupportActionBar().
+    }
 
     private void init(){
 
@@ -110,15 +119,6 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment {
 
     private void groupOrdiniAndMakeRecycler(List<OrdineVenditaInevasoDTO> ordini){
 
-        String prevCodAnag = "";
-
-//        for(OrdineVenditaInevasoDTO ordine : ordini){
-//            if(UtilityString.isNullOrEmpty(ordine.codJcom) || ordine.codJcom.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)){
-//                ordine.codJcom = CommonConst.Config.COMMESSA_MAG;
-//                ordine.descrizioneCom = "MAGAZZINO";
-//            }
-//        }
-
         groupedOrdiniInevasi = new ArrayList<>();
 
         //Splitto gli ordini per codAnagOrd (Cliente)
@@ -215,60 +215,58 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment {
         List<OrdineVenditaGroupedInevasoDTO> selectedOrders = mHelper.getSelectedOrders(groupedOrdiniInevasi);
         List<String> barcodes = new ArrayList<>();
 
+        String dataCons = null;
+
         for(OrdineVenditaGroupedInevasoDTO ordine : selectedOrders){
             for(OrdineVenditaGroupedInevasoDTO.Ordine righeOrd : ordine.ordini){
-                barcodes.add(righeOrd.barcode);
+                if(!barcodes.contains(righeOrd.barcode)) barcodes.add(righeOrd.barcode);
+
+                if(dataCons == null) dataCons = righeOrd.dataCons;
+                else if(!dataCons.equalsIgnoreCase(righeOrd.dataCons)) dataCons = "";
             }
         }
 
-//        final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting),
+        final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting),
-//                getText(R.string.loading) + " ...", true);
+                getText(R.string.loading) + " ...", true);
+
+        mHelper.retrievePickingList(barcodes, dataCons, new VenditaHelper.ILoadPickingListCallback() {
+            @Override
+            public void onLoadSuccess(final List<PickingObjectDTO> ordini) {
+
+
+                mHelper.getBancaliVenditaGiaRegistrati(selectedOrders, mtbColtList -> {
+
+                    progress.dismiss();
+
+                    List<String> codMarts = Stream.of(ordini).distinctBy(x -> x.codMart).map(x -> x.codMart).toList();
+
+                    int alreadyRegisteredUL = mtbColtList.size();
+
+                    DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
+                            getText(R.string.orders).toString(),
+                            Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, barcodes.size()), barcodes.size())
+                                    + "<br />" +
+                                    "<b>" + codMarts.size() + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, codMarts.size())
+                                    + "<br />" +
+                                    "<b>" + alreadyRegisteredUL + "</b> " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)),
+                            null,
+                            () -> {
 
-//        mHelper.retrievePickingList(barcodes, new ILoadPickingListCallback() {
-//            @Override
-//            public void onLoadSuccess(final List<OrdineAccettazioneDTO> ordini) {
-//                progress.dismiss();
-//
-//                AtomicInteger artsCounter = new AtomicInteger();
-//
-//                Stream.of(ordini).forEach(x -> {
-//                    artsCounter.addAndGet((int) Stream.of(x.ordini).filter(y -> y.getQtaDaEvadere().floatValue() > 0).count());
-//                });
-//
-//                List<String> ordersKeys = new ArrayList<>();
-//
-//                for(OrdineAccettazioneDTO ordine : ordini){
-//                    if(!ordersKeys.contains(ordine.data + " " + ordine.numero + " " + ordine.gestione)){
-//                        ordersKeys.add(ordine.data + " " + ordine.numero + " " + ordine.gestione);
-//                    }
-//                }
-//
-//                DialogSimpleMessageHelper.makeInfoDialog(getActivity(),
-//                        getText(R.string.orders).toString(),
-//                        Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, ordersKeys.size()), ordersKeys.size())
-//                                + "<br /><br />" +
-//                                "<b>" + artsCounter + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, artsCounter.get())),
-//                        null,
-//                        () -> {
-//
 //                            Intent myIntent = new Intent(getActivity(), AccettazioneOrdineInevasoActivity.class);
 //                            myIntent.putExtra("key", (ArrayList<OrdineAccettazioneDTO>) ordini); //Optional parameters
 //                            getActivity().startActivity(myIntent);
-//
+
-//                        }).show();
+                            }).show();
-//
+
-//            }
+                }, ex -> UtilityExceptions.defaultException(getActivity(), ex, progress));
-//
+
-//            @Override
+            }
-//            public void onLoadFail(Exception ex) {
+
-////                Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_LONG).show();
+            @Override
-//                progress.dismiss();
+            public void onLoadFail(Exception ex) {
-//
+                UtilityExceptions.defaultException(getActivity(), ex, progress);
-//                String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
+            }
-//                if(errorMessage == null) errorMessage = ex.getMessage() + "\n" + ex.getCause().getCause().getMessage();
+        });
-//                DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show();
-//            }
-//        });
 
 
     }

app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java

@@ -4,18 +4,26 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.CommonConst;
 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.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.vendita.rest.OrdiniVenditaRESTConsumerService;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -67,32 +75,21 @@ public class VenditaHelper {
 
 
 
-    public void retrievePickingList(List<String> barcodeOrdini, List<Date> dateCons, final ILoadPickingListCallback callback){
+    public void retrievePickingList(List<String> barcodeOrdini, String dateCons, final ILoadPickingListCallback callback){
         String codMdep = SettingsManager.i().userSession.depo.getCodMdep();
 
         String joinedBarcodes = TextUtils.join(",", barcodeOrdini);
 
         OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class);
 
-        service.getPickingList(codMdep, "", joinedBarcodes).enqueue(new Callback<ServiceRESTResponse<List<OrdineVenditaDTO>>>() {
+        service.getPickingList(codMdep, dateCons, joinedBarcodes).enqueue(new Callback<ServiceRESTResponse<List<PickingObjectDTO>>>() {
             @Override
-            public void onResponse(Call<ServiceRESTResponse<List<OrdineVenditaDTO>>> call, Response<ServiceRESTResponse<List<OrdineVenditaDTO>>> response) {
+            public void onResponse(Call<ServiceRESTResponse<List<PickingObjectDTO>>> call, Response<ServiceRESTResponse<List<PickingObjectDTO>>> response) {
                 if(response.isSuccessful()) {
 
                     if(response.body() != null) {
                         if(response.body().getEsito() == EsitoType.OK) {
-                            List<OrdineVenditaDTO> dto = response.body().getDto();
+                            callback.onLoadSuccess(response.body().getDto());
-
-                            for (OrdineVenditaDTO ordine : dto) {
-                                for(OrdineVenditaDTO.Riga riga : ordine.ordini){
-                                    riga.numOrd = ordine.numero;
-                                    riga.dataOrd = ordine.data;
-                                    riga.gestioneOrd = ordine.gestione;
-                                    riga.codAlis = ordine.codAlis;
-                                }
-                            }
-
-                            callback.onLoadSuccess(dto);
                         } else {
                             Log.e("Vendita", response.body().getErrorMessage());
                             callback.onLoadFail(new Exception(response.message()));
@@ -108,7 +105,7 @@ public class VenditaHelper {
             }
 
             @Override
-            public void onFailure(Call<ServiceRESTResponse<List<OrdineVenditaDTO>>> call, Throwable t) {
+            public void onFailure(Call<ServiceRESTResponse<List<PickingObjectDTO>>> call, Throwable t) {
                 Log.e("Vendita", t.toString());
                 UtilityLogger.errorMe(new Exception(t));
                 callback.onLoadFail(new Exception(t));
@@ -119,6 +116,58 @@ public class VenditaHelper {
 
 
 
+    public void getBancaliVenditaGiaRegistrati(List<OrdineVenditaGroupedInevasoDTO> orders, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        String baseSql = "SELECT DISTINCT mtb_colt.* " +
+                "FROM mtb_colt, mtb_colr " +
+                "WHERE mtb_colt.gestione = mtb_colr.gestione AND " +
+                "mtb_colt.ser_collo = mtb_colr.ser_collo AND " +
+                "mtb_colt.data_collo = mtb_colr.data_collo AND " +
+                "mtb_colt.num_collo = mtb_colr.num_collo AND " +
+                "mtb_colt.gestione = 'V' AND " +
+                "mtb_colt.data_doc is null AND ";
+
+        String whereCond = "";
+
+        for(int i = 0; i < orders.size(); i++){
+
+            List<OrdineVenditaGroupedInevasoDTO.Ordine> currentOrders = orders.get(i).ordini;
+
+            for(int j = 0; j < currentOrders.size(); j++){
+
+                whereCond += "(mtb_colr.data_ord = " + UtilityDate.formatDate(currentOrders.get(j).getData(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH) + " " +
+                        "AND mtb_colr.num_ord = " + currentOrders.get(j).numero + ") ";
+
+                if(i != (orders.size() - 1)){
+                    whereCond += "OR ";
+                } else if(j != (currentOrders.size() - 1)) {
+                    whereCond += "OR ";
+                }
+            }
+        }
+
+        baseSql += "( " + whereCond + ")";
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {}.getType();
+        SystemRESTConsumer.processSql(baseSql, typeOfObjectsList, new ISimpleOperationCallback<List<MtbColt>>() {
+            @Override
+            public void onSuccess(List<MtbColt> value) {
+                if(onComplete != null) onComplete.run(value);
+            }
+
+            @Override
+            public void onFailed(Exception ex) {
+                if(onFailed != null) onFailed.run(ex);
+            }
+        });
+
+    }
+
+
+
+
+
+
 
     public List<OrdineVenditaGroupedInevasoDTO> getSelectedOrders(List<OrdineVenditaGroupedInevasoDTO> groupedOrdiniInevasi){
         List<OrdineVenditaGroupedInevasoDTO> selectedOrdini = new ArrayList<>();
@@ -164,7 +213,7 @@ public class VenditaHelper {
 
     public interface ILoadPickingListCallback {
 
-        void onLoadSuccess(List<OrdineVenditaDTO> ordini);
+        void onLoadSuccess(List<PickingObjectDTO> ordini);
 
         void onLoadFail(Exception ex);
 

app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaDTO.java

@@ -1,364 +0,0 @@
-package it.integry.integrywmsnative.gest.vendita.dto;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.Log;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-
-import it.integry.integrywmsnative.core.model.MtbAart;
-import it.integry.integrywmsnative.core.model.MtbColt;
-
-public class OrdineVenditaDTO implements Parcelable {
-
-    public String ragSoc;
-    public int numero;
-    public String data;
-    public String gestione;
-    public String codMdep;
-    public String codAnag;
-    public String codVdes;
-    public String termCons;
-    public ArrayList<OrdineVenditaDTO.Riga> ordini;
-    public String codAlis;
-    public String rifOrd;
-
-
-    public static class Riga implements Parcelable {
-        public Float qtaOrd;            //QTA ORDINATA (tutta la qta ordiata)
-        public Float qtaRiservate;      //QTA COLLI (tutta la qta già accantonata nei colli
-        public Float qtaEvasa;          //QTA EVASA ORDINE (qta con documento)
-        //public Float qtaDaEvadere;      //qta_ord - qta_evasa - qta_colli
-        public int rigaOrd;
-        public String codJcom;
-        public String ragSocCom;
-        public String descrizioneCommessa;
-        public MtbAart mtbAart;
-        public OrdineVenditaDTO.PickingObjectDTO[] colliAssociati;
-        public Boolean hidden = null;
-        public String partitaMag;
-        public String codArtFor;
-        public String descrizioneEstesa;
-        public String codAlis;
-
-        public int numOrd;
-        public String dataOrd;
-        public String gestioneOrd;
-
-        public String dataCons;
-
-        public BigDecimal getQtaDaEvadere() {
-            return this.getQtaOrd().subtract(this.getQtaEvasa()).subtract(this.getQtaRiservate());
-        }
-
-
-        public BigDecimal getQtaOrd() {
-            return qtaOrd != null ? new BigDecimal(qtaOrd) : BigDecimal.ZERO;
-        }
-
-        public BigDecimal getQtaRiservate() {
-            return qtaRiservate != null ? new BigDecimal(qtaRiservate) : BigDecimal.ZERO;
-        }
-
-        public BigDecimal getQtaEvasa() {
-            return qtaEvasa != null ? new BigDecimal(qtaEvasa) : BigDecimal.ZERO;
-        }
-
-        public int getRigaOrd() {
-            return rigaOrd;
-        }
-
-        public String getCodJcom() {
-            return codJcom;
-        }
-
-        public String getRagSocCom() {
-            return ragSocCom;
-        }
-
-        public String getDescrizioneCommessa() {
-            return descrizioneCommessa;
-        }
-
-        public MtbAart getMtbAart() {
-            return mtbAart;
-        }
-
-        public OrdineVenditaDTO.PickingObjectDTO[] getColliAssociati() {
-            return colliAssociati;
-        }
-
-        public Boolean isHidden() {
-            return hidden;
-        }
-
-        public String getPartitaMag() {
-            return partitaMag;
-        }
-
-        public String getCodArtFor() {
-            return codArtFor;
-        }
-
-        public String getDescrizioneEstesa() {
-            return descrizioneEstesa;
-        }
-
-        public String getCodAlis() {
-            return codAlis;
-        }
-
-        public int getNumOrd() {
-            return numOrd;
-        }
-
-        public String getGestioneOrd() {
-            return gestioneOrd;
-        }
-
-        public String getDataCons() {
-            return dataCons;
-        }
-
-        public Date getDataOrd() {
-            SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-            Date dataOrd = null;
-
-            try{
-                dataOrd = sdf.parse(this.dataOrd);
-            } catch (Exception ex) {
-                Log.e("Parsing date", ex.getMessage());
-            }
-
-            return dataOrd;
-        }
-
-
-        public OrdineVenditaDTO.Riga setQtaOrd(Float qtaOrd) {
-            this.qtaOrd = qtaOrd;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setQtaRiservate(BigDecimal qtaRiservate) {
-            this.qtaRiservate = qtaRiservate.floatValue();
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setQtaEvasa(Float qtaEvasa) {
-            this.qtaEvasa = qtaEvasa;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setRigaOrd(int rigaOrd) {
-            this.rigaOrd = rigaOrd;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setCodJcom(String codJcom) {
-            this.codJcom = codJcom;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setRagSocCom(String ragSocCom) {
-            this.ragSocCom = ragSocCom;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setDescrizioneCommessa(String descrizioneCommessa) {
-            this.descrizioneCommessa = descrizioneCommessa;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setMtbAart(MtbAart mtbAart) {
-            this.mtbAart = mtbAart;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setHidden(boolean hidden) {
-            this.hidden = hidden;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setPartitaMag(String partitaMag) {
-            this.partitaMag = partitaMag;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setCodArtFor(String codArtFor) {
-            this.codArtFor = codArtFor;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setDescrizioneEstesa(String descrizioneEstesa) {
-            this.descrizioneEstesa = descrizioneEstesa;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setCodAlis(String codAlis) {
-            this.codAlis = codAlis;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setNumOrd(int numOrd) {
-            this.numOrd = numOrd;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setDataOrd(String dataOrd) {
-            this.dataOrd = dataOrd;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setGestioneOrd(String gestioneOrd) {
-            this.gestioneOrd = gestioneOrd;
-            return this;
-        }
-
-        public OrdineVenditaDTO.Riga setDataCons(String dataCons) {
-            this.dataCons = dataCons;
-            return this;
-        }
-
-        public Riga(){}
-
-        protected Riga(Parcel in) {
-            qtaOrd = in.readByte() == 0x00 ? null : in.readFloat();
-            qtaRiservate = in.readByte() == 0x00 ? null : in.readFloat();
-            rigaOrd = in.readInt();
-            codJcom = in.readString();
-            ragSocCom = in.readString();
-            descrizioneCommessa = in.readString();
-            mtbAart = (MtbAart) in.readValue(MtbAart.class.getClassLoader());
-            hidden = in.readByte() == 0x00 ? null : in.readByte() != 0x00;
-            partitaMag = in.readString();
-            codArtFor = in.readString();
-            descrizioneEstesa = in.readString();
-            codAlis = in.readString();
-            numOrd = in.readInt();
-            dataOrd = in.readString();
-            gestioneOrd = in.readString();
-            dataCons = in.readString();
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            if (qtaOrd == null) {
-                dest.writeByte((byte) (0x00));
-            } else {
-                dest.writeByte((byte) (0x01));
-                dest.writeFloat(qtaOrd);
-            }
-            if (qtaRiservate == null) {
-                dest.writeByte((byte) (0x00));
-            } else {
-                dest.writeByte((byte) (0x01));
-                dest.writeFloat(qtaRiservate);
-            }
-            dest.writeInt(rigaOrd);
-            dest.writeString(codJcom);
-            dest.writeString(ragSocCom);
-            dest.writeString(descrizioneCommessa);
-            dest.writeValue(mtbAart);
-            if (hidden == null) {
-                dest.writeByte((byte) (0x00));
-            } else {
-                dest.writeByte((byte) (0x01));
-                dest.writeByte((byte) (hidden ? 0x01 : 0x00));
-            }
-            dest.writeString(partitaMag);
-            dest.writeString(codArtFor);
-            dest.writeString(descrizioneEstesa);
-            dest.writeString(codAlis);
-            dest.writeInt(numOrd);
-            dest.writeString(dataOrd);
-            dest.writeString(gestioneOrd);
-            dest.writeString(dataCons);
-        }
-
-        @SuppressWarnings("unused")
-        public static final Parcelable.Creator<OrdineVenditaDTO.Riga> CREATOR = new Parcelable.Creator<OrdineVenditaDTO.Riga>() {
-            @Override
-            public OrdineVenditaDTO.Riga createFromParcel(Parcel in) {
-                return new OrdineVenditaDTO.Riga(in);
-            }
-
-            @Override
-            public OrdineVenditaDTO.Riga[] newArray(int size) {
-                return new OrdineVenditaDTO.Riga[size];
-            }
-        };
-
-    }
-
-    public static class PickingObjectDTO extends MtbColt {
-        public boolean hidden = false;
-    }
-
-    public OrdineVenditaDTO() {}
-
-    protected OrdineVenditaDTO(Parcel in) {
-        ragSoc = in.readString();
-        numero = in.readInt();
-        data = in.readString();
-        gestione = in.readString();
-        codMdep = in.readString();
-        codAnag = in.readString();
-        codVdes = in.readString();
-        termCons = in.readString();
-        codAlis = in.readString();
-        rifOrd = in.readString();
-        if (in.readByte() == 0x01) {
-            ordini = new ArrayList<OrdineVenditaDTO.Riga>();
-            in.readList(ordini, OrdineVenditaDTO.Riga.class.getClassLoader());
-        } else {
-            ordini = null;
-        }
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(ragSoc);
-        dest.writeInt(numero);
-        dest.writeString(data);
-        dest.writeString(gestione);
-        dest.writeString(codMdep);
-        dest.writeString(codAnag);
-        dest.writeString(codVdes);
-        dest.writeString(termCons);
-        dest.writeString(codAlis);
-        dest.writeString(rifOrd);
-        if (ordini == null) {
-            dest.writeByte((byte) (0x00));
-        } else {
-            dest.writeByte((byte) (0x01));
-            dest.writeList(ordini);
-        }
-    }
-
-    @SuppressWarnings("unused")
-    public static final Parcelable.Creator<OrdineVenditaDTO> CREATOR = new Parcelable.Creator<OrdineVenditaDTO>() {
-        @Override
-        public OrdineVenditaDTO createFromParcel(Parcel in) {
-            return new OrdineVenditaDTO(in);
-        }
-
-        @Override
-        public OrdineVenditaDTO[] newArray(int size) {
-            return new OrdineVenditaDTO[size];
-        }
-    };
-
-}

app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java

@@ -0,0 +1,220 @@
+package it.integry.integrywmsnative.gest.vendita.dto;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class PickingObjectDTO {
+
+    public Integer numCollo;
+    public String gestione;
+    public String serCollo;
+    public String descrizioneEstesa;
+    public String codJcom;
+    public String codMart;
+    public String posizione;
+    public BigDecimal qtaCollo;
+    public String dataCollo;
+    public Integer idViaggio;
+    public String codTagl;
+    public String codCol;
+    public String dataScad;
+    public String codArtFor;
+    public String partitaMag;
+    public BigDecimal qtaOrd;
+    public BigDecimal numCnfCollo;
+    public BigDecimal numCnf;
+    public String codAlis;
+    public BigDecimal colliPedana;
+
+    public Integer getNumCollo() {
+        return numCollo;
+    }
+
+    public PickingObjectDTO setNumCollo(Integer numCollo) {
+        this.numCollo = numCollo;
+        return this;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public PickingObjectDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public PickingObjectDTO setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+        return this;
+    }
+
+    public String getDescrizioneEstesa() {
+        return descrizioneEstesa;
+    }
+
+    public PickingObjectDTO setDescrizioneEstesa(String descrizioneEstesa) {
+        this.descrizioneEstesa = descrizioneEstesa;
+        return this;
+    }
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public PickingObjectDTO setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+        return this;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public PickingObjectDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public PickingObjectDTO setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
+    public BigDecimal getQtaCollo() {
+        return qtaCollo;
+    }
+
+    public PickingObjectDTO setQtaCollo(BigDecimal qtaCollo) {
+        this.qtaCollo = qtaCollo;
+        return this;
+    }
+
+    public String getDataColloS() {
+        return dataCollo;
+    }
+
+    public Date getDataColloD() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        return sdf.parse(getDataColloS());
+    }
+
+    public PickingObjectDTO setDataCollo(String dataCollo) {
+        this.dataCollo = dataCollo;
+        return this;
+    }
+
+    public Integer getIdViaggio() {
+        return idViaggio;
+    }
+
+    public PickingObjectDTO setIdViaggio(Integer idViaggio) {
+        this.idViaggio = idViaggio;
+        return this;
+    }
+
+    public String getCodTagl() {
+        return codTagl;
+    }
+
+    public PickingObjectDTO setCodTagl(String codTagl) {
+        this.codTagl = codTagl;
+        return this;
+    }
+
+    public String getCodCol() {
+        return codCol;
+    }
+
+    public PickingObjectDTO setCodCol(String codCol) {
+        this.codCol = codCol;
+        return this;
+    }
+
+    public String getDataScadS() {
+        return dataScad;
+    }
+
+    public Date getDataScadD() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        return sdf.parse(getDataScadS());
+    }
+
+    public PickingObjectDTO setDataScad(String dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+
+    public String getCodArtFor() {
+        return codArtFor;
+    }
+
+    public PickingObjectDTO setCodArtFor(String codArtFor) {
+        this.codArtFor = codArtFor;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public PickingObjectDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public BigDecimal getQtaOrd() {
+        return qtaOrd;
+    }
+
+    public PickingObjectDTO setQtaOrd(BigDecimal qtaOrd) {
+        this.qtaOrd = qtaOrd;
+        return this;
+    }
+
+    public BigDecimal getNumCnfCollo() {
+        return numCnfCollo;
+    }
+
+    public PickingObjectDTO setNumCnfCollo(BigDecimal numCnfCollo) {
+        this.numCnfCollo = numCnfCollo;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public PickingObjectDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public String getCodAlis() {
+        return codAlis;
+    }
+
+    public PickingObjectDTO setCodAlis(String codAlis) {
+        this.codAlis = codAlis;
+        return this;
+    }
+
+    public BigDecimal getColliPedana() {
+        return colliPedana;
+    }
+
+    public PickingObjectDTO setColliPedana(BigDecimal colliPedana) {
+        this.colliPedana = colliPedana;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java

@@ -3,8 +3,8 @@ package it.integry.integrywmsnative.gest.vendita.rest;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
@@ -15,6 +15,6 @@ public interface OrdiniVenditaRESTConsumerService {
     Call<ServiceRESTResponse<List<OrdineVenditaInevasoDTO>>> listOrdiniInevasi(@Query("codMdep") String codMdep);
 
     @GET("getPickingListFromOrdini")
-    Call<ServiceRESTResponse<List<OrdineVenditaDTO>>> getPickingList(@Query("codMdep") String codMdep, @Query("dataCons") String dataCons, @Query("codBarreBancale") String codBarreBacale);
+    Call<ServiceRESTResponse<List<PickingObjectDTO>>> getPickingList(@Query("codMdep") String codMdep, @Query("dataCons") String dataCons, @Query("chiaviOrdini") String codBarreBacale);
 
 }

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

@@ -52,6 +52,10 @@
         <item quantity="one">articolo disponibile</item>
         <item quantity="other">articoli disponibili</item>
     </plurals>
+    <plurals name="already_registered_lu">
+        <item quantity="one"><![CDATA[bancale già registrato]]></item>
+        <item quantity="other"><![CDATA[bancali già registrati]]></item>
+    </plurals>
     <plurals name="loaded_orders_message">
         <item quantity="one"><![CDATA[&#200; stato caricato <b>%d</b> ordine]]></item>
         <item quantity="other"><![CDATA[Sono stati caricati <b>%d</b> ordini]]></item>

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

@@ -59,6 +59,10 @@
         <item quantity="one">available item</item>
         <item quantity="other">available items</item>
     </plurals>
+    <plurals name="already_registered_lu">
+        <item quantity="one">already registered LU</item>
+        <item quantity="other">already registered LUs</item>
+    </plurals>
     <plurals name="loaded_orders_message">
         <item quantity="one"><![CDATA[<b>%d</b> order loaded]]></item>
         <item quantity="other"><![CDATA[<b>%d</b> orders loaded]]></item>