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

Finish v1.40.08(425)

Browse Source
This commit is contained in:
Marco Elefante 2024-04-04 11:54:18 +02:00
commit 05bc6e3fbe
7 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 423
def appVersionName = '1.40.06'
def appVersionCode = 425
def appVersionName = '1.40.08'
signingConfigs {
release {

9
app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
View File

@ -238,8 +238,11 @@ public class Converters {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
BigDecimal value = null;
if (!UtilityString.isNullOrEmpty(s.toString()))
value = new BigDecimal(s.toString());
String newValueString = s.toString().trim();
if (!UtilityString.isNullOrEmpty(newValueString))
value = new BigDecimal(newValueString);
observableBigDecimal.set(value);
}
};
@ -247,7 +250,7 @@ public class Converters {
view.addTextChangedListener(watcher);
}
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)) {
view.setText(UtilityNumber.decimalToString(newValue));

6
app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java
View File

@ -13,15 +13,13 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilityString;
public class LocalDateDeserializer implements JsonDeserializer<LocalDate> {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
@Override
public LocalDate deserialize(JsonElement element, Type arg1, JsonDeserializationContext arg2) throws JsonParseException {
String date = element.getAsString();
if (UtilityString.isNullOrEmpty(date)) return null;
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UtilityString.determineDateFormat(date));
return LocalDate.parse(date, formatter);
}
}

4
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityString.java
View File

@ -15,7 +15,7 @@ import java.util.regex.Pattern;
public class UtilityString {
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){
@ -23,7 +23,7 @@ public class UtilityString {
}
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){

7
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
View File

@ -125,7 +125,12 @@ public class DocInterniEditFormViewModel {
}
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) ||
x.getBarcode().contains(codMart))
.findFirst()

6
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java
View File

@ -529,9 +529,9 @@ public class PickingLiberoViewModel {
this.sendArtSelectionRequest(mtbColrsToPick, mtbAart, pickedAarts -> {
List<MtbColr> destNewMtbColr = new ArrayList<>();
if (pickedAarts.size() > 0) {
if (!pickedAarts.isEmpty()) {
askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> {
if (destNewMtbColr.size() > 0) {
if (!destNewMtbColr.isEmpty()) {
MtbColt clonedTestata = (MtbColt) this.mCurrentMtbColt.clone();
clonedTestata.setOperation(CommonModelConsts.OPERATION.UPDATE);
@ -563,8 +563,6 @@ public class PickingLiberoViewModel {
clonedTestata.setMtbColr(mtbColrObservableField);
this.sendOnLoadingStarted();
new Thread(() -> {
mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> {
for (int i = 0; i < mtbColrObservableField.size(); i++) {

2
build.gradle
View File

@ -3,7 +3,7 @@
buildscript {
ext {
kotlin_version = '1.9.0'
agp_version = '8.3.0'
agp_version = '8.3.1'
}
repositories {