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

Finish v1_10_7(110)

Browse Source
This commit is contained in:
Giuseppe Scorrano
2019-12-13 19:07:33 +01:00
parent 15332ee349 05fef23b20
commit 866658262b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

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

10
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

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