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

Finish v1.16.4(186)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-02-18 15:08:49 +01:00
commit d78d99094f
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 185 def appVersionCode = 186
def appVersionName = '1.16.3' def appVersionName = '1.16.4'
signingConfigs { signingConfigs {
release { release {

2
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java
View File

@ -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))

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

@ -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();
@ -306,7 +320,7 @@ public class DialogInputQuantityV2ViewModel {
newValue = UtilityBigDecimal.getLowerBetween(newValue, totalQtaAvailable); newValue = UtilityBigDecimal.getLowerBetween(newValue, totalQtaAvailable);
//Se è piu' grande della qta da prelevare e non posso aggiungere qta extra allora ricalcolo //Se è piu' grande della qta da prelevare e non posso aggiungere qta extra allora ricalcolo
if (!canOverflowOrderQuantity) { if (!canOverflowOrderQuantity && this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
newValue = UtilityBigDecimal.getLowerBetween(newValue, totalQtaOrd); newValue = UtilityBigDecimal.getLowerBetween(newValue, totalQtaOrd);
this.internalQtaTot = newValue; this.internalQtaTot = newValue;
this.mListener.onDataChanged(); this.mListener.onDataChanged();