Merge branch 'release/v1.30.04__322'
This commit is contained in:
commit
9390cd0320
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 321
|
def appVersionCode = 322
|
||||||
def appVersionName = '1.30.03'
|
def appVersionName = '1.30.04'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -294,9 +294,6 @@ public class AccettazionePickingViewModel {
|
|||||||
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
||||||
this.sendError(new LUScanNotGrantedException());
|
this.sendError(new LUScanNotGrantedException());
|
||||||
} else {
|
} else {
|
||||||
if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
|
|
||||||
barcodeProd = barcodeProd.substring(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
||||||
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
||||||
|
|||||||
@ -183,9 +183,6 @@ public class PickingLiberoViewModel {
|
|||||||
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
||||||
this.executeEtichettaLU(ean128Model.Sscc, onComplete);
|
this.executeEtichettaLU(ean128Model.Sscc, onComplete);
|
||||||
} else if (!UtilityString.isNullOrEmpty(barcodeProd)) {
|
} else if (!UtilityString.isNullOrEmpty(barcodeProd)) {
|
||||||
if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
|
|
||||||
barcodeProd = barcodeProd.substring(1);
|
|
||||||
}
|
|
||||||
this.loadArticolo(barcodeProd, ean128Model, onComplete);
|
this.loadArticolo(barcodeProd, ean128Model, onComplete);
|
||||||
} else {
|
} else {
|
||||||
this.sendError(new NoLUFoundException());
|
this.sendError(new NoLUFoundException());
|
||||||
|
|||||||
@ -129,9 +129,6 @@ public class RettificaGiacenzeViewModel {
|
|||||||
|
|
||||||
|
|
||||||
if (!UtilityString.isNullOrEmpty(barcodeProd)) {
|
if (!UtilityString.isNullOrEmpty(barcodeProd)) {
|
||||||
if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
|
|
||||||
barcodeProd = barcodeProd.substring(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
||||||
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
||||||
|
|||||||
@ -540,9 +540,6 @@ public class SpedizioneViewModel {
|
|||||||
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
||||||
this.executeEtichettaLU(ean128Model.Sscc, onComplete);
|
this.executeEtichettaLU(ean128Model.Sscc, onComplete);
|
||||||
} else {
|
} else {
|
||||||
if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
|
|
||||||
barcodeProd = barcodeProd.substring(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
|
||||||
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
|
||||||
|
|||||||
@ -90,9 +90,6 @@ public class DialogScanArtViewModel {
|
|||||||
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
|
||||||
this.executeEtichettaLU(ean128Model.Sscc, onComplete);
|
this.executeEtichettaLU(ean128Model.Sscc, onComplete);
|
||||||
} else if (!mForceOnlyUL) {
|
} else if (!mForceOnlyUL) {
|
||||||
if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
|
|
||||||
barcodeProd = barcodeProd.substring(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.loadArticolo(barcodeProd, ean128Model, onComplete);
|
this.loadArticolo(barcodeProd, ean128Model, onComplete);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user