Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1.33.12(383)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2023-06-13 13:01:38 +02:00
commit 3713bb5e49
7 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 381
def appVersionName = '1.33.10'
def appVersionCode = 383
def appVersionName = '1.33.12'
signingConfigs {
release {

28
app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java
View File

@ -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,

2
app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java
View File

@ -62,7 +62,7 @@ public class InventarioRepository extends _BaseRepository<MtbInvent, InventarioR
try {
var startRetrieve = new Date();
var remoteData = remoteDataSource.makeSynchronousRetrieveRequest();
Log.d("Timing [INVENTORIES RETRIEVE]", ((new Date().getTime() - startRetrieve.getTime()) / 1000) + " secs");
Log.d("Time INVENTORY RETRIEVE", ((new Date().getTime() - startRetrieve.getTime()) / 1000) + " secs");
if (remoteData == null) remoteData = new ArrayList<>();

14
app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
View File

@ -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<InventarioRoomDTO> currentInventario = new MutableLiveData<>();
public LiveData<List<InventarioRowRoomDTO>> currentInventarioRows = new MutableLiveData<>();
private boolean canAddUnknownItems;
private boolean flagShouldAskToCreateOrUpdateRowInventario;
private List<InventarioArtDTO> availableInventarioArts;
private Listener mListener;
@ -96,7 +93,10 @@ public class PickingInventarioViewModel extends ViewModel {
var barcodeList = new ArrayList<String>();
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;
@ -169,7 +169,7 @@ public class PickingInventarioViewModel extends ViewModel {
private List<InventarioRowRoomDTO> searchArtInAlreadyScannedItems(InventarioArtDTO inventarioArtDTO) {
final List<InventarioRowRoomDTO> 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();
}

2
build.gradle
View File

@ -3,7 +3,7 @@
buildscript {
ext {
kotlin_version = '1.8.0'
agp_version = '8.0.1'
agp_version = '8.0.2'
}
repositories {

2
zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
View File

@ -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;
}

6
zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
View File

@ -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":