From 386d51ffd744a1ec4f86693fdf2fe46d591dadfe Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 25 May 2023 12:40:40 +0200 Subject: [PATCH 1/5] [CARELLI - INVENTARIO] - risolto problema caricamento dati da inventario precedente --- .../core/data_store/db/RoomModule.java | 28 +++---------------- .../respository_new/InventarioRepository.java | 2 +- .../picking/PickingInventarioViewModel.java | 2 +- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java index b4a214e2..2c1e84dd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java @@ -54,13 +54,12 @@ public class RoomModule { } - - @Singleton @Provides RawDao providesRawDao(AppDatabase appDatabase) { return appDatabase.rawDao(); } + @Singleton @Provides ArticoloGrigliaDao providesArticoloGrigliaDao(AppDatabase appDatabase) { @@ -110,12 +109,6 @@ public class RoomModule { } - - - - - - @Singleton @Provides InventarioRowMapper providesInventarioRowMapper() { @@ -129,62 +122,50 @@ public class RoomModule { } - @Singleton @Provides InventarioLocalDataSource providesInventarioLocalDataSource(ExecutorService executorService, InventarioDao inventarioDao) { return new InventarioLocalDataSource(executorService, inventarioDao); } - - @Singleton @Provides InventarioRowLocalDataSource providesInventarioRowLocalDataSource(ExecutorService executorService, InventarioRowDao inventarioRowDao) { return new InventarioRowLocalDataSource(executorService, inventarioRowDao); } - - - - - - @Singleton @Provides ArticoloGrigliaRepository providesArticoloGrigliaRepository(ExecutorService executorService, Handler handler, ArticoloGrigliaDao articoloGrigliaDao) { return new ArticoliGrigliaDataSource(executorService, handler, articoloGrigliaDao); } - @Singleton + @Provides ArticoliOrdineRepository providesArticoliOrdineRepository(ExecutorService executorService, Handler handler, ArticoloOrdineDao articoloOrdineDao) { return new ArticoliOrdineDataSource(executorService, handler, articoloOrdineDao); } - @Singleton + @Provides GrigliaRepository providesGrigliaRepository(ExecutorService executorService, Handler handler, GrigliaDao grigliaDao) { return new GrigliaDataSource(executorService, handler, grigliaDao); } - @Singleton + @Provides OrdineRepository providesOrdineRepository(ExecutorService executorService, Handler handler, OrdineDao ordineDao) { return new OrdineDataSource(executorService, handler, ordineDao); } - @Singleton @Provides MtbColtRepository providesMtbColtRepository(ExecutorService executorService, Handler handler, MtbColtDao mtbColtDao) { return new SqlMtbColtDataSource(executorService, handler, mtbColtDao); } - @Singleton @Provides MtbColrDataSource providesMtbColrRepository(ExecutorService executorService, Handler handler, MtbColrDao mtbColrDao) { return new SqlMtbColrDataSource(executorService, handler, mtbColrDao); } - @Singleton @Provides InventarioRepository providesInventarioRepository(ExecutorService executorService, Handler handler, InventarioLocalDataSource inventarioLocalDataSource, @@ -193,7 +174,6 @@ public class RoomModule { return new InventarioRepository(inventarioLocalDataSource, inventarioRESTConsumer, inventarioMapper, handler, executorService); } - @Singleton @Provides InventarioRowRepository providesInventarioRowRepository(ExecutorService executorService, Handler handler, InventarioRowLocalDataSource inventarioRowLocalDataSource, diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java index 98973c42..a29c470e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java @@ -62,7 +62,7 @@ public class InventarioRepository extends _BaseRepository(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java index 5e2e7f64..524ceb33 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java @@ -169,7 +169,7 @@ public class PickingInventarioViewModel extends ViewModel { private List searchArtInAlreadyScannedItems(InventarioArtDTO inventarioArtDTO) { final List inventarioRows = this.currentInventarioRows.getValue(); - if (inventarioRows == null) return null; + if (inventarioRows == null || inventarioRows.isEmpty()) return null; return Stream.of(inventarioRows).filter(x -> x.getCodMart() != null ? x.getCodMart().equalsIgnoreCase(inventarioArtDTO.getCodMart()) : inventarioArtDTO.getBarcode().contains(x.getScanCodBarre())).toList(); } From 9a60b1ff86ebdf1656e5a352f41b72d19cedc028 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 25 May 2023 12:41:29 +0200 Subject: [PATCH 2/5] -> v1.33.11 (382) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c6140eb5..5bc5bdfb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 381 - def appVersionName = '1.33.10' + def appVersionCode = 382 + def appVersionName = '1.33.11' signingConfigs { release { From 1a964d7a975e1e996102c879afa52541d4a6a115 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 7 Jun 2023 14:19:15 +0200 Subject: [PATCH 3/5] Upgrade AGP 8.0.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ebcfc40b..3043ed2c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.8.0' - agp_version = '8.0.1' + agp_version = '8.0.2' } repositories { From 3e68dd2d369fefdc3510e9e5bb3ce37b68c8c820 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 13 Jun 2023 13:00:28 +0200 Subject: [PATCH 4/5] Aggiunto supporto a barcode I2O5 in ZebraBarcodeReader --- .../picking/PickingInventarioViewModel.java | 12 ++++++------ .../zebrascannerlibrary/ZebraBarcodeReader.java | 2 ++ .../zebrascannerlibrary/ZebraBarcodeTypeMapper.java | 6 ++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java index 524ceb33..71ea970a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java @@ -37,13 +37,10 @@ public class PickingInventarioViewModel extends ViewModel { private final InventarioRepository inventarioRepository; private final InventarioRowRepository inventarioRowRepository; - - private boolean canAddUnknownItems; - private boolean flagShouldAskToCreateOrUpdateRowInventario; - public MutableLiveData currentInventario = new MutableLiveData<>(); public LiveData> currentInventarioRows = new MutableLiveData<>(); - + private boolean canAddUnknownItems; + private boolean flagShouldAskToCreateOrUpdateRowInventario; private List availableInventarioArts; private Listener mListener; @@ -96,7 +93,10 @@ public class PickingInventarioViewModel extends ViewModel { var barcodeList = new ArrayList(); barcodeList.add(itemToUpdate.getScanCodBarre()); - var matchedArt = availableInventarioArts.stream().filter(x -> itemToUpdate.getCodMart() != null && x.getCodMart().contains(itemToUpdate.getCodMart())).findFirst().orElse(null); + var matchedArt = availableInventarioArts.stream() + .filter(x -> itemToUpdate.getCodMart() != null && x.getCodMart().contains(itemToUpdate.getCodMart())) + .findFirst() + .orElse(null); MtbAart articolo; diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java index 6caa2924..14de85e6 100644 --- a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java +++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java @@ -42,6 +42,8 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface { return true; } else if (model.equalsIgnoreCase("TC20")) { return true; + } else if (model.equalsIgnoreCase("MBA5")) { + return true; } else return false; } diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java index a59ce5df..6e8b5f78 100644 --- a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java +++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java @@ -17,6 +17,12 @@ public class ZebraBarcodeTypeMapper { case "LABEL-TYPE-CODE39": return BarcodeType.CODE39; + + case "LABEL-TYPE-IATA2OF5": + return BarcodeType.IATA_2OF5; + case "LABEL-TYPE-I2OF5": + return BarcodeType.INTERLEAVED_2OF5; + case "LABEL-TYPE-EAN13": return BarcodeType.EAN13; case "LABEL-TYPE-EAN8": From fdeb98b82ae477f8a0fa23c58332ed34333fec8d Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 13 Jun 2023 13:01:31 +0200 Subject: [PATCH 5/5] -> v1.33.12 (383) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5bc5bdfb..15cbd7ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 382 - def appVersionName = '1.33.11' + def appVersionCode = 383 + def appVersionName = '1.33.12' signingConfigs { release {