Finish v1.40.08(425)
This commit is contained in:
commit
05bc6e3fbe
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 423
|
def appVersionCode = 425
|
||||||
def appVersionName = '1.40.06'
|
def appVersionName = '1.40.08'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -238,8 +238,11 @@ public class Converters {
|
|||||||
@Override
|
@Override
|
||||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
||||||
BigDecimal value = null;
|
BigDecimal value = null;
|
||||||
if (!UtilityString.isNullOrEmpty(s.toString()))
|
String newValueString = s.toString().trim();
|
||||||
value = new BigDecimal(s.toString());
|
|
||||||
|
if (!UtilityString.isNullOrEmpty(newValueString))
|
||||||
|
value = new BigDecimal(newValueString);
|
||||||
|
|
||||||
observableBigDecimal.set(value);
|
observableBigDecimal.set(value);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -247,7 +250,7 @@ public class Converters {
|
|||||||
view.addTextChangedListener(watcher);
|
view.addTextChangedListener(watcher);
|
||||||
}
|
}
|
||||||
BigDecimal newValue = observableBigDecimal.get();
|
BigDecimal newValue = observableBigDecimal.get();
|
||||||
BigDecimal viewValue = view.getText().toString().trim().length() > 0 ? new BigDecimal(view.getText().toString()) : null;
|
BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
|
||||||
|
|
||||||
if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
|
if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
|
||||||
view.setText(UtilityNumber.decimalToString(newValue));
|
view.setText(UtilityNumber.decimalToString(newValue));
|
||||||
|
|||||||
@ -13,15 +13,13 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
|
|||||||
import it.integry.integrywmsnative.core.utility.UtilityString;
|
import it.integry.integrywmsnative.core.utility.UtilityString;
|
||||||
|
|
||||||
public class LocalDateDeserializer implements JsonDeserializer<LocalDate> {
|
public class LocalDateDeserializer implements JsonDeserializer<LocalDate> {
|
||||||
|
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LocalDate deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException {
|
public LocalDate deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException {
|
||||||
String date = element.getAsString();
|
String date = element.getAsString();
|
||||||
if (UtilityString.isNullOrEmpty(date)) return null;
|
if (UtilityString.isNullOrEmpty(date)) return null;
|
||||||
|
|
||||||
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityString.determineDateFormat(date));
|
||||||
|
|
||||||
return LocalDate.parse(date, formatter);
|
return LocalDate.parse(date, formatter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import java.util.regex.Pattern;
|
|||||||
public class UtilityString {
|
public class UtilityString {
|
||||||
|
|
||||||
public static boolean isNullOrEmpty(String stringToCheck){
|
public static boolean isNullOrEmpty(String stringToCheck){
|
||||||
return stringToCheck == null || stringToCheck.trim().length() == 0;
|
return stringToCheck == null || stringToCheck.trim().isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String isNull(String stringToCheck, String alternativeString){
|
public static String isNull(String stringToCheck, String alternativeString){
|
||||||
@ -23,7 +23,7 @@ public class UtilityString {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String empty2null(String stringToCheck) {
|
public static String empty2null(String stringToCheck) {
|
||||||
return (stringToCheck == null || stringToCheck.trim().length() == 0) ? null : stringToCheck.trim();
|
return (stringToCheck == null || stringToCheck.trim().isEmpty()) ? null : stringToCheck.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String capitalizeWords(String capString){
|
public static String capitalizeWords(String capString){
|
||||||
|
|||||||
@ -125,7 +125,12 @@ public class DocInterniEditFormViewModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void loadArticoloByCodMartOrBarcode(String codMart) {
|
public void loadArticoloByCodMartOrBarcode(String codMart) {
|
||||||
var matchedArt = Stream.of(productsList)
|
if(productsList == null) {
|
||||||
|
this.sendError(new NoResultFromCodMartException(codMart));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var matchedArt = productsList.stream()
|
||||||
.filter(x -> x.getCodMart().equalsIgnoreCase(codMart) ||
|
.filter(x -> x.getCodMart().equalsIgnoreCase(codMart) ||
|
||||||
x.getBarcode().contains(codMart))
|
x.getBarcode().contains(codMart))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
|
|||||||
@ -529,9 +529,9 @@ public class PickingLiberoViewModel {
|
|||||||
this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> {
|
this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> {
|
||||||
List<MtbColr> destNewMtbColr = new ArrayList<>();
|
List<MtbColr> destNewMtbColr = new ArrayList<>();
|
||||||
|
|
||||||
if (pickedAarts.size() > 0) {
|
if (!pickedAarts.isEmpty()) {
|
||||||
askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
|
askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
|
||||||
if (destNewMtbColr.size() > 0) {
|
if (!destNewMtbColr.isEmpty()) {
|
||||||
MtbColt clonedTestata = (MtbColt) this.mCurrentMtbColt.clone();
|
MtbColt clonedTestata = (MtbColt) this.mCurrentMtbColt.clone();
|
||||||
clonedTestata.setOperation(CommonModelConsts.OPERATION.UPDATE);
|
clonedTestata.setOperation(CommonModelConsts.OPERATION.UPDATE);
|
||||||
|
|
||||||
@ -563,8 +563,6 @@ public class PickingLiberoViewModel {
|
|||||||
|
|
||||||
clonedTestata.setMtbColr(mtbColrObservableField);
|
clonedTestata.setMtbColr(mtbColrObservableField);
|
||||||
|
|
||||||
this.sendOnLoadingStarted();
|
|
||||||
|
|
||||||
new Thread(() -> {
|
new Thread(() -> {
|
||||||
mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
|
mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
|
||||||
for (int i = 0; i < mtbColrObservableField.size(); i++) {
|
for (int i = 0; i < mtbColrObservableField.size(); i++) {
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
kotlin_version = '1.9.0'
|
kotlin_version = '1.9.0'
|
||||||
agp_version = '8.3.0'
|
agp_version = '8.3.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user