Fix su refMtbColr in Spedizione
This commit is contained in:
parent
fd2e1fa4f4
commit
b5626e5b08
@ -805,7 +805,7 @@ public class SpedizioneViewModel {
|
||||
|
||||
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())
|
||||
.filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) &&
|
||||
UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) &&
|
||||
@ -816,7 +816,7 @@ public class SpedizioneViewModel {
|
||||
if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get();
|
||||
}
|
||||
|
||||
MtbColr mtbColrToUse = refMtbColr != null ? refMtbColr : scannedMtbColr;
|
||||
MtbColr mtbColrToUse = scannedMtbColr != null ? scannedMtbColr : refMtbColr;
|
||||
|
||||
if (mtbColrToUse != null) {
|
||||
if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
|
||||
@ -830,10 +830,10 @@ public class SpedizioneViewModel {
|
||||
|
||||
qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
|
||||
} else {
|
||||
if (UtilityBigDecimal.equalsOrLowerThan(scannedMtbColr.getNumCnf(), numCnfDaEvadere)) {
|
||||
numCnfDaPrelevare = scannedMtbColr.getNumCnf();
|
||||
qtaCnfDaPrelevare = scannedMtbColr.getQtaCnf();
|
||||
qtaColDaPrelevare = scannedMtbColr.getQtaCol();
|
||||
if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getNumCnf(), numCnfDaEvadere)) {
|
||||
numCnfDaPrelevare = mtbColrToUse.getNumCnf();
|
||||
qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
|
||||
qtaColDaPrelevare = mtbColrToUse.getQtaCol();
|
||||
} else {
|
||||
numCnfDaPrelevare = numCnfDaEvadere;
|
||||
qtaColDaPrelevare = qtaDaEvadere;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user