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

Fix su ricalcoli qtaDaEvadere nel caso di qtaCnf variabile

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-02-01 17:45:41 +01:00
parent 5ddd2e6235
commit cfc3649807
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -748,15 +748,27 @@ public class SpedizioneViewModel {
MtbColr mtbColrToUse = refMtbColr != null ? refMtbColr : scannedMtbColr; MtbColr mtbColrToUse = refMtbColr != null ? refMtbColr : scannedMtbColr;
if (mtbColrToUse != null) { if (mtbColrToUse != null) {
if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getQtaCol(), qtaDaEvadere)) { if(pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
numCnfDaPrelevare = mtbColrToUse.getNumCnf(); if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getQtaCol(), qtaDaEvadere)) {
qtaColDaPrelevare = mtbColrToUse.getQtaCol(); numCnfDaPrelevare = mtbColrToUse.getNumCnf();
} else { qtaColDaPrelevare = mtbColrToUse.getQtaCol();
numCnfDaPrelevare = numCnfDaEvadere; } else {
qtaColDaPrelevare = qtaDaEvadere; numCnfDaPrelevare = numCnfDaEvadere;
} qtaColDaPrelevare = qtaDaEvadere;
}
qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf(); qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
} else {
if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getNumCnf(), numCnfDaEvadere)) {
numCnfDaPrelevare = mtbColrToUse.getNumCnf();
qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
qtaColDaPrelevare = mtbColrToUse.getQtaCol();
} else {
numCnfDaPrelevare = numCnfDaEvadere;
qtaColDaPrelevare = qtaDaEvadere;
qtaCnfDaPrelevare = qtaCnfDaEvadere;
}
}
totalQtaAvailable = mtbColrToUse.getQtaCol(); totalQtaAvailable = mtbColrToUse.getQtaCol();

3
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
View File

@ -341,7 +341,8 @@ public class DialogInputQuantityV2ViewModel {
this.mListener.onError(new InvalidExpireDateException()); this.mListener.onError(new InvalidExpireDateException());
return false; return false;
} else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd)) { } else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
this.mListener.onError(new OverflowQtaTotOrderedQuantityException()); this.mListener.onError(new OverflowQtaTotOrderedQuantityException());
return false; return false;