diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 7d7c436a..cdd4ca23 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fc092ac4..b7a9adff 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index d1a9815c..9e0d1ee8 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 28ffe8c9..9e007aa0 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 d047d357..6e5af1a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
- def appVersionCode = 62
- def appVersionName = '1.6.1'
+ def appVersionCode = 63
+ def appVersionName = '1.6.2'
signingConfigs {
release {
@@ -83,7 +83,9 @@ android {
abortOnError false
}
- dynamicFeatures = [":dynamic_vgalimenti"]
+ dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime"]
+
+
}
@@ -95,17 +97,17 @@ dependencies {
})
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.orhanobut:logger:2.2.0'
- implementation 'com.google.firebase:firebase-core:16.0.9'
+ implementation 'com.google.firebase:firebase-core:17.0.0'
implementation 'com.google.firebase:firebase-crash:16.2.1'
- implementation 'com.google.firebase:firebase-perf:17.0.0'
- implementation 'com.crashlytics.sdk.android:crashlytics:2.10.0'
- implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+ implementation 'com.google.firebase:firebase-perf:18.0.0'
+ implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+ implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'com.google.android.material:material:1.1.0-alpha06'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
+ implementation 'com.google.android.material:material:1.1.0-alpha07'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation 'androidx.cardview:cardview:1.0.0'
- implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
- implementation 'androidx.preference:preference:1.1.0-alpha04'
+ implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
+ implementation 'androidx.preference:preference:1.1.0-beta01'
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java
new file mode 100644
index 00000000..88a9f01e
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java
@@ -0,0 +1,26 @@
+package it.integry.integrywmsnative.core.class_router;
+
+import java.util.HashMap;
+
+import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
+import it.integry.integrywmsnative.core.utility.UtilityHashMap;
+
+public class BaseCustomConfiguration implements ICustomConfiguration {
+
+
+ public static class Keys {
+ public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 0;
+ }
+
+ protected HashMap configurations = new HashMap() {{
+ put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true);
+ }};
+
+
+
+ @Override
+ public T getConfig(int key) {
+ return UtilityHashMap.getValue(configurations, key);
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java
index 4446e468..b306be95 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java
@@ -2,6 +2,6 @@ package it.integry.integrywmsnative.core.class_router.interfaces;
public interface ICustomConfiguration {
- boolean shoudShowCodFornInVendita();
+ T getConfig(int key);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityHashMap.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityHashMap.java
new file mode 100644
index 00000000..ca773782
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityHashMap.java
@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.utility;
+
+import java.util.HashMap;
+
+public class UtilityHashMap {
+
+
+ public static T getValueIfExists(HashMap map, Object key){
+ T value = null;
+ if(map != null && map.containsKey(key)) value = (T) map.get(key);
+ return value;
+ }
+
+ public static T getValue(HashMap map, Object key){
+ return (T) map.get(key);
+ }
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index 2ad9dae4..9d21b9d4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -224,15 +224,15 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
- @OnClick(R.id.fast_button_prod_versamento_materiale)
- public void onClickProdVersamentoMateriale(View view) {
- ((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale);
- }
-
- @OnClick(R.id.fast_button_prod_recupero_materiale)
- public void onClickProdRecuperoMateriale(View view) {
- ((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale);
- }
+// @OnClick(R.id.fast_button_prod_versamento_materiale)
+// public void onClickProdVersamentoMateriale(View view) {
+// ((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale);
+// }
+//
+// @OnClick(R.id.fast_button_prod_recupero_materiale)
+// public void onClickProdRecuperoMateriale(View view) {
+// ((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale);
+// }
@Override
public void setScrollToolbar(ElevatedToolbar toolbar) {
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 55221a9e..67183dad 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
@@ -94,7 +94,7 @@ public class VenditaHelper {
String joinedBarcodes = TextUtils.join(",", barcodeOrdini);
- OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 60);
+ OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 90);
Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_v");
perfTrace.start();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
index ad4d53df..038f9c8b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
@@ -106,7 +106,7 @@ public class VenditaViewModel {
if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
- if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO) {
+ if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) {
//GET BY COMMESSA COLLO
mHelper.getOrdiniInCommessaCollo(mtbColt, orderList -> {
@@ -176,7 +176,7 @@ public class VenditaViewModel {
private void showWrongGestioneUL() {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
- new SpannableString(Html.fromHtml(mContext.getResources().getText(R.string.gestione_V_not_accepted_message).toString())),
+ new SpannableString(Html.fromHtml(mContext.getResources().getText(R.string.gestione_A_L_only_accepted_message).toString())),
null, null).show();
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java
index 31ea985a..e5b05c0d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.model.MtbColr;
@@ -44,9 +45,13 @@ public class VenditaOrdineInevasoHelper {
for(int i = 0; i < mPickingList.size(); i++) {
- mPickingList.get(i).setDeactivated(mPickingList.get(i).getQtaCollo().floatValue() == 0);
- mPickingList.get(i).setHidden(false);
- mPickingList.get(i).setTempHidden(false);
+ if(mPickingList.get(i).isHidden() == null || forceHiddenCheck) {
+ PickingObjectDTO tmpItem = mPickingList.get(i);
+
+ tmpItem.setDeactivated(tmpItem.getQtaCollo().floatValue() == 0);
+ tmpItem.setHidden(false);
+ tmpItem.setTempHidden(false);
+ }
}
List listOfKnownPositions = Stream.of(mPickingList)
@@ -122,7 +127,7 @@ public class VenditaOrdineInevasoHelper {
String badge1 = "";
- if(customConfiguration.shoudShowCodFornInVendita()) {
+ if(customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE)) {
badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : "";
badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart());
} else {
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 27a6c472..ff200a73 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -429,172 +429,172 @@
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e0b78f2a..b6edd4b4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -172,6 +172,7 @@
Nessun articolo trovato
Nessuna UL trovata
Non sono stati trovati ordini
+ Sono ammesse solo UL di Acquisto o Lavorazione qui
Acquisto o Vendita non sono ammesse qui]]>
Vendita non sono ammesse qui]]>
E\' stata trovata più di una UL
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6533e55..f58d92bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,6 +178,7 @@
No items found
No LU found
No orders found
+ Only Purchase or Production\'s LU are accepted here
The LU of type Purchase or Sale is not accepted here
The LU of type Sale is not accepted here
Multiple LU found
@@ -225,6 +226,7 @@
Please, select a recipient before proceeding
Invalid customer
Invalid recipient
+ Module Title
diff --git a/build_all.bat b/build_all.bat
index 94ac1622..16e1981a 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -1,2 +1,3 @@
call build_azienda.bat _base
-call build_azienda.bat vgalimenti
\ No newline at end of file
+call build_azienda.bat vgalimenti
+call build_azienda.bat ime
\ 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 589de722..8d2add83 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
@@ -1,11 +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 implements ICustomConfiguration {
+public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
+
+ public CustomConfiguration() {
- @Override
- public boolean shoudShowCodFornInVendita() {
- return true;
}
+
}
diff --git a/dynamic_ime/.gitignore b/dynamic_ime/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/dynamic_ime/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/dynamic_ime/build.gradle b/dynamic_ime/build.gradle
new file mode 100644
index 00000000..403ded64
--- /dev/null
+++ b/dynamic_ime/build.gradle
@@ -0,0 +1,25 @@
+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_ime/src/main/AndroidManifest.xml b/dynamic_ime/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..429d9080
--- /dev/null
+++ b/dynamic_ime/src/main/AndroidManifest.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
new file mode 100644
index 00000000..de37a9a3
--- /dev/null
+++ b/dynamic_ime/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 Azienda IME");
+
+ 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 Azienda IME COMPLETATO");
+
+ }
+
+}
diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
new file mode 100644
index 00000000..8d2add83
--- /dev/null
+++ b/dynamic_ime/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() {
+
+ }
+
+}
diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java
new file mode 100644
index 00000000..a5bc04d7
--- /dev/null
+++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java
@@ -0,0 +1,11 @@
+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;
+ }
+}
diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
new file mode 100644
index 00000000..e0adf794
--- /dev/null
+++ b/dynamic_ime/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.REST.consumers.ColliMagazzinoRESTConsumer;
+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.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityToast;
+import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
+
+public class OrdiniVendita implements IOrdiniVendita {
+
+
+ @Override
+ public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
+ UtilityToast.showToast("Avviato metodo in BaseFeature");
+
+ ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(),
+ onComplete,
+ onFailed);
+ }
+}
diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
index 85f3e67b..6983cd84 100644
--- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
+++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
@@ -1,10 +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 implements ICustomConfiguration {
- @Override
- public boolean shoudShowCodFornInVendita() {
- return false;
+public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
+
+ public CustomConfiguration() {
+ configurations.put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, false);
}
-}
+
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 10d18584..6cd55106 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary'
+include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime'