Sistemati ricalcoli di qta_cnf e num_cnf in caso di barcode a peso in Accettazione.
This commit is contained in:
parent
e36441db73
commit
8e7ad53ec9
@ -482,7 +482,7 @@ public class AccettazionePickingViewModel {
|
|||||||
|
|
||||||
|
|
||||||
if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
|
if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
|
||||||
numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
|
numCnfDaPrelevare = UtilityBigDecimal.divideAndRoundToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
|
||||||
|
|
||||||
if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
|
if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
|
||||||
if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
|
if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
|
||||||
|
|||||||
@ -117,6 +117,13 @@ public class DialogInputQuantityV2ViewModel {
|
|||||||
this.mtbAart.get().getBarCode() != null &&
|
this.mtbAart.get().getBarCode() != null &&
|
||||||
(ean13PesoModel.getPrecode().contains(this.mtbAart.get().getBarCode()) || this.mtbAart.get().getBarCode().contains(ean13PesoModel.getPrecode()))) {
|
(ean13PesoModel.getPrecode().contains(this.mtbAart.get().getBarCode()) || this.mtbAart.get().getBarCode().contains(ean13PesoModel.getPrecode()))) {
|
||||||
this.setQtaTot(BigDecimal.valueOf(ean13PesoModel.getPeso()));
|
this.setQtaTot(BigDecimal.valueOf(ean13PesoModel.getPeso()));
|
||||||
|
this.setNumCnf(UtilityBigDecimal.divideAndRoundToInteger(this.getQtaTot(), this.mtbAart.get().getQtaCnf()));
|
||||||
|
|
||||||
|
if (!this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
|
||||||
|
if (UtilityBigDecimal.equalsTo(this.getNumCnf(), BigDecimal.ZERO))
|
||||||
|
this.setNumCnf(BigDecimal.ONE);
|
||||||
|
this.setQtaCnf(UtilityBigDecimal.divide(this.getQtaTot(), this.getNumCnf()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onComplete.run();
|
onComplete.run();
|
||||||
@ -146,6 +153,13 @@ public class DialogInputQuantityV2ViewModel {
|
|||||||
this.setNumCnf(BigDecimal.valueOf(ean128Model.Count));
|
this.setNumCnf(BigDecimal.valueOf(ean128Model.Count));
|
||||||
} else if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0) {
|
} else if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0) {
|
||||||
this.setQtaTot(BigDecimal.valueOf(ean128Model.NetWeightKg));
|
this.setQtaTot(BigDecimal.valueOf(ean128Model.NetWeightKg));
|
||||||
|
this.setNumCnf(UtilityBigDecimal.divideAndRoundToInteger(this.getQtaTot(), this.mtbAart.get().getQtaCnf()));
|
||||||
|
|
||||||
|
if (!this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
|
||||||
|
if (UtilityBigDecimal.equalsTo(this.getNumCnf(), BigDecimal.ZERO))
|
||||||
|
this.setNumCnf(BigDecimal.ONE);
|
||||||
|
this.setQtaCnf(UtilityBigDecimal.divide(this.getQtaTot(), this.getNumCnf()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.mListener.onDataChanged();
|
this.mListener.onDataChanged();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user