diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b7a9adff..b2777067 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
+
@@ -19,6 +20,7 @@
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9e0d1ee8..e6b355dc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,6 +6,7 @@
+
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 52f57fad..fc9d4646 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index b53f97a8..ecc143eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,7 +83,9 @@ android {
abortOnError false
}
- dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime"]
+ dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime",":dynamic_frudis"]
+
+
}
dependencies {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6fde5351..3cbcb7b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,23 +1,51 @@
+
+ - reference
+ - references
+
+
+ - item
+ - items
+
+
+
+ - ordered item
+ - ordered items
+
+
+ - already registered LU
+ - already registered LUs
+
+
+
+ - %d order selected]]>
+ - %d orders selected]]>
+
+
+ - @string/piece
+ - pieces
+
+
+
+
+ - package
+ - packages
+
Integry WMS
Integry
-
Open navigation drawer
Close navigation drawer
Settings
- Custom company settings
-
+
+ Custom company settings
Waiting
Loading
Completed
Search...
Login
-
Permissions are required for app to work properly
-
-
%s of %s]]>
%s of %s]]>
%s]]>
@@ -43,47 +71,19 @@
Create new LU
Insert quantity
Show already created LU
+
+
+
Recover LU
+
+
Print LU
Print
Confirm
Additional notes
Enter any additional notes in your logistics unit
LU
-
-
-
General settings
-
-
-
- - reference
- - references
-
-
- - item
- - items
-
-
- - ordered item
- - ordered items
-
-
- - already registered LU
- - already registered LUs
-
-
- - %d order selected]]>
- - %d orders selected]]>
-
-
- - @string/piece
- - pieces
-
-
- - package
- - packages
-
Close LU
Submitted items
Orders
@@ -253,6 +253,7 @@
Shipped %s
Delivered on %s
+ Frudis customizations
Batch lot %s is inactive. Continue?
diff --git a/build_all.bat b/build_all.bat
index 16e1981a..121f6fee 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -1,3 +1,4 @@
call build_azienda.bat _base
call build_azienda.bat vgalimenti
-call build_azienda.bat ime
\ No newline at end of file
+call build_azienda.bat ime
+call build_azienda.bat frudis
\ No newline at end of file
diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
index 8d2add83..5c3ab3cd 100644
--- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
+++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
@@ -6,7 +6,6 @@ import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfigura
public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
public CustomConfiguration() {
-
}
}
diff --git a/dynamic_frudis/.gitignore b/dynamic_frudis/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/dynamic_frudis/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/dynamic_frudis/build.gradle b/dynamic_frudis/build.gradle
new file mode 100644
index 00000000..8d14a8b1
--- /dev/null
+++ b/dynamic_frudis/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.dynamic-feature'
+
+android {
+ compileSdkVersion 28
+
+
+
+ defaultConfig {
+ minSdkVersion 21
+ targetSdkVersion 28
+ versionCode 1
+ versionName "1.0"
+
+ }
+ compileOptions {
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ }
+
+
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation project(':app')
+}
diff --git a/dynamic_frudis/src/main/AndroidManifest.xml b/dynamic_frudis/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a4fad88a
--- /dev/null
+++ b/dynamic_frudis/src/main/AndroidManifest.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
new file mode 100644
index 00000000..2a98ae74
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
@@ -0,0 +1,29 @@
+package it.integry.wms.dynamic_customization;
+
+import android.content.Context;
+import android.util.Log;
+
+import it.integry.integrywmsnative.core.class_router.ClassRouter;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.wms.dynamic_customization.extensions.CustomConfiguration;
+import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita;
+import it.integry.wms.dynamic_customization.extensions.OrdiniVendita;
+
+public class DynamicContext {
+
+ public void init(Context context) {
+ Log.d("DynamicContext", "Caricamento personalizzazioni per Frudis");
+
+ try {
+ ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class);
+ ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class);
+ ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class);
+ } catch (Exception ex) {
+ UtilityExceptions.defaultException(context, ex);
+ }
+
+ Log.d("DynamicContext", "Caricamento personalizzazioni per Frudis COMPLETATO");
+
+ }
+
+}
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
new file mode 100644
index 00000000..f01ceee4
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
@@ -0,0 +1,12 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
+import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
+
+public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
+
+ public CustomConfiguration() {
+ configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationFRUDIS());
+ }
+
+}
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java
new file mode 100644
index 00000000..77adb537
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java
@@ -0,0 +1,21 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita;
+
+public class FiltroOrdiniVendita implements IFiltroOrdiniVendita {
+
+ @Override
+ public boolean shoudShowCodMdepFilter() {
+ return false;
+ }
+
+ @Override
+ public boolean shoudShowIdViaggioFilter() {
+ return false;
+ }
+
+ @Override
+ public boolean shoudShowAgenteFilter() {
+ return false;
+ }
+}
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
new file mode 100644
index 00000000..34d0f0f6
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
@@ -0,0 +1,38 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
+
+public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
+
+ public MenuConfigurationFRUDIS() {
+
+
+ this.addGroup(new MenuGroup()
+ .setGroupText(it.integry.integrywmsnative.R.string.manufacture)
+
+ .addItem(new MenuItem()
+ .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione)
+ .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment)
+ .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione))
+
+ .addItem(new MenuItem()
+ .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione)
+ .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
+ .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione))
+
+ .addItem(new MenuItem()
+ .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale)
+ .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment)
+ .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale))
+
+ .addItem(new MenuItem()
+ .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale)
+ .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment)
+ .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale))
+ );
+
+
+
+ }
+
+}
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
new file mode 100644
index 00000000..11892df9
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
@@ -0,0 +1,26 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import android.app.ProgressDialog;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityToast;
+import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+
+public class OrdiniVendita implements IOrdiniVendita {
+
+
+ @Override
+ public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
+ UtilityToast.showToast("Avviato metodo in Frudis");
+
+ ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(),
+ onComplete,
+ onFailed);
+ }
+}
diff --git a/settings.gradle b/settings.gradle
index 6cd55106..97695f9b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime'
+include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime', ':dynamic_frudis'