Finish v1_10_7(110)

This commit is contained in:
Giuseppe Scorrano 2019-12-13 19:07:33 +01:00
commit 866658262b
2 changed files with 7 additions and 7 deletions

View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 109
def appVersionName = '1.10.6'
def appVersionCode = 110
def appVersionName = '1.10.7'
signingConfigs {
release {

View File

@ -1147,14 +1147,14 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
boolean useQtaDaEvadere = false;
if(tmpPickData.getQtaTot() != null) {
useQtaDaEvadere = isTakenFromUL || (qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa());
if (useQtaDaEvadere) {
useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa();
if (useQtaDaEvadere && !isTakenFromUL) {
dto.setQtaTot(qtaDaEvadere);
dto.setMaxQta(qtaDaEvadere);
if(isTakenFromUL) {
dto.setNumCnf(qtaDaEvadere.divide(tmpPickData.getQtaCnf(), 0, RoundingMode.HALF_UP).intValue());
}
// if(isTakenFromUL) {
// dto.setNumCnf(qtaDaEvadere.divide(tmpPickData.getQtaCnf(), 0, RoundingMode.HALF_UP).intValue());
// }
} else {
dto.setQtaTot(tmpPickData.getQtaTot());