Finish v1.40.18(435)

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 433
+    def appVersionCode = 435
-    def appVersionName = '1.40.16'
+    def appVersionName = '1.40.18'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/ArtDTO.java

@@ -29,8 +29,11 @@ public class ArtDTO {
     private LocalDate dataScad;
 
     private String systemNote;
+
     private String codAlis;
 
+    private Date datetimeRow;
+
     public Integer getRigaOrd() {
         return rigaOrd;
     }
@@ -135,4 +138,13 @@ public class ArtDTO {
         this.codAlis = codAlis;
         return this;
     }
+
+    public Date getDatetimeRow() {
+        return datetimeRow;
+    }
+
+    public ArtDTO setDatetimeRow(Date datetimeRow) {
+        this.datetimeRow = datetimeRow;
+        return this;
+    }
 }

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

@@ -240,6 +240,7 @@ public class DocInterniEditFormViewModel {
             artDto.setBarcode(row.getCodBarre());
             artDto.setQta(BigDecimal.valueOf(row.getQtaCol()));
             artDto.setDataIns(row.getDataCollo());
+            artDto.setDatetimeRow(row.getDatetimeRow());
             artDto.setColli(BigDecimal.valueOf(row.getNumCnf()));
             artDto.setUntMis(row.getUntMis());
             artDto.setCodMart(row.getCodMart());

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java

@@ -167,8 +167,8 @@ public class RettificaGiacenzeViewModel {
         this.mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
             if (onComplete != null) onComplete.run();
 
-            if (mtbAartList != null && mtbAartList.size() > 0) {
+            if (mtbAartList != null && !mtbAartList.isEmpty()) {
-                this.dispatchArts(mtbAartList);
+                this.dispatchArts(mtbAartList, pickData);
             } else {
                 this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
@@ -189,7 +189,7 @@ public class RettificaGiacenzeViewModel {
                         .map(x -> (MtbAart) x.getMtbAart())
                         .toList();
 
-            dispatchArts(mtbAarts);
+            dispatchArts(mtbAarts, null);
         }, this::sendError);
     }
 
@@ -199,14 +199,13 @@ public class RettificaGiacenzeViewModel {
         mRettificaGiacenzeRESTConsumer.searchArtInt(queryText, listaArts -> {
             this.sendOnLoadingEnded();
 
-            dispatchArts(listaArts);
+            dispatchArts(listaArts, null);
 
             if (onComplete != null) onComplete.run();
         }, this::sendError);
     }
 
-
+    private void dispatchArts(List<MtbAart> artsList, PickDataDTO pickData) {
-    private void dispatchArts(List<MtbAart> artsList) {
         if (artsList == null || artsList.size() == 0) {
             this.sendError(new NoArtsFoundException());
             return;
@@ -219,7 +218,7 @@ public class RettificaGiacenzeViewModel {
                     .toList();
 
             if (matchRows.size() != 1) {
-                dispatchArt(mtbAart, null);
+                dispatchArt(mtbAart, pickData);
             } else {
                 dispatchRowEdit(matchRows.get(0));
             }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -1870,7 +1870,8 @@ public class SpedizioneViewModel {
                         .setNumOrd(ord.getNumOrd())
                         .setGestione(ord.getGestione())
                         .setCodAnag(ord.getCodAnagOrd())
-                ).toList();
+                )
+                .collect(Collectors.toList());
 
         dto.setPrintList(closedOrders);
         printClosedOrders(dto, this::onOrderClosedPrintingDone, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.20'
-        agp_version = '8.3.2'
+        agp_version = '8.4.0'
     }
 
     repositories {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Feb 13 15:14:43 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME