diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java index dd05e476..eac40909 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java @@ -48,7 +48,7 @@ public class MenuConfiguration extends BaseMenuConfiguration { .setTitleText(R.string.vendita_title_fragment) .setTitleIcon(R.drawable.ic_dashboard_spedizione) .setDrawerIcon(R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1))) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1))) .addItem(new MenuItem() .setID(R.id.nav_free_picking) 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 80e91f7f..2b34d719 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 @@ -111,6 +111,14 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { public void getBancaliGiaRegistrati(List orders, GestioneEnum gestione, int segno, RunnableArgs> onComplete, RunnableArgs onFailed) { + String whereCondGestione = ""; + + if(gestione != null) { + whereCondGestione = "mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " "; + } else { + whereCondGestione = "(mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') "; + } + String baseSql = "SELECT DISTINCT mtb_colt.* " + "FROM mtb_colt, " + " mtb_colr " + @@ -118,7 +126,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { " 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 = " + UtilityDB.valueToString(gestione.getText()) + " " + + " AND " + whereCondGestione + " AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " + " AND mtb_colt.data_doc IS NULL AND "; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 48917ffe..0d24b483 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -85,7 +85,7 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm Bundle args = new Bundle(); args.putString("gestioneOrd", gestioneOrd.getText()); - args.putString("gestioneCol", gestioneCol.getText()); + args.putString("gestioneCol", gestioneCol != null ? gestioneCol.getText() : null); args.putInt("segnoCol", segnoCol); fragment.setArguments(args); @@ -96,7 +96,8 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mCurrentGestioneOrd = GestioneEnum.fromString(getArguments().getString("gestioneOrd")); - mCurrentGestioneCol = GestioneEnum.fromString(getArguments().getString("gestioneCol")); + String gestioneCol = getArguments().getString("gestioneCol"); + mCurrentGestioneCol = gestioneCol != null ? GestioneEnum.fromString(gestioneCol) : null; mCurrentSegnoCol = getArguments().getInt("segnoCol"); } diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java index 5358a07c..a1576eb6 100644 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java +++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java @@ -27,7 +27,7 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration { .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1))) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1))) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_free_picking) diff --git a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java b/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java index d68ec9ac..4f79143e 100644 --- a/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java +++ b/dynamic_gramm/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationGRAMM.java @@ -47,7 +47,7 @@ public class MenuConfigurationGRAMM extends BaseMenuConfiguration { .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1))) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1))) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_free_picking) diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java index 5b946757..e86e1462 100644 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java @@ -46,7 +46,7 @@ public class MenuConfigurationIME extends BaseMenuConfiguration { .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1))) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1))) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_free_picking) diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java index c9c5dfe8..a928a774 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java @@ -34,7 +34,7 @@ public class MenuConfigurationVG extends BaseMenuConfiguration { .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione) .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, GestioneEnum.VENDITA, -1))) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1))) .addItem(new MenuItem() .setID(it.integry.integrywmsnative.R.id.nav_free_picking)