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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano 2024-05-21 12:14:19 +02:00
commit 38139a1ec9
2 changed files with 8 additions and 9 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 { android {
def appVersionCode = 434 def appVersionCode = 435
def appVersionName = '1.40.17' def appVersionName = '1.40.18'
signingConfigs { signingConfigs {
release { release {

13
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
View File

@ -167,8 +167,8 @@ public class RettificaGiacenzeViewModel {
this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> { this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
if (onComplete != null) onComplete.run(); if (onComplete != null) onComplete.run();
if (mtbAartList != null && mtbAartList.size() > 0) { if (mtbAartList != null && !mtbAartList.isEmpty()) {
this.dispatchArts(mtbAartList); this.dispatchArts(mtbAartList, pickData);
} else { } else {
this.sendError(new NoResultFromBarcodeException(barcodeProd)); this.sendError(new NoResultFromBarcodeException(barcodeProd));
} }
@ -189,7 +189,7 @@ public class RettificaGiacenzeViewModel {
.map(x -> (MtbAart) x.getMtbAart()) .map(x -> (MtbAart) x.getMtbAart())
.toList(); .toList();
dispatchArts(mtbAarts); dispatchArts(mtbAarts, null);
}, this::sendError); }, this::sendError);
} }
@ -199,14 +199,13 @@ public class RettificaGiacenzeViewModel {
mRettificaGiacenzeRESTConsumer.searchArtInt(queryText, listaArts -> { mRettificaGiacenzeRESTConsumer.searchArtInt(queryText, listaArts -> {
this.sendOnLoadingEnded(); this.sendOnLoadingEnded();
dispatchArts(listaArts); dispatchArts(listaArts, null);
if (onComplete != null) onComplete.run(); if (onComplete != null) onComplete.run();
}, this::sendError); }, this::sendError);
} }
private void dispatchArts(List<MtbAart> artsList, PickDataDTO pickData) {
private void dispatchArts(List<MtbAart> artsList) {
if (artsList == null || artsList.size() == 0) { if (artsList == null || artsList.size() == 0) {
this.sendError(new NoArtsFoundException()); this.sendError(new NoArtsFoundException());
return; return;
@ -219,7 +218,7 @@ public class RettificaGiacenzeViewModel {
.toList(); .toList();
if (matchRows.size() != 1) { if (matchRows.size() != 1) {
dispatchArt(mtbAart, null); dispatchArt(mtbAart, pickData);
} else { } else {
dispatchRowEdit(matchRows.get(0)); dispatchRowEdit(matchRows.get(0));
} }