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

Finish v1.16.30(212)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-04-23 15:25:16 +02:00
commit 74efbac452
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 211 def appVersionCode = 212
def appVersionName = '1.16.29' def appVersionName = '1.16.30'
signingConfigs { signingConfigs {
release { release {

12
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
View File

@ -805,7 +805,7 @@ public class SpedizioneViewModel {
MtbColr refMtbColr = null; MtbColr refMtbColr = null;
if (scannedMtbColr != null && refMtbColt != null && refMtbColt.getMtbColr().size() > 0) { if (refMtbColt != null && refMtbColt.getMtbColr().size() > 0) {
Optional<MtbColr> optionalMtbColr = Stream.of(refMtbColt.getMtbColr()) Optional<MtbColr> optionalMtbColr = Stream.of(refMtbColt.getMtbColr())
.filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) && .filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) &&
UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) && UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) &&
@ -816,7 +816,7 @@ public class SpedizioneViewModel {
if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get(); if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get();
} }
MtbColr mtbColrToUse = refMtbColr != null ? refMtbColr : scannedMtbColr; MtbColr mtbColrToUse = scannedMtbColr != null ? scannedMtbColr : refMtbColr;
if (mtbColrToUse != null) { if (mtbColrToUse != null) {
if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) { if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
@ -830,10 +830,10 @@ public class SpedizioneViewModel {
qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf(); qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
} else { } else {
if (UtilityBigDecimal.equalsOrLowerThan(scannedMtbColr.getNumCnf(), numCnfDaEvadere)) { if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getNumCnf(), numCnfDaEvadere)) {
numCnfDaPrelevare = scannedMtbColr.getNumCnf(); numCnfDaPrelevare = mtbColrToUse.getNumCnf();
qtaCnfDaPrelevare = scannedMtbColr.getQtaCnf(); qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
qtaColDaPrelevare = scannedMtbColr.getQtaCol(); qtaColDaPrelevare = mtbColrToUse.getQtaCol();
} else { } else {
numCnfDaPrelevare = numCnfDaEvadere; numCnfDaPrelevare = numCnfDaEvadere;
qtaColDaPrelevare = qtaDaEvadere; qtaColDaPrelevare = qtaDaEvadere;