From bded2fc04e8b66a37c9cb8ed9864deeef458dd86 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 10 Jul 2019 13:30:48 +0200
Subject: [PATCH] Aggiunto posizionamento su COD_JFAS quando viene fatto
 picking da produzione.

---
 .idea/runConfigurations/app.xml               |  2 +-
 .../gest/vendita/MainVenditaFragment.java     | 36 ++++++++++++++-----
 .../vendita/dto/OrdineVenditaInevasoDTO.java  | 12 +++++++
 .../VenditaOrdineInevasoViewModel.java        | 23 ++++++++++--
 app/src/main/res/values-it/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 17b791c7..2845a8ea 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
     <option name="DEPLOY_AS_INSTANT" value="false" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
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 fdd4d488..ce689be6 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
@@ -324,28 +324,46 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
                     .toList();
 
             if (foundGestioni != null && foundGestioni.size() > 1) {
-                DialogSimpleMessageHelper.makeErrorDialog(getContext(), new SpannableString(getString(R.string.error_multiple_gest)), null, () -> {
-                    onFailed.run();
-                }).show();
+                DialogSimpleMessageHelper.makeErrorDialog(getContext(), new SpannableString(getString(R.string.error_multiple_gest)), null, onFailed::run).show();
                 return;
             }
 
             //Definizione del deposito di default
             List<String> foundCodMdep = Stream.of(selectedOrders)
                     .map(OrdineVenditaInevasoDTO::getCodMdep)
-                    .withoutNulls()
+//                    .withoutNulls()
                     .distinctBy(x -> x)
                     .toList();
 
             if (foundCodMdep != null && foundCodMdep.size() > 1) {
-                DialogSimpleMessageHelper.makeErrorDialog(getContext(), new SpannableString(getString(R.string.error_multiple_cod_mdep_ordv)), null, () -> {
-                    onFailed.run();
-                }).show();
+                DialogSimpleMessageHelper.makeErrorDialog(getContext(), new SpannableString(getString(R.string.error_multiple_cod_mdep_ordv)), null, onFailed::run).show();
                 return;
             }
-        }
 
-        onComplete.run();
+
+            //NON-BLOCKING CHECKS
+
+            //Definizione del codJfas di default
+            List<String> foundCodJfas = Stream.of(selectedOrders)
+                    .map(OrdineVenditaInevasoDTO::getCodJfas)
+//                    .withoutNulls()
+                    .distinctBy(x -> x)
+                    .toList();
+
+            if (foundCodJfas != null && foundCodJfas.size() > 1) {
+                DialogSimpleMessageHelper.makeWarningDialog(getContext(), new SpannableString(getString(R.string.error_multiple_cod_jfas_ordp)), null, () -> {
+
+
+                    onComplete.run();
+
+
+                }).show();
+            } else {
+                onComplete.run();
+            }
+        } else {
+            onComplete.run();
+        }
     }
 
     private void startVenditaActivity(List<PickingObjectDTO> ordini, List<OrdineVenditaInevasoDTO> selectedOrders, List<MtbColt> mtbColtList) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java
index d267e73f..e7482603 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java
@@ -50,6 +50,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable {
     private int colliRiservati;
     private String existCollo;
     private String nomeAgente;
+    private String codJfas;
 
     public BindableBoolean selected;
 
@@ -107,6 +108,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable {
         colliRiservati = in.readInt();
         existCollo = in.readString();
         nomeAgente = in.readString();
+        codJfas = in.readString();
 
         selected = new BindableBoolean(in.readByte() == 0x01);
     }
@@ -165,6 +167,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable {
         dest.writeInt(colliRiservati);
         dest.writeString(existCollo);
         dest.writeString(nomeAgente);
+        dest.writeString(codJfas);
 
         dest.writeByte(selected.get() ? (byte) 1 : (byte) 0);
     }
@@ -544,6 +547,15 @@ public class OrdineVenditaInevasoDTO implements Parcelable {
         return this;
     }
 
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public OrdineVenditaInevasoDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
     public boolean isSelected() {
         return selected.get();
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
index f2f93dd4..d8997675 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
@@ -94,6 +94,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
     private String defaultRifOrdOfUL = null;
     private Integer defaultNumOrdOfUL = null;
     private Date defaultDataOrdOfUL = null;
+    private String defaultCodJFasOfUL = null;
 
 
     private Integer mtbColtSessionID = null;
@@ -179,7 +180,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             //Definizione del deposito di default
             List<String> foundCodMdep = Stream.of(mTestateOrdini)
                     .map(OrdineVenditaInevasoDTO::getCodMdep)
-                    .withoutNulls()
+//                    .withoutNulls()
                     .distinctBy(x -> x)
                     .toList();
 
@@ -211,7 +212,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             //Definizione del codAnag
             List<String> foundCodAnag = Stream.of(mTestateOrdini)
                     .map(OrdineVenditaInevasoDTO::getCodAnagOrd)
-                    .withoutNulls()
+//                    .withoutNulls()
                     .distinctBy(x -> x)
                     .toList();
 
@@ -223,7 +224,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             //Definizione del rifOrd
             List<String> foundRifOrd = Stream.of(mTestateOrdini)
                     .map(OrdineVenditaInevasoDTO::getRifOrd)
-                    .withoutNulls()
+//                    .withoutNulls()
                     .distinctBy(x -> x)
                     .toList();
 
@@ -255,6 +256,18 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 defaultDataOrdOfUL = foundDataOrd.get(0);
             }
 
+
+            //Definizione del codJfas
+            List<String> foundCodJfas = Stream.of(mTestateOrdini)
+                    .map(OrdineVenditaInevasoDTO::getCodJfas)
+                    //.withoutNulls()
+                    .distinctBy(x -> x)
+                    .toList();
+
+            if(foundCodJfas != null && foundCodJfas.size() == 1){
+                defaultCodJFasOfUL = foundCodJfas.get(0);
+            }
+
         }
     }
 
@@ -808,6 +821,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 .setCodMdep(defaultCodMdepOfUL)
                 .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
+        if(defaultGestioneOfUL == GestioneEnum.LAVORAZIONE) {
+            mtbColt.setPosizione(defaultCodJFasOfUL);
+        }
+
         if(customNumCollo != null) {
             mtbColt.setNumCollo(customNumCollo);
         }
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3d28cbfc..9efb468f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -202,6 +202,7 @@
     <string name="error_multiple_gest">Impossibile caricare ordini di diverse <b>gestioni</b></string>
     <string name="error_no_gest_found">Non è stato possibile identificare la <b>gestione</b> degli ordini selezionati</string>
     <string name="error_multiple_cod_mdep_ordv">Impossibile caricare ordini di diversi <b>depositi</b></string>
+    <string name="error_multiple_cod_jfas_ordp">Non verrà salvata la <b>linea di produzione</b> poiché stai selezionando ordini di diverse produzioni</string>
 
     <string name="recovering_data">Recupero dati</string>
     <string name="wait_a_moment">Attendi qualche istante</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ed5b9bb..e213b624 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,6 +203,7 @@
     <string name="error_multiple_gest">Can\'t load orders of different type</string>
     <string name="error_no_gest_found">Can\'t load current order type</string>
     <string name="error_multiple_cod_mdep_ordv">Can\'t load orders of different deposits</string>
+    <string name="error_multiple_cod_jfas_ordp">The <b>production line</b> will not be saved because you are selecting orders for different productions</string>
 
     <string name="recovering_data">Recovering data</string>
     <string name="wait_a_moment">Wait a moment</string>